diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
index 8bb0eeb56b..64f858b76a 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
@@ -604,17 +604,17 @@ void TaskHoleParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
Q_UNUSED(msg)
}
-bool TaskHoleParameters::getThreaded() const
+bool TaskHoleParameters::getThreaded() const
{
return ui->Threaded->isChecked();
}
-long TaskHoleParameters::getThreadType() const
+long TaskHoleParameters::getThreadType() const
{
return ui->ThreadType->currentIndex();
}
-long TaskHoleParameters::getThreadSize() const
+long TaskHoleParameters::getThreadSize() const
{
if ( ui->ThreadSize->currentIndex() == -1 )
return 0;
@@ -622,7 +622,7 @@ long TaskHoleParameters::getThreadSize() const
return ui->ThreadSize->currentIndex();
}
-long TaskHoleParameters::getThreadClass() const
+long TaskHoleParameters::getThreadClass() const
{
if ( ui->ThreadSize->currentIndex() == -1 )
return 0;
@@ -632,10 +632,9 @@ long TaskHoleParameters::getThreadClass() const
long TaskHoleParameters::getThreadFit() const
{
- if (ui->Threaded->isChecked())
- return ui->ThreadFit->currentIndex();
- else
- return 0;
+ // the fit is independent if the hole is threaded or not
+ // since an unthreaded hole for a screw can also have a close fit
+ return ui->ThreadFit->currentIndex();
}
Base::Quantity TaskHoleParameters::getDiameter() const
@@ -643,12 +642,15 @@ Base::Quantity TaskHoleParameters::getDiameter() const
return ui->Diameter->value();
}
-bool TaskHoleParameters::getThreadDirection() const
+long TaskHoleParameters::getThreadDirection() const
{
- return ui->directionRightHand->isChecked();
+ if (ui->directionRightHand->isChecked())
+ return 0;
+ else
+ return 1;
}
-long TaskHoleParameters::getHoleCutType() const
+long TaskHoleParameters::getHoleCutType() const
{
if (ui->HoleCutType->currentIndex() == -1)
return 0;
@@ -671,7 +673,7 @@ Base::Quantity TaskHoleParameters::getHoleCutCountersinkAngle() const
return ui->HoleCutCountersinkAngle->value();
}
-long TaskHoleParameters::getDepthType() const
+long TaskHoleParameters::getDepthType() const
{
return ui->DepthType->currentIndex();
}
@@ -681,7 +683,7 @@ Base::Quantity TaskHoleParameters::getDepth() const
return ui->Depth->value();
}
-long TaskHoleParameters::getDrillPoint() const
+long TaskHoleParameters::getDrillPoint() const
{
if ( ui->drillPointFlat->isChecked() )
return 0;
@@ -696,7 +698,7 @@ Base::Quantity TaskHoleParameters::getDrillPointAngle() const
return ui->DrillPointAngle->value();
}
-bool TaskHoleParameters::getTapered() const
+bool TaskHoleParameters::getTapered() const
{
return ui->Tapered->isChecked();
}
diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.h b/src/Mod/PartDesign/Gui/TaskHoleParameters.h
index bce24e7204..9c74bb30af 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.h
@@ -67,7 +67,7 @@ public:
long getThreadClass() const;
long getThreadFit() const;
Base::Quantity getDiameter() const;
- bool getThreadDirection() const;
+ long getThreadDirection() const;
long getHoleCutType() const;
Base::Quantity getHoleCutDiameter() const;
Base::Quantity getHoleCutDepth() const;
diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
index b5322743b4..14ab5d8fd2 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
@@ -7,79 +7,62 @@
0
0
356
- 660
+ 583
Task Hole Parameters
- -
-
+
-
+
+
-
+
+ Standard fit
+
+
+ -
+
+ Close fit
+
+
+
+
+ -
+
+
+ Countersink angle
+
+
+
+ -
+
+
+ -
+
+
+ false
+
mm
- -
-
-
-
- 0
- 0
-
-
+
-
+
+
+ -
+
- Type
+ Fit
- -
-
-
- Diameter
-
-
-
- -
-
-
- Depth
-
-
-
- -
-
+
-
+
false
-
- Cutoff inner
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Class
-
-
-
- -
-
-
- Tapered
-
-
-
- -
-
mm
@@ -101,33 +84,13 @@
- -
-
-
- -
-
+
-
+
- Fit
+ Threaded
- -
-
-
- mm
-
-
-
- -
-
-
- mm
-
-
-
- -
-
-
-
@@ -175,7 +138,7 @@
-
-
+
deg
@@ -186,6 +149,119 @@
+ -
+
+
+ -
+
+
+ false
+
+
+ mm
+
+
+
+ -
+
+
+ <b>Misc</b>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Class
+
+
+
+ -
+
+
+ Reversed
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Size
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Profile
+
+
+
+ -
+
+
+ Diameter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Diameter
+
+
+
+ -
+
+
+ mm
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Depth
+
+
+
+ -
+
+
+ mm
+
+
+
-
@@ -196,6 +272,13 @@
+ -
+
+
+ <b>Hole cut</b>
+
+
+
-
@@ -231,115 +314,13 @@
- -
-
-
- false
-
-
- Model actual thread
-
-
-
- -
-
-
- Threaded
-
-
-
- -
-
-
- false
-
-
- Angle
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Profile
-
-
-
- -
-
-
- -
-
-
- Countersink angle
-
-
-
- -
-
-
- Type
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Diameter
-
-
-
- -
-
-
- -
-
-
-
- 0
- 0
-
-
+
-
+
Depth
- -
-
-
- deg
-
-
-
-
@@ -360,83 +341,6 @@
- -
-
-
-
- 0
- 0
-
-
-
- Size
-
-
-
- -
-
-
-
-
- Standard fit
-
-
- -
-
- Close fit
-
-
-
-
- -
-
-
- false
-
-
- Cutoff outer
-
-
-
- -
-
-
- false
-
-
- mm
-
-
-
- -
-
-
- false
-
-
- deg
-
-
-
- -
-
-
- false
-
-
- mm
-
-
-
- -
-
-
- false
-
-
- mm
-
-
-
-
@@ -453,17 +357,63 @@
- -
-
+
-
+
+
+ false
+
- <b>Misc</b>
+ Cutoff inner
- -
-
+
-
+
+
+ false
+
- <b>Hole cut</b>
+ Angle
+
+
+
+ -
+
+
+ false
+
+
+ Cutoff outer
+
+
+
+ -
+
+
+ -
+
+
+ Tapered
+
+
+
+ -
+
+
+ mm
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Type
@@ -474,17 +424,54 @@
+ -
+
+
+ false
+
+
+ Model actual thread
+
+
+
-
-
+
deg
- -
-
+
-
+
+
+ false
+
+
+ deg
+
+
+
+ -
+
- Reversed
+ Type
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ deg
+
+
+
+ -
+
+
+ mm
@@ -492,8 +479,13 @@
- Gui::PrefQuantitySpinBox
+ Gui::QuantitySpinBox
QWidget
+
+
+
+ Gui::PrefQuantitySpinBox
+ Gui::QuantitySpinBox