+ Replace InputField with QuantitySpinBox
This commit is contained in:
wmayer
parent
609422f08a
commit
406d32aebb
|
|
@ -100,8 +100,8 @@ Placement::Placement(QWidget* parent, Qt::WFlags fl)
|
|||
signalMapper->setMapping(this, 0);
|
||||
|
||||
int id = 1;
|
||||
QList<Gui::InputField*> sb = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
QList<Gui::QuantitySpinBox*> sb = this->findChildren<Gui::QuantitySpinBox*>();
|
||||
for (QList<Gui::QuantitySpinBox*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
connect(*it, SIGNAL(valueChanged(double)), signalMapper, SLOT(map()));
|
||||
signalMapper->setMapping(*it, id++);
|
||||
}
|
||||
|
|
@ -132,14 +132,14 @@ void Placement::slotActiveDocument(const Gui::Document& doc)
|
|||
documents.insert(doc.getDocument()->getName());
|
||||
}
|
||||
|
||||
bool Placement::hasValidInputs() const
|
||||
QWidget* Placement::getInvalidInput() const
|
||||
{
|
||||
QList<Gui::InputField*> sb = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
QList<Gui::QuantitySpinBox*> sb = this->findChildren<Gui::QuantitySpinBox*>();
|
||||
for (QList<Gui::QuantitySpinBox*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
if (!(*it)->hasValidInput())
|
||||
return false;
|
||||
return (*it);
|
||||
}
|
||||
return true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Placement::revertTransformation()
|
||||
|
|
@ -302,8 +302,11 @@ void Placement::on_applyButton_clicked()
|
|||
bool Placement::onApply()
|
||||
{
|
||||
//only process things when we have valid inputs!
|
||||
if (!hasValidInputs()) {
|
||||
QMessageBox msg;
|
||||
QWidget* input = getInvalidInput();
|
||||
if (input) {
|
||||
input->setFocus();
|
||||
QMessageBox msg(this);
|
||||
msg.setWindowTitle(tr("Incorrect quantity"));
|
||||
msg.setIcon(QMessageBox::Critical);
|
||||
msg.setText(tr("There are input fields with incorrect input, please ensure valid placement values!"));
|
||||
msg.exec();
|
||||
|
|
@ -322,8 +325,8 @@ bool Placement::onApply()
|
|||
/*emit*/ placementChanged(data, incr, true);
|
||||
|
||||
if (ui->applyIncrementalPlacement->isChecked()) {
|
||||
QList<Gui::InputField*> sb = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
QList<Gui::QuantitySpinBox*> sb = this->findChildren<Gui::QuantitySpinBox*>();
|
||||
for (QList<Gui::QuantitySpinBox*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
(*it)->blockSignals(true);
|
||||
(*it)->setValue(0);
|
||||
(*it)->blockSignals(false);
|
||||
|
|
@ -335,8 +338,8 @@ bool Placement::onApply()
|
|||
|
||||
void Placement::on_resetButton_clicked()
|
||||
{
|
||||
QList<Gui::InputField*> sb = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
QList<Gui::QuantitySpinBox*> sb = this->findChildren<Gui::QuantitySpinBox*>();
|
||||
for (QList<Gui::QuantitySpinBox*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
(*it)->blockSignals(true);
|
||||
(*it)->setValue(0);
|
||||
(*it)->blockSignals(false);
|
||||
|
|
@ -420,18 +423,18 @@ Base::Placement Placement::getPlacementData() const
|
|||
Base::Vector3d pos;
|
||||
Base::Vector3d cnt;
|
||||
|
||||
pos = Base::Vector3d(ui->xPos->getQuantity().getValue(),ui->yPos->getQuantity().getValue(),ui->zPos->getQuantity().getValue());
|
||||
cnt = Base::Vector3d(ui->xCnt->getQuantity().getValue(),ui->yCnt->getQuantity().getValue(),ui->zCnt->getQuantity().getValue());
|
||||
pos = Base::Vector3d(ui->xPos->value().getValue(),ui->yPos->value().getValue(),ui->zPos->value().getValue());
|
||||
cnt = Base::Vector3d(ui->xCnt->value().getValue(),ui->yCnt->value().getValue(),ui->zCnt->value().getValue());
|
||||
|
||||
if (index == 0) {
|
||||
Base::Vector3d dir = getDirection();
|
||||
rot.setValue(Base::Vector3d(dir.x,dir.y,dir.z),Base::toRadians(ui->angle->getQuantity().getValue()));
|
||||
rot.setValue(Base::Vector3d(dir.x,dir.y,dir.z),Base::toRadians(ui->angle->value().getValue()));
|
||||
}
|
||||
else if (index == 1) {
|
||||
rot.setYawPitchRoll(
|
||||
ui->yawAngle->getQuantity().getValue(),
|
||||
ui->pitchAngle->getQuantity().getValue(),
|
||||
ui->rollAngle->getQuantity().getValue());
|
||||
ui->yawAngle->value().getValue(),
|
||||
ui->pitchAngle->value().getValue(),
|
||||
ui->rollAngle->value().getValue());
|
||||
}
|
||||
|
||||
Base::Placement p(pos, rot, cnt);
|
||||
|
|
@ -447,29 +450,29 @@ QString Placement::getPlacementString() const
|
|||
Base::Vector3d dir = getDirection();
|
||||
cmd = QString::fromAscii(
|
||||
"App.Placement(App.Vector(%1,%2,%3), App.Rotation(App.Vector(%4,%5,%6),%7), App.Vector(%8,%9,%10))")
|
||||
.arg(ui->xPos->getQuantity().getValue())
|
||||
.arg(ui->yPos->getQuantity().getValue())
|
||||
.arg(ui->zPos->getQuantity().getValue())
|
||||
.arg(ui->xPos->value().getValue())
|
||||
.arg(ui->yPos->value().getValue())
|
||||
.arg(ui->zPos->value().getValue())
|
||||
.arg(dir.x)
|
||||
.arg(dir.y)
|
||||
.arg(dir.z)
|
||||
.arg(ui->angle->getQuantity().getValue())
|
||||
.arg(ui->xCnt->getQuantity().getValue())
|
||||
.arg(ui->yCnt->getQuantity().getValue())
|
||||
.arg(ui->zCnt->getQuantity().getValue());
|
||||
.arg(ui->angle->value().getValue())
|
||||
.arg(ui->xCnt->value().getValue())
|
||||
.arg(ui->yCnt->value().getValue())
|
||||
.arg(ui->zCnt->value().getValue());
|
||||
}
|
||||
else if (index == 1) {
|
||||
cmd = QString::fromAscii(
|
||||
"App.Placement(App.Vector(%1,%2,%3), App.Rotation(%4,%5,%6), App.Vector(%7,%8,%9))")
|
||||
.arg(ui->xPos->getQuantity().getValue())
|
||||
.arg(ui->yPos->getQuantity().getValue())
|
||||
.arg(ui->zPos->getQuantity().getValue())
|
||||
.arg(ui->yawAngle->getQuantity().getValue())
|
||||
.arg(ui->pitchAngle->getQuantity().getValue())
|
||||
.arg(ui->rollAngle->getQuantity().getValue())
|
||||
.arg(ui->xCnt->getQuantity().getValue())
|
||||
.arg(ui->yCnt->getQuantity().getValue())
|
||||
.arg(ui->zCnt->getQuantity().getValue());
|
||||
.arg(ui->xPos->value().getValue())
|
||||
.arg(ui->yPos->value().getValue())
|
||||
.arg(ui->zPos->value().getValue())
|
||||
.arg(ui->yawAngle->value().getValue())
|
||||
.arg(ui->pitchAngle->value().getValue())
|
||||
.arg(ui->rollAngle->value().getValue())
|
||||
.arg(ui->xCnt->value().getValue())
|
||||
.arg(ui->yCnt->value().getValue())
|
||||
.arg(ui->zCnt->value().getValue());
|
||||
}
|
||||
|
||||
return cmd;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ private:
|
|||
void applyPlacement(const QString& p, bool incremental);
|
||||
void revertTransformation();
|
||||
void slotActiveDocument(const Gui::Document&);
|
||||
bool hasValidInputs() const;
|
||||
QWidget* getInvalidInput() const;
|
||||
|
||||
Q_SIGNALS:
|
||||
void placementChanged(const QVariant &, bool, bool);
|
||||
|
|
|
|||
|
|
@ -85,13 +85,13 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="xPos"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="xPos"/>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="yPos"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="yPos"/>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="Gui::InputField" name="zPos"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="zPos"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
|
@ -161,13 +161,13 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="xCnt"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="xCnt"/>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="yCnt"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="yCnt"/>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="zCnt"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="zCnt"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
|
@ -239,7 +239,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="angle"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="angle"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
|
@ -301,13 +301,13 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="yawAngle"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="yawAngle"/>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="pitchAngle"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="pitchAngle"/>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="rollAngle"/>
|
||||
<widget class="Gui::QuantitySpinBox" name="rollAngle"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
|
@ -439,9 +439,9 @@
|
|||
<layoutdefault spacing="6" margin="11"/>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>Gui::InputField</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header location="global">Gui/InputField.h</header>
|
||||
<class>Gui::QuantitySpinBox</class>
|
||||
<extends>QWidget</extends>
|
||||
<header location="global">Gui/QuantitySpinBox.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
|
|
|
|||
|
|
@ -318,8 +318,8 @@ Transform::Transform(QWidget* parent, Qt::WFlags fl)
|
|||
signalMapper->setMapping(this, 0);
|
||||
|
||||
int id = 1;
|
||||
QList<Gui::InputField*> sb = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
QList<Gui::QuantitySpinBox*> sb = this->findChildren<Gui::QuantitySpinBox*>();
|
||||
for (QList<Gui::QuantitySpinBox*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
connect(*it, SIGNAL(valueChanged(double)), signalMapper, SLOT(map()));
|
||||
signalMapper->setMapping(*it, id++);
|
||||
}
|
||||
|
|
@ -383,8 +383,8 @@ void Transform::on_applyButton_clicked()
|
|||
strategy->commitTransform(mat);
|
||||
|
||||
// nullify the values
|
||||
QList<Gui::InputField*> sb = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
QList<Gui::QuantitySpinBox*> sb = this->findChildren<Gui::QuantitySpinBox*>();
|
||||
for (QList<Gui::QuantitySpinBox*>::iterator it = sb.begin(); it != sb.end(); ++it) {
|
||||
(*it)->blockSignals(true);
|
||||
(*it)->setValue(0.0);
|
||||
(*it)->blockSignals(false);
|
||||
|
|
@ -415,18 +415,18 @@ Base::Placement Transform::getPlacementData() const
|
|||
Base::Vector3d pos;
|
||||
Base::Vector3d cnt;
|
||||
|
||||
pos = Base::Vector3d(ui->xPos->getQuantity().getValue(),ui->yPos->getQuantity().getValue(),ui->zPos->getQuantity().getValue());
|
||||
cnt = Base::Vector3d(ui->xCnt->getQuantity().getValue(),ui->yCnt->getQuantity().getValue(),ui->zCnt->getQuantity().getValue());
|
||||
pos = Base::Vector3d(ui->xPos->value().getValue(),ui->yPos->value().getValue(),ui->zPos->value().getValue());
|
||||
cnt = Base::Vector3d(ui->xCnt->value().getValue(),ui->yCnt->value().getValue(),ui->zCnt->value().getValue());
|
||||
|
||||
if (index == 0) {
|
||||
Base::Vector3d dir = getDirection();
|
||||
rot.setValue(Base::Vector3d(dir.x,dir.y,dir.z),ui->angle->getQuantity().getValue()*D_PI/180.0);
|
||||
rot.setValue(Base::Vector3d(dir.x,dir.y,dir.z),ui->angle->value().getValue()*D_PI/180.0);
|
||||
}
|
||||
else if (index == 1) {
|
||||
rot.setYawPitchRoll(
|
||||
ui->yawAngle->getQuantity().getValue(),
|
||||
ui->pitchAngle->getQuantity().getValue(),
|
||||
ui->rollAngle->getQuantity().getValue());
|
||||
ui->yawAngle->value().getValue(),
|
||||
ui->pitchAngle->value().getValue(),
|
||||
ui->rollAngle->value().getValue());
|
||||
}
|
||||
|
||||
Base::Placement p(pos, rot, cnt);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
#include <Gui/Placement.h>
|
||||
#include <Gui/FileDialog.h>
|
||||
#include <Gui/DlgPropertyLink.h>
|
||||
#include <Gui/InputField.h>
|
||||
#include <Gui/QuantitySpinBox.h>
|
||||
|
||||
#include "PropertyItem.h"
|
||||
|
||||
|
|
@ -625,7 +625,7 @@ void PropertyUnitItem::setValue(const QVariant& value)
|
|||
|
||||
QWidget* PropertyUnitItem::createEditor(QWidget* parent, const QObject* receiver, const char* method) const
|
||||
{
|
||||
Gui::InputField *infield = new Gui::InputField(parent);
|
||||
Gui::QuantitySpinBox *infield = new Gui::QuantitySpinBox(parent);
|
||||
infield->setFrame(false);
|
||||
infield->setMinimumHeight(0);
|
||||
QObject::connect(infield, SIGNAL(valueChanged(double)), receiver, method);
|
||||
|
|
@ -636,14 +636,14 @@ void PropertyUnitItem::setEditorData(QWidget *editor, const QVariant& data) cons
|
|||
{
|
||||
const Base::Quantity& value = data.value<Base::Quantity>();
|
||||
|
||||
Gui::InputField *infield = qobject_cast<Gui::InputField*>(editor);
|
||||
Gui::QuantitySpinBox *infield = qobject_cast<Gui::QuantitySpinBox*>(editor);
|
||||
infield->setValue(value);
|
||||
}
|
||||
|
||||
QVariant PropertyUnitItem::editorData(QWidget *editor) const
|
||||
{
|
||||
Gui::InputField *infield = qobject_cast<Gui::InputField*>(editor);
|
||||
Base::Quantity value = infield->getQuantity();
|
||||
Gui::QuantitySpinBox *infield = qobject_cast<Gui::QuantitySpinBox*>(editor);
|
||||
Base::Quantity value = infield->value();
|
||||
return QVariant::fromValue<Base::Quantity>(value);
|
||||
}
|
||||
|
||||
|
|
@ -661,7 +661,7 @@ void PropertyUnitConstraintItem::setEditorData(QWidget *editor, const QVariant&
|
|||
{
|
||||
const Base::Quantity& value = data.value<Base::Quantity>();
|
||||
|
||||
Gui::InputField *infield = qobject_cast<Gui::InputField*>(editor);
|
||||
Gui::QuantitySpinBox *infield = qobject_cast<Gui::QuantitySpinBox*>(editor);
|
||||
infield->setValue(value);
|
||||
|
||||
const std::vector<App::Property*>& items = getPropertyData();
|
||||
|
|
|
|||
|
|
@ -260,11 +260,6 @@ DlgPrimitives::DlgPrimitives(QWidget* parent)
|
|||
ui.edgeZ2->setMaximum(INT_MAX);
|
||||
ui.edgeZ2->setMinimum(INT_MIN);
|
||||
// RegularPolygon
|
||||
|
||||
QList<Gui::InputField*> list = this->findChildren<Gui::InputField*>();
|
||||
for (QList<Gui::InputField*>::iterator it = list.begin(); it != list.end(); ++it) {
|
||||
(*it)->setValue((*it)->getQuantity());
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -361,8 +356,8 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%4\n"
|
||||
"App.ActiveDocument.%1.Label='%5'\n")
|
||||
.arg(name)
|
||||
.arg(ui.planeLength->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.planeWidth->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.planeLength->value().getValue(),0,'f',2)
|
||||
.arg(ui.planeWidth->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Plane"));
|
||||
}
|
||||
|
|
@ -376,9 +371,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%5\n"
|
||||
"App.ActiveDocument.%1.Label='%6'\n")
|
||||
.arg(name)
|
||||
.arg(ui.boxLength->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.boxWidth->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.boxHeight->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.boxLength->value().getValue(),0,'f',2)
|
||||
.arg(ui.boxWidth->value().getValue(),0,'f',2)
|
||||
.arg(ui.boxHeight->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Box"));
|
||||
}
|
||||
|
|
@ -392,9 +387,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%5\n"
|
||||
"App.ActiveDocument.%1.Label='%6'\n")
|
||||
.arg(name)
|
||||
.arg(ui.cylinderRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.cylinderHeight->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.cylinderAngle->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.cylinderRadius->value().getValue(),0,'f',2)
|
||||
.arg(ui.cylinderHeight->value().getValue(),0,'f',2)
|
||||
.arg(ui.cylinderAngle->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Cylinder"));
|
||||
}
|
||||
|
|
@ -409,10 +404,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%6\n"
|
||||
"App.ActiveDocument.%1.Label='%7'\n")
|
||||
.arg(name)
|
||||
.arg(ui.coneRadius1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.coneRadius2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.coneHeight->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.coneAngle->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.coneRadius1->value().getValue(),0,'f',2)
|
||||
.arg(ui.coneRadius2->value().getValue(),0,'f',2)
|
||||
.arg(ui.coneHeight->value().getValue(),0,'f',2)
|
||||
.arg(ui.coneAngle->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Cone"));
|
||||
}
|
||||
|
|
@ -427,10 +422,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%6\n"
|
||||
"App.ActiveDocument.%1.Label='%7'\n")
|
||||
.arg(name)
|
||||
.arg(ui.sphereRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.sphereAngle1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.sphereAngle2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.sphereAngle3->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.sphereRadius->value().getValue(),0,'f',2)
|
||||
.arg(ui.sphereAngle1->value().getValue(),0,'f',2)
|
||||
.arg(ui.sphereAngle2->value().getValue(),0,'f',2)
|
||||
.arg(ui.sphereAngle3->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Sphere"));
|
||||
}
|
||||
|
|
@ -446,11 +441,11 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%7\n"
|
||||
"App.ActiveDocument.%1.Label='%8'\n")
|
||||
.arg(name)
|
||||
.arg(ui.ellipsoidRadius1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidRadius2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidAngle1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidAngle2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidAngle3->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidRadius1->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidRadius2->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidAngle1->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidAngle2->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipsoidAngle3->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Ellipsoid"));
|
||||
}
|
||||
|
|
@ -466,11 +461,11 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%7\n"
|
||||
"App.ActiveDocument.%1.Label='%8'\n")
|
||||
.arg(name)
|
||||
.arg(ui.torusRadius1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.torusRadius2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.torusAngle1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.torusAngle2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.torusAngle3->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.torusRadius1->value().getValue(),0,'f',2)
|
||||
.arg(ui.torusRadius2->value().getValue(),0,'f',2)
|
||||
.arg(ui.torusAngle1->value().getValue(),0,'f',2)
|
||||
.arg(ui.torusAngle2->value().getValue(),0,'f',2)
|
||||
.arg(ui.torusAngle3->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Torus"));
|
||||
}
|
||||
|
|
@ -485,8 +480,8 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Label='%6'\n")
|
||||
.arg(name)
|
||||
.arg(ui.prismPolygon->value())
|
||||
.arg(ui.prismCircumradius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.prismHeight->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.prismCircumradius->value().getValue(),0,'f',2)
|
||||
.arg(ui.prismHeight->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Prism"));
|
||||
}
|
||||
|
|
@ -507,16 +502,16 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%12\n"
|
||||
"App.ActiveDocument.%1.Label='%13'\n")
|
||||
.arg(name)
|
||||
.arg(ui.wedgeXmin->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeYmin->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZmin->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeX2min->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZ2min->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeXmax->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeYmax->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZmax->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeX2max->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZ2max->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeXmin->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeYmin->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZmin->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeX2min->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZ2min->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeXmax->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeYmax->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZmax->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeX2max->value().getValue(),0,'f',2)
|
||||
.arg(ui.wedgeZ2max->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Wedge"));
|
||||
}
|
||||
|
|
@ -533,10 +528,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%7\n"
|
||||
"App.ActiveDocument.%1.Label='%8'\n")
|
||||
.arg(name)
|
||||
.arg(ui.helixPitch->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.helixHeight->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.helixRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.helixAngle->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.helixPitch->value().getValue(),0,'f',2)
|
||||
.arg(ui.helixHeight->value().getValue(),0,'f',2)
|
||||
.arg(ui.helixRadius->value().getValue(),0,'f',2)
|
||||
.arg(ui.helixAngle->value().getValue(),0,'f',2)
|
||||
.arg(ui.helixLocalCS->currentIndex())
|
||||
.arg(placement)
|
||||
.arg(tr("Helix"));
|
||||
|
|
@ -551,9 +546,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%5\n"
|
||||
"App.ActiveDocument.%1.Label='%6'\n")
|
||||
.arg(name)
|
||||
.arg(ui.spiralGrowth->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.spiralGrowth->value().getValue(),0,'f',2)
|
||||
.arg(ui.spiralRotation->value(),0,'f',2)
|
||||
.arg(ui.spiralRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.spiralRadius->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Spiral"));
|
||||
}
|
||||
|
|
@ -567,9 +562,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%5\n"
|
||||
"App.ActiveDocument.%1.Label='%6'\n")
|
||||
.arg(name)
|
||||
.arg(ui.circleRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.circleAngle0->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.circleAngle1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.circleRadius->value().getValue(),0,'f',2)
|
||||
.arg(ui.circleAngle0->value().getValue(),0,'f',2)
|
||||
.arg(ui.circleAngle1->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Circle"));
|
||||
}
|
||||
|
|
@ -584,10 +579,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%6\n"
|
||||
"App.ActiveDocument.%1.Label='%7'\n")
|
||||
.arg(name)
|
||||
.arg(ui.ellipseMajorRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseMinorRadius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseAngle0->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseAngle1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseMajorRadius->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseMinorRadius->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseAngle0->value().getValue(),0,'f',2)
|
||||
.arg(ui.ellipseAngle1->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Ellipse"));
|
||||
}
|
||||
|
|
@ -601,9 +596,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%5\n"
|
||||
"App.ActiveDocument.%1.Label='%6'\n")
|
||||
.arg(name)
|
||||
.arg(ui.vertexX->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.vertexY->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.vertexZ->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.vertexX->value().getValue(),0,'f',2)
|
||||
.arg(ui.vertexY->value().getValue(),0,'f',2)
|
||||
.arg(ui.vertexZ->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Vertex"));
|
||||
}
|
||||
|
|
@ -620,12 +615,12 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Placement=%8\n"
|
||||
"App.ActiveDocument.%1.Label='%9'\n")
|
||||
.arg(name)
|
||||
.arg(ui.edgeX1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.edgeY1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.edgeZ1->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.edgeX2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.edgeY2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.edgeZ2->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.edgeX1->value().getValue(),0,'f',2)
|
||||
.arg(ui.edgeY1->value().getValue(),0,'f',2)
|
||||
.arg(ui.edgeZ1->value().getValue(),0,'f',2)
|
||||
.arg(ui.edgeX2->value().getValue(),0,'f',2)
|
||||
.arg(ui.edgeY2->value().getValue(),0,'f',2)
|
||||
.arg(ui.edgeZ2->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Line"));
|
||||
}
|
||||
|
|
@ -639,7 +634,7 @@ void DlgPrimitives::createPrimitive(const QString& placement)
|
|||
"App.ActiveDocument.%1.Label='%5'\n")
|
||||
.arg(name)
|
||||
.arg(ui.regularPolygonPolygon->value())
|
||||
.arg(ui.regularPolygonCircumradius->getQuantity().getValue(),0,'f',2)
|
||||
.arg(ui.regularPolygonCircumradius->value().getValue(),0,'f',2)
|
||||
.arg(placement)
|
||||
.arg(tr("Regular polygon"));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,9 +208,12 @@
|
|||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="2">
|
||||
<widget class="Gui::InputField" name="planeLength">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="planeLength">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -229,9 +232,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="planeWidth">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="planeWidth">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -285,16 +291,22 @@
|
|||
<number>6</number>
|
||||
</property>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="boxWidth">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="boxWidth">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="Gui::InputField" name="boxHeight">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="boxHeight">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -320,9 +332,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="Gui::InputField" name="boxLength">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="boxLength">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -354,9 +369,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Gui::InputField" name="cylinderAngle">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="cylinderAngle">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -411,16 +429,22 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="cylinderHeight">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="cylinderHeight">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="cylinderRadius">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="cylinderRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -452,9 +476,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Gui::InputField" name="coneAngle">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="coneAngle">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -495,16 +522,22 @@
|
|||
<number>6</number>
|
||||
</property>
|
||||
<item row="3" column="2">
|
||||
<widget class="Gui::InputField" name="coneHeight">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="coneHeight">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="Gui::InputField" name="coneRadius1">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="coneRadius1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -530,9 +563,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="coneRadius2">
|
||||
<property name="text">
|
||||
<string>4.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="coneRadius2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>4.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -597,23 +633,32 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="sphereAngle1">
|
||||
<property name="text">
|
||||
<string>-90.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="sphereAngle1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>-90.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="Gui::InputField" name="sphereAngle2">
|
||||
<property name="text">
|
||||
<string>90.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="sphereAngle2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>90.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="Gui::InputField" name="sphereAngle3">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="sphereAngle3">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -651,9 +696,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Gui::InputField" name="sphereRadius">
|
||||
<property name="text">
|
||||
<string>5.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="sphereRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>5.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -715,16 +763,22 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="ellipsoidRadius1">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipsoidRadius1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="ellipsoidRadius2">
|
||||
<property name="text">
|
||||
<string>4.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipsoidRadius2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>4.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -769,23 +823,32 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="ellipsoidAngle3">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipsoidAngle3">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="ellipsoidAngle1">
|
||||
<property name="text">
|
||||
<string>-90.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipsoidAngle1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>-90.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="ellipsoidAngle2">
|
||||
<property name="text">
|
||||
<string>90.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipsoidAngle2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>90.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -850,23 +913,32 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="torusAngle3">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="torusAngle3">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="torusAngle1">
|
||||
<property name="text">
|
||||
<string>-180.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="torusAngle1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>-180.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="torusAngle2">
|
||||
<property name="text">
|
||||
<string>180.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="torusAngle2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>180.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -897,9 +969,12 @@
|
|||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="2">
|
||||
<widget class="Gui::InputField" name="torusRadius1">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="torusRadius1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -918,9 +993,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="torusRadius2">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="torusRadius2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -945,9 +1023,12 @@
|
|||
<number>6</number>
|
||||
</property>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="prismCircumradius">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="prismCircumradius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -986,9 +1067,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="Gui::InputField" name="prismHeight">
|
||||
<property name="text">
|
||||
<string>10.0 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="prismHeight">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1055,72 +1139,102 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="wedgeXmin">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeXmin">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="Gui::InputField" name="wedgeXmax">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeXmax">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="wedgeYmin">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeYmin">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="Gui::InputField" name="wedgeYmax">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeYmax">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="wedgeZmin">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeZmin">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="Gui::InputField" name="wedgeZmax">
|
||||
<property name="text">
|
||||
<string>10.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeZmax">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="Gui::InputField" name="wedgeX2min">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeX2min">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="Gui::InputField" name="wedgeX2max">
|
||||
<property name="text">
|
||||
<string>8.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeX2max">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>8.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="Gui::InputField" name="wedgeZ2min">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeZ2min">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="Gui::InputField" name="wedgeZ2max">
|
||||
<property name="text">
|
||||
<string>8.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="wedgeZ2max">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>8.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1220,30 +1334,42 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="Gui::InputField" name="helixAngle">
|
||||
<property name="text">
|
||||
<string>0.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="helixAngle">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="helixPitch">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="helixPitch">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="helixHeight">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="helixHeight">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="helixRadius">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="helixRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1302,9 +1428,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="spiralGrowth">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="spiralGrowth">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1319,9 +1448,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="spiralRadius">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="spiralRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1361,23 +1493,32 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="circleAngle0">
|
||||
<property name="text">
|
||||
<string>0.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="circleAngle0">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="circleAngle1">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="circleAngle1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="circleRadius">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="circleRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1455,30 +1596,42 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="ellipseMajorRadius">
|
||||
<property name="text">
|
||||
<string>4.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipseMajorRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>4.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="ellipseMinorRadius">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipseMinorRadius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="ellipseAngle0">
|
||||
<property name="text">
|
||||
<string>0.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipseAngle0">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="Gui::InputField" name="ellipseAngle1">
|
||||
<property name="text">
|
||||
<string>360.00 deg</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="ellipseAngle1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>deg</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1534,23 +1687,32 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::InputField" name="vertexX">
|
||||
<property name="text">
|
||||
<string>0.00 </string>
|
||||
<widget class="Gui::QuantitySpinBox" name="vertexX">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="vertexY">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="vertexY">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="vertexZ">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="vertexZ">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1660,44 +1822,62 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="edgeX1">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="edgeX1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::InputField" name="edgeY1">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="edgeY1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="Gui::InputField" name="edgeZ1">
|
||||
<property name="text">
|
||||
<string>0.00</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="edgeZ1">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="Gui::InputField" name="edgeX2">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="edgeX2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="Gui::InputField" name="edgeY2">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="edgeY2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<widget class="Gui::InputField" name="edgeZ2">
|
||||
<property name="text">
|
||||
<string>1.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="edgeZ2">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>10.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1762,9 +1942,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::InputField" name="regularPolygonCircumradius">
|
||||
<property name="text">
|
||||
<string>2.00 mm</string>
|
||||
<widget class="Gui::QuantitySpinBox" name="regularPolygonCircumradius">
|
||||
<property name="unit" stdset="0">
|
||||
<string>mm</string>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>2.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1795,9 +1978,9 @@
|
|||
<layoutdefault spacing="6" margin="11"/>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>Gui::InputField</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>Gui/InputField.h</header>
|
||||
<class>Gui::QuantitySpinBox</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>Gui/QuantitySpinBox.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user