7306ed28b0
as reported in https://tracker.freecadweb.org/view.php?id=3818 we treat the blind hole depth not according to the conventions. The size of the drill point due to the angle is normally not taken into account but FC does this in any case. This PR adds therefore an option, that is by default off, to take the drill point size into account. Without the option, (the new default) the depth is calculated according to the conventions. The PR also removes unused widgets and restored the tab order in the .ui file. The thread parameters were never used. In case we made in future the decision to carve into holes real (modeled) threads, we need a special UI for that solution anyway so having the dead code in is not helpful at all.
670 lines
18 KiB
XML
670 lines
18 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<ui version="4.0">
|
|
<class>TaskHoleParameters</class>
|
|
<widget class="QWidget" name="TaskHoleParameters">
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>354</width>
|
|
<height>463</height>
|
|
</rect>
|
|
</property>
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="windowTitle">
|
|
<string>Task Hole Parameters</string>
|
|
</property>
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
<item row="0" column="0" colspan="2">
|
|
<widget class="QLabel" name="label_13">
|
|
<property name="text">
|
|
<string><b>Threading and size</b></string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="0">
|
|
<widget class="QLabel" name="label_2">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Profile</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="1" colspan="5">
|
|
<widget class="QComboBox" name="ThreadType">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>16777215</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="2" column="1">
|
|
<widget class="QCheckBox" name="Threaded">
|
|
<property name="toolTip">
|
|
<string>Whether the hole gets a thread</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Threaded</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="3" column="0">
|
|
<widget class="QLabel" name="label_8">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Direction</string>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="3" column="1">
|
|
<widget class="QRadioButton" name="directionRightHand">
|
|
<property name="toolTip">
|
|
<string/>
|
|
</property>
|
|
<property name="text">
|
|
<string>Right hand</string>
|
|
</property>
|
|
<attribute name="buttonGroup">
|
|
<string notr="true">directionButtonGroup</string>
|
|
</attribute>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="1">
|
|
<widget class="QRadioButton" name="directionLeftHand">
|
|
<property name="text">
|
|
<string>Left hand</string>
|
|
</property>
|
|
<attribute name="buttonGroup">
|
|
<string notr="true">directionButtonGroup</string>
|
|
</attribute>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="0">
|
|
<widget class="QLabel" name="label_4">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Size</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="1">
|
|
<widget class="QComboBox" name="ThreadSize">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>140</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="3">
|
|
<widget class="QLabel" name="label_3">
|
|
<property name="text">
|
|
<string>Clearance</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="5">
|
|
<widget class="QComboBox" name="ThreadFit">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>110</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="toolTip">
|
|
<string>Hole clearance
|
|
Only available for holes without thread</string>
|
|
</property>
|
|
<item>
|
|
<property name="text">
|
|
<string>Standard</string>
|
|
</property>
|
|
</item>
|
|
<item>
|
|
<property name="text">
|
|
<string>Close</string>
|
|
</property>
|
|
</item>
|
|
<item>
|
|
<property name="text">
|
|
<string>Wide</string>
|
|
</property>
|
|
</item>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="0">
|
|
<widget class="QLabel" name="label_5">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Class</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="1">
|
|
<widget class="QComboBox" name="ThreadClass">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>140</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="toolTip">
|
|
<string>Tolerance class for threaded holes according to hole profile</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="2">
|
|
<spacer name="horizontalSpacer">
|
|
<property name="orientation">
|
|
<enum>Qt::Horizontal</enum>
|
|
</property>
|
|
<property name="sizeType">
|
|
<enum>QSizePolicy::Fixed</enum>
|
|
</property>
|
|
<property name="sizeHint" stdset="0">
|
|
<size>
|
|
<width>13</width>
|
|
<height>20</height>
|
|
</size>
|
|
</property>
|
|
</spacer>
|
|
</item>
|
|
<item row="7" column="3" colspan="2">
|
|
<widget class="QLabel" name="label_7">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Diameter</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="5">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="Diameter">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>110</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="toolTip">
|
|
<string>Hole diameter</string>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">mm</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="8" column="0">
|
|
<widget class="QLabel" name="label_6">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Depth</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="8" column="1">
|
|
<widget class="QComboBox" name="DepthType">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>140</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<item>
|
|
<property name="text">
|
|
<string>Dimension</string>
|
|
</property>
|
|
</item>
|
|
<item>
|
|
<property name="text">
|
|
<string>Through all</string>
|
|
</property>
|
|
</item>
|
|
</widget>
|
|
</item>
|
|
<item row="8" column="3" colspan="3">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="Depth">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">mm</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="9" column="0">
|
|
<widget class="QLabel" name="label_14">
|
|
<property name="text">
|
|
<string><b>Hole cut</b></string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="10" column="0">
|
|
<widget class="QLabel" name="label">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Type</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="10" column="1" colspan="5">
|
|
<widget class="QComboBox" name="HoleCutType">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>16777215</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="toolTip">
|
|
<string>Cut type for screw heads</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="11" column="1">
|
|
<widget class="QLabel" name="label_11">
|
|
<property name="text">
|
|
<string>Diameter</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="11" column="3" colspan="3">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="HoleCutDiameter">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>16777215</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="contextMenuPolicy">
|
|
<enum>Qt::NoContextMenu</enum>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">mm</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
<property name="singleStep">
|
|
<double>0.100000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="12" column="1">
|
|
<widget class="QLabel" name="label_12">
|
|
<property name="text">
|
|
<string>Depth</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="12" column="3" colspan="3">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="HoleCutDepth">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>16777215</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">mm</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
<property name="singleStep">
|
|
<double>0.100000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="13" column="1">
|
|
<widget class="QLabel" name="label_10">
|
|
<property name="text">
|
|
<string>Countersink angle</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="13" column="3" colspan="3">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="HoleCutCountersinkAngle">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="maximumSize">
|
|
<size>
|
|
<width>16777215</width>
|
|
<height>16777215</height>
|
|
</size>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">deg</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="14" column="0">
|
|
<widget class="QLabel" name="label_9">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string><b>Drill point</b></string>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="15" column="0">
|
|
<widget class="QLabel" name="label_15">
|
|
<property name="text">
|
|
<string>Type</string>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="15" column="1">
|
|
<widget class="QRadioButton" name="drillPointFlat">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Flat</string>
|
|
</property>
|
|
<attribute name="buttonGroup">
|
|
<string notr="true">drillPointButtonGroup</string>
|
|
</attribute>
|
|
</widget>
|
|
</item>
|
|
<item row="18" column="1">
|
|
<widget class="QRadioButton" name="drillPointAngled">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Angled</string>
|
|
</property>
|
|
<attribute name="buttonGroup">
|
|
<string notr="true">drillPointButtonGroup</string>
|
|
</attribute>
|
|
</widget>
|
|
</item>
|
|
<item row="18" column="3" colspan="3">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="DrillPointAngle">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">deg</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="19" column="3" colspan="3">
|
|
<widget class="QCheckBox" name="DrillForDepth">
|
|
<property name="toolTip">
|
|
<string>The size of the drill point will be taken into
|
|
account for the depth of blind holes</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Take into account for depth</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="20" column="0">
|
|
<widget class="QLabel" name="label_16">
|
|
<property name="text">
|
|
<string><b>Misc</b></string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="21" column="0">
|
|
<widget class="QCheckBox" name="Tapered">
|
|
<property name="text">
|
|
<string>Tapered</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="21" column="1">
|
|
<widget class="Gui::PrefQuantitySpinBox" name="TaperedAngle">
|
|
<property name="toolTip">
|
|
<string>Taper angle for the hole
|
|
90 degree: straight hole
|
|
under 90: smaller hole radius at the bottom
|
|
over 90: larger hole radius at the bottom</string>
|
|
</property>
|
|
<property name="unit" stdset="0">
|
|
<string notr="true">deg</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="21" column="4" colspan="2">
|
|
<widget class="QCheckBox" name="Reversed">
|
|
<property name="toolTip">
|
|
<string>Reverses the hole direction</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Reversed</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<customwidgets>
|
|
<customwidget>
|
|
<class>Gui::QuantitySpinBox</class>
|
|
<extends>QWidget</extends>
|
|
<header>Gui/QuantitySpinBox.h</header>
|
|
</customwidget>
|
|
<customwidget>
|
|
<class>Gui::PrefQuantitySpinBox</class>
|
|
<extends>Gui::QuantitySpinBox</extends>
|
|
<header>Gui/PrefWidgets.h</header>
|
|
</customwidget>
|
|
</customwidgets>
|
|
<tabstops>
|
|
<tabstop>ThreadType</tabstop>
|
|
<tabstop>Threaded</tabstop>
|
|
<tabstop>directionRightHand</tabstop>
|
|
<tabstop>directionLeftHand</tabstop>
|
|
<tabstop>ThreadSize</tabstop>
|
|
<tabstop>ThreadFit</tabstop>
|
|
<tabstop>ThreadClass</tabstop>
|
|
<tabstop>Diameter</tabstop>
|
|
<tabstop>DepthType</tabstop>
|
|
<tabstop>Depth</tabstop>
|
|
<tabstop>HoleCutType</tabstop>
|
|
<tabstop>HoleCutDiameter</tabstop>
|
|
<tabstop>HoleCutDepth</tabstop>
|
|
<tabstop>HoleCutCountersinkAngle</tabstop>
|
|
<tabstop>drillPointFlat</tabstop>
|
|
<tabstop>drillPointAngled</tabstop>
|
|
<tabstop>DrillPointAngle</tabstop>
|
|
<tabstop>DrillForDepth</tabstop>
|
|
<tabstop>Tapered</tabstop>
|
|
<tabstop>TaperedAngle</tabstop>
|
|
<tabstop>Reversed</tabstop>
|
|
</tabstops>
|
|
<resources/>
|
|
<connections>
|
|
<connection>
|
|
<sender>Tapered</sender>
|
|
<signal>clicked(bool)</signal>
|
|
<receiver>TaperedAngle</receiver>
|
|
<slot>setEnabled(bool)</slot>
|
|
<hints>
|
|
<hint type="sourcelabel">
|
|
<x>49</x>
|
|
<y>451</y>
|
|
</hint>
|
|
<hint type="destinationlabel">
|
|
<x>163</x>
|
|
<y>453</y>
|
|
</hint>
|
|
</hints>
|
|
</connection>
|
|
<connection>
|
|
<sender>Threaded</sender>
|
|
<signal>clicked(bool)</signal>
|
|
<receiver>ThreadFit</receiver>
|
|
<slot>setEnabled(bool)</slot>
|
|
<hints>
|
|
<hint type="sourcelabel">
|
|
<x>136</x>
|
|
<y>63</y>
|
|
</hint>
|
|
<hint type="destinationlabel">
|
|
<x>344</x>
|
|
<y>142</y>
|
|
</hint>
|
|
</hints>
|
|
</connection>
|
|
<connection>
|
|
<sender>Threaded</sender>
|
|
<signal>clicked(bool)</signal>
|
|
<receiver>ThreadClass</receiver>
|
|
<slot>setEnabled(bool)</slot>
|
|
<hints>
|
|
<hint type="sourcelabel">
|
|
<x>136</x>
|
|
<y>63</y>
|
|
</hint>
|
|
<hint type="destinationlabel">
|
|
<x>163</x>
|
|
<y>168</y>
|
|
</hint>
|
|
</hints>
|
|
</connection>
|
|
</connections>
|
|
<buttongroups>
|
|
<buttongroup name="drillPointButtonGroup"/>
|
|
<buttongroup name="directionButtonGroup"/>
|
|
</buttongroups>
|
|
</ui>
|