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

+ use quantity box for length on extrusion dialog

Browse Source
This commit is contained in:
wmayer 2016-02-27 18:37:53 +01:00
parent 6fe6863001
commit 3fc7b6bfb2
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Part/Gui/DlgExtrusion.cpp
View File

@ -62,7 +62,7 @@ DlgExtrusion::DlgExtrusion(QWidget* parent, Qt::WindowFlags fl)
ui->dirX->setDecimals(Base::UnitsApi::getDecimals());
ui->dirY->setDecimals(Base::UnitsApi::getDecimals());
ui->dirZ->setDecimals(Base::UnitsApi::getDecimals());
ui->dirLen->setDecimals(Base::UnitsApi::getDecimals());
ui->dirLen->setUnit(Base::Unit::Length);
ui->taperAngle->setUnit(Base::Unit::Angle);
ui->dirLen->setMinimumWidth(55); // needed to show all digits
findShapes();
@ -179,10 +179,10 @@ void DlgExtrusion::apply()
label = name;
}
double len = ui->dirLen->value();
double dirX = ui->dirX->value();
double dirY = ui->dirY->value();
double dirZ = ui->dirZ->value();
double len = ui->dirLen->value().getValue();
double angle = ui->taperAngle->value().getValue();
bool makeSolid = ui->makeSolid->isChecked();

79
src/Mod/Part/Gui/DlgExtrusion.ui
View File

@ -26,7 +26,41 @@
<string>Direction</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<item row="1" column="0">
<widget class="QCheckBox" name="checkNormal">
<property name="text">
<string>Along normal</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="viewButton">
<property name="text">
<string>3D view</string>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="labelNormal">
<property name="text">
<string>Note:This option works for planes only</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
@ -120,15 +154,15 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="dirLen">
<widget class="Gui::QuantitySpinBox" name="dirLen">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="decimals">
<number>3</number>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.001000000000000</double>
@ -143,40 +177,6 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkNormal">
<property name="text">
<string>Along normal</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="viewButton">
<property name="text">
<string>3D view</string>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="labelNormal">
<property name="text">
<string>Note:This option works for planes only</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -198,6 +198,9 @@
</item>
<item>
<widget class="Gui::QuantitySpinBox" name="taperAngle">
<property name="unit" stdset="0">
<string notr="true">deg</string>
</property>
<property name="minimum">
<double>-180.000000000000000</double>
</property>