suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ use quantity boxes in mesh solid creation dialog

Browse Source
This commit is contained in:
wmayer 2016-02-28 12:44:29 +01:00
parent 32a5340b0b
commit 1fd06ef59b
2 changed files with 82 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/Mod/Mesh/Gui/DlgRegularSolid.ui
View File

@ -177,7 +177,10 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="boxHeight">
<widget class="Gui::QuantitySpinBox" name="boxHeight">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>1000.000000000000000</double>
</property>
@ -187,7 +190,10 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="boxLength">
<widget class="Gui::QuantitySpinBox" name="boxLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
@ -207,7 +213,10 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="boxWidth">
<widget class="Gui::QuantitySpinBox" name="boxWidth">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>1000.000000000000000</double>
</property>
@ -267,14 +276,20 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="cylinderRadius">
<widget class="Gui::QuantitySpinBox" name="cylinderRadius">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="cylinderLength">
<widget class="Gui::QuantitySpinBox" name="cylinderLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
@ -339,7 +354,10 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="cylinderEdgeLength">
<widget class="Gui::QuantitySpinBox" name="cylinderEdgeLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>10.000000000000000</double>
</property>
@ -385,7 +403,10 @@
<number>6</number>
</property>
<item row="1" column="1" rowspan="2">
<widget class="QDoubleSpinBox" name="coneRadius2">
<widget class="Gui::QuantitySpinBox" name="coneRadius2">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>4.000000000000000</double>
</property>
@ -399,7 +420,10 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="coneLength">
<widget class="Gui::QuantitySpinBox" name="coneLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
@ -420,7 +444,10 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="coneRadius1">
<widget class="Gui::QuantitySpinBox" name="coneRadius1">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>
@ -447,7 +474,10 @@
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="coneEdgeLength">
<widget class="Gui::QuantitySpinBox" name="coneEdgeLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
@ -528,7 +558,10 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="sphereRadius">
<widget class="Gui::QuantitySpinBox" name="sphereRadius">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>5.000000000000000</double>
</property>
@ -605,7 +638,10 @@
<number>6</number>
</property>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="ellipsoidRadius2">
<widget class="Gui::QuantitySpinBox" name="ellipsoidRadius2">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>4.000000000000000</double>
</property>
@ -619,7 +655,10 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="ellipsoidRadius1">
<widget class="Gui::QuantitySpinBox" name="ellipsoidRadius1">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>
@ -717,14 +756,20 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="toroidRadius2">
<widget class="Gui::QuantitySpinBox" name="toroidRadius2">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="toroidRadius1">
<widget class="Gui::QuantitySpinBox" name="toroidRadius1">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
@ -792,6 +837,13 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>comboBox1</tabstop>
<tabstop>boxLength</tabstop>

30
src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
View File

@ -126,9 +126,9 @@ void MeshGui::DlgRegularSolidImp::on_createSolidButton_clicked()
"App.ActiveDocument.%1.Width=%3\n"
"App.ActiveDocument.%1.Height=%4\n"))
.arg(QLatin1String(name.c_str()))
.arg(boxLength->value(),0,'f',2)
.arg(boxWidth->value(),0,'f',2)
.arg(boxHeight->value(),0,'f',2);
.arg(boxLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(boxWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(boxHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals());
}
else if (comboBox1->currentIndex() == 1) { // cylinder
name = doc->getUniqueObjectName("Cylinder");
@ -140,9 +140,9 @@ void MeshGui::DlgRegularSolidImp::on_createSolidButton_clicked()
"App.ActiveDocument.%1.Closed=%5\n"
"App.ActiveDocument.%1.Sampling=%6\n"))
.arg(QLatin1String(name.c_str()))
.arg(cylinderRadius->value(),0,'f',2)
.arg(cylinderLength->value(),0,'f',2)
.arg(cylinderEdgeLength->value(),0,'f',2)
.arg(cylinderRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(cylinderLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(cylinderEdgeLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(QLatin1String((cylinderClosed->isChecked()?"True":"False")))
.arg(cylinderCount->value());
}
@ -157,10 +157,10 @@ void MeshGui::DlgRegularSolidImp::on_createSolidButton_clicked()
"App.ActiveDocument.%1.Closed=%6\n"
"App.ActiveDocument.%1.Sampling=%7\n"))
.arg(QLatin1String(name.c_str()))
.arg(coneRadius1->value(),0,'f',2)
.arg(coneRadius2->value(),0,'f',2)
.arg(coneLength->value(),0,'f',2)
.arg(coneEdgeLength->value(),0,'f',2)
.arg(coneRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(coneRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(coneLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(coneEdgeLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(QLatin1String((coneClosed->isChecked()?"True":"False")))
.arg(coneCount->value());
}
@ -171,7 +171,7 @@ void MeshGui::DlgRegularSolidImp::on_createSolidButton_clicked()
"App.ActiveDocument.%1.Radius=%2\n"
"App.ActiveDocument.%1.Sampling=%3\n"))
.arg(QLatin1String(name.c_str()))
.arg(sphereRadius->value(),0,'f',2)
.arg(sphereRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(sphereCount->value());
}
else if (comboBox1->currentIndex() == 4) { // ellipsoid
@ -182,8 +182,8 @@ void MeshGui::DlgRegularSolidImp::on_createSolidButton_clicked()
"App.ActiveDocument.%1.Radius2=%3\n"
"App.ActiveDocument.%1.Sampling=%4\n"))
.arg(QLatin1String(name.c_str()))
.arg(ellipsoidRadius1->value(),0,'f',2)
.arg(ellipsoidRadius2->value(),0,'f',2)
.arg(ellipsoidRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(ellipsoidRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(ellipsoidCount->value());
}
else if (comboBox1->currentIndex() == 5) { // toroid
@ -194,8 +194,8 @@ void MeshGui::DlgRegularSolidImp::on_createSolidButton_clicked()
"App.ActiveDocument.%1.Radius2=%3\n"
"App.ActiveDocument.%1.Sampling=%4\n"))
.arg(QLatin1String(name.c_str()))
.arg(toroidRadius1->value(),0,'f',2)
.arg(toroidRadius2->value(),0,'f',2)
.arg(toroidRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(toroidRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
.arg(toroidCount->value());
}