kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[CAM] Add UI elements for viewing and editing tool controller parameters from within the operation edit UI (#23180)

Browse Source 
* [CAM] extract tool controller ui elements into their own file

* [CAM] make the changes in the tool controller UI only apply when ok is clicked

* [CAM] Add tool controller edit panel to the Profile operation

* [CAM] Add copy button to in-operation tool controller editor

* [CAM] clean up changes

* [CAM] Add tool controller edit UI to all operations

Notes on changes that were not a simple copy/paste job from the changes
I made for Profile:

- Deburr: changed TC/coolant rows from 1 and 2 to 0 and 1

- Probe: didn't work at all initially due to bug in main where ShapeName
  changed to ShapeType. I added a utility for reading either a ShapeType
or a ShapeName (check for both properties, convert ShapeType to lower
case) and applied it to probe and camotics

- Drilling: moved Keep Tool Down checkbox up from row 8 to row 2 (all
  intermediate rows were missing) and added the edit checkbox in row 3
below it

- VBit, Probe (or anything else that requires a specific tool type): in
  Base.py setupToolController(), I added a check to see if the currently
selected tool is an invalid type, and if so and there is a valid tool,
then change to that one. This fixes two UI bugs. Plausibly pre-existing,
if there is one valid tool and an invalid tool is selected, it's
impossible to switch to the valid one because you can't generate a combo
box change event for the new tool. Definitely new: if an invalid tool is
selected and there are no valid tools, the combo box will be empty but
the new tool controller edit utility will let you edit the current TC
anyway.

- Thread Milling: replaced the Tool Controller GroupBox with the
  standard QFrame layout, and added the checkbox. Note that this
operation doesn't have a UI element for coolant -- likely a bug, but I
didn't look into it

- Surface: Changed from form layout to grid layout. Deleted an old
  SurfaceEdit.ui file -- it was replaced with PageOpSurfaceEdit.ui in
2017 but not deleted (commit 77af19e7489e1fc637a68cdad220e5dd430dc2b9)

- Waterline: Changed from form layout to grid layout

* [CAM] Bug fixes

setupUi() wasn't called on the tool controller editor, preventing
changes in its UI from being written back to the object immediately.
This caused weird behavior where if you edited a field twice it would
reset the second time it was focused

Added a hook to automatically update the TC combo box when the TC name
(or anything else about it, since that was easier) changes

* Fix usage of QSignalBlockers

* [CAM] Block scroll events on tool number and spindle direction when not
focused

Specifically, if you mouse over either of these UI elements and use the
scroll wheel, it used to focus the element and change its value. This
commit makes it do neither of those things, for these specific elements,
as a measure against users accidentally changing these values.

* disable tcNumber edit field in operations panel

* Add "New tool controller" option to TC combo box

When selected, it opens (toggles, technically) the tool bit dock and
returns to the previous selection. Adding a new tool controller using
the dock (already, before this commit) automatically switches the
operation's tool controller to the new one

* Add "Copy" option to tool controller combo box

* Copy TC function only in combo box, no button

* [CAM] update in-operation "new tool controller" function to use a dialog

* [CAM] make the tool selector always a dialog and never a dock

* remove spacer from ToolControllerEdit.ui to fix exces white space

* [CAM] change tool dialog default sizing/spacing

* [CAM] fix bug where copying tool controller doesn't copy all values
This commit is contained in:
David Kaufman
2025-09-02 11:19:33 -04:00
committed by GitHub
parent 85af5e6095
commit db9a615985
27 changed files with 637 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/CAM/Gui/Resources/Path.qrc
View File

@@ -124,6 +124,7 @@
<file>panels/SetupOp.ui</file>
<file>panels/ToolBitEditor.ui</file>
<file>panels/ToolBitLibraryEdit.ui</file>
<file>panels/ToolControllerEdit.ui</file>
<file>panels/TaskPathCamoticsSim.ui</file>
<file>panels/TaskPathSimulator.ui</file>
<file>panels/TaskCAMSimulator.ui</file>

304
src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui
View File

@@ -15,293 +15,8 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolBox" name="toolBox">
<widget class="QWidget" name="toolBoxPage1">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>543</width>
<height>638</height>
</rect>
</property>
<attribute name="label">
<string>Controller</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Controller Name / Tool Number</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="tcName">
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="tcNumber">
<property name="maximum">
<number>99999</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Horizontal feed</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="horizFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Vertical feed</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="vertFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Horizontal rapid</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="horizRapid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Vertical rapid</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="vertRapid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Spindle</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="spindleDirection">
<item>
<property name="text">
<string>Forward</string>
</property>
</item>
<item>
<property name="text">
<string>Reverse</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QDoubleSpinBox" name="spindleSpeed">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="toolBoxPage2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>543</width>
<height>638</height>
</rect>
</property>
<attribute name="label">
<string>Tool</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QWidget" name="toolEditor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_14">
<property name="frameShape">
<enum>QFrame::WinPanel</enum>
</property>
<property name="text">
<string>Any modifications only affect this ToolController!</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="toolBoxPage1">
<layout class="QVBoxLayout" name="tc_layout"/>
</widget>
</item>
<item>
@@ -316,22 +31,7 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tcName</tabstop>
<tabstop>tcNumber</tabstop>
<tabstop>horizFeed</tabstop>
<tabstop>vertFeed</tabstop>
<tabstop>horizRapid</tabstop>
<tabstop>vertRapid</tabstop>
<tabstop>spindleSpeed</tabstop>
<tabstop>spindleDirection</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>

9
src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui
View File

@@ -25,7 +25,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="ToolController"/>
<widget class="QComboBox" name="toolController"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
@@ -37,6 +37,13 @@
<item row="1" column="1">
<widget class="QComboBox" name="coolantController"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui
View File

@@ -53,6 +53,13 @@
<item row="1" column="1">
<widget class="QComboBox" name="coolantController"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

15
src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui
View File

@@ -29,7 +29,7 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -54,14 +54,14 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="QComboBox" name="toolController">
<property name="toolTip">
<string>The tool and its settings to be used for this operation</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -86,13 +86,20 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QComboBox" name="coolantController">
<property name="toolTip">
<string>The tool and its settings to be used for this operation</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

11
src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui
View File

@@ -56,8 +56,8 @@
<string>The tool and its settings to be used for this operation</string>
</property>
</widget>
</item>
<item row="8" column="1">
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="KeepToolDownEnabled">
<property name="toolTip">
<string>Do not retract after every hole</string>
@@ -67,6 +67,13 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui
View File

@@ -51,6 +51,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui
View File

@@ -51,6 +51,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui
View File

@@ -51,6 +51,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui
View File

@@ -43,6 +43,13 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui
View File

@@ -51,6 +51,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

9
src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui
View File

@@ -25,7 +25,7 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<layout class="QGridLayout" name="gridLayout">
<property name="bottomMargin">
<number>3</number>
</property>
@@ -53,6 +53,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

9
src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui
View File

@@ -22,7 +22,7 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="toolController_label">
<property name="text">
@@ -51,6 +51,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

7
src/Mod/CAM/Gui/Resources/panels/PageOpTappingEdit.ui
View File

@@ -111,6 +111,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

33
src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui
View File

@@ -15,13 +15,34 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Tool Controller</string>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QComboBox" name="toolController"/>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Tool Controller</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="toolController">
<property name="toolTip">
<string>The tool and its settings to be used for this operation.</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>

7
src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui
View File

@@ -51,6 +51,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

9
src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui
View File

@@ -22,7 +22,7 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="toolController_label">
<property name="text">
@@ -47,6 +47,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="editToolController">
<property name="text">
<string>Edit Tool Controller</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

351
src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui
View File

@@ -1,351 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TaskPanel</class>
<widget class="QWidget" name="TaskPanel">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>363</width>
<height>523</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>400</height>
</size>
</property>
<property name="windowTitle">
<string>Surface</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>3</number>
</property>
<widget class="QWidget" name="Geometry">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>347</width>
<height>391</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/CAM_BaseGeometry.svg</normaloff>:/icons/CAM_BaseGeometry.svg</iconset>
</attribute>
<attribute name="label">
<string>Base geometry</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3">
<widget class="QListWidget" name="baseList">
<property name="toolTip">
<string>Drag to reorder, then update</string>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::DragDrop</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::MoveAction</enum>
</property>
<property name="sortingEnabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="addBase">
<property name="toolTip">
<string>Add item selected in window</string>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="deleteBase">
<property name="toolTip">
<string>Remove item selected in list, then update</string>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="reorderBase">
<property name="toolTip">
<string>Update the path with the removed and reordered items</string>
</property>
<property name="text">
<string>Update</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>All objects will be profiled using the same depth and speed settings</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="Depths">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>347</width>
<height>391</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/CAM_Depths.svg</normaloff>:/icons/CAM_Depths.svg</iconset>
</attribute>
<attribute name="label">
<string>Depths</string>
</attribute>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="Gui::InputField" name="startDepth">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Start depth</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::InputField" name="finalDepth">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Final depth</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="Gui::InputField" name="stepDown">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Step down</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="Gui::InputField" name="finishDepth">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Finish step down</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="Heights">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>347</width>
<height>391</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/CAM_Heights.svg</normaloff>:/icons/CAM_Heights.svg</iconset>
</attribute>
<attribute name="label">
<string>Heights</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="Gui::InputField" name="safeHeight">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Safe height</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::InputField" name="clearanceHeight">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Clearance height</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>347</width>
<height>391</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/CAM_OperationB.svg</normaloff>:/icons/CAM_OperationB.svg</iconset>
</attribute>
<attribute name="label">
<string>Operation</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Tool controller</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="uiToolController"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Coolant mode</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="coolantController">
<property name="toolTip">
<string>The tool and its settings to be used for this operation.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Algorithm</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="algorithmSelect">
<item>
<property name="text">
<string>OCL dropcutter</string>
</property>
</item>
<item>
<property name="text">
<string>OCL waterline</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>274</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::InputField</class>
<extends>QLineEdit</extends>
<header>Gui/InputField.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../Path.qrc"/>
<include location="../Path.qrc"/>
</resources>
<connections/>
</ui>

240
src/Mod/CAM/Gui/Resources/panels/ToolControllerEdit.ui Normal file
View File

@@ -0,0 +1,240 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Frame</class>
<widget class="QFrame" name="toolControllerEditor">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>561</width>
<height>739</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="tcOperationCountLabel" />
</item>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Controller Name / Tool Number</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="tcName">
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="tcNumber">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::NoButtons</enum>
</property>
<property name="maximum">
<number>99999</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Horizontal feed</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="horizFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Vertical feed</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="vertFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Horizontal rapid</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="horizRapid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Vertical rapid</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="vertRapid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Spindle</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="spindleDirection">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<item>
<property name="text">
<string>Forward</string>
</property>
</item>
<item>
<property name="text">
<string>Reverse</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QDoubleSpinBox" name="spindleSpeed">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tcName</tabstop>
<tabstop>tcNumber</tabstop>
<tabstop>horizFeed</tabstop>
<tabstop>vertFeed</tabstop>
<tabstop>horizRapid</tabstop>
<tabstop>vertRapid</tabstop>
<tabstop>spindleSpeed</tabstop>
<tabstop>spindleDirection</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

7
src/Mod/CAM/Path/Main/Gui/Camotics.py
View File

@@ -28,6 +28,7 @@ import FreeCADGui
import Mesh
import Path
import PathScripts
import PathScripts.PathUtils as PathUtils
import Path.Post.Command as PathPost
import camotics
import io
@@ -191,7 +192,7 @@ class CamoticsSimulation(QtCore.QObject):
self.SIM.set_tool(
t.ToolNumber,
metric=True,
shape=self.SHAPEMAP.get(t.Tool.ShapeName, "Cylindrical"),
shape=self.SHAPEMAP.get(PathUtils.getToolShapeName(t.Tool), "Cylindrical"),
length=t.Tool.Length.Value,
diameter=t.Tool.Diameter.Value,
)
@@ -283,7 +284,9 @@ class CamoticsSimulation(QtCore.QObject):
if hasattr(t.Tool, "Camotics"):
toolitem["shape"] = t.Tool.Camotics
else:
toolitem["shape"] = self.SHAPEMAP.get(t.Tool.ShapeName, "Cylindrical")
toolitem["shape"] = self.SHAPEMAP.get(
PathUtils.getToolShapeName(t.Tool), "Cylindrical"
)
toolitem["length"] = t.Tool.Length.Value
toolitem["diameter"] = t.Tool.Diameter.Value

6
src/Mod/CAM/Path/Op/Gui/Adaptive.py
View File

@@ -57,7 +57,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
signals = []
signals.append(self.form.Side.currentIndexChanged)
signals.append(self.form.OperationType.currentIndexChanged)
signals.append(self.form.ToolController.currentIndexChanged)
signals.append(self.form.toolController.currentIndexChanged)
signals.append(self.form.stepOverPercent.valueChanged)
signals.append(self.form.Tolerance.valueChanged)
signals.append(self.form.HelixAngle.valueChanged)
@@ -113,7 +113,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
self.form.FinishingProfile.setChecked(obj.FinishingProfile)
self.form.useOutline.setChecked(obj.UseOutline)
self.form.orderCutsByRegion.setChecked(obj.OrderCutsByRegion)
self.setupToolController(obj, self.form.ToolController)
self.setupToolController(obj, self.form.toolController)
self.setupCoolant(obj, self.form.coolantController)
self.form.StopButton.setChecked(obj.Stopped)
obj.setEditorMode("AdaptiveInputState", 2) # hide this property
@@ -155,7 +155,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
self.form.StopButton.setChecked(False) # reset the button
obj.StopProcessing = True
self.updateToolController(obj, self.form.ToolController)
self.updateToolController(obj, self.form.toolController)
self.updateCoolant(obj, self.form.coolantController)
obj.setEditorMode("AdaptiveInputState", 2) # hide this property
obj.setEditorMode("AdaptiveOutputState", 2) # hide this property

149
src/Mod/CAM/Path/Op/Gui/Base.py
View File

@@ -30,12 +30,14 @@ import Path.Base.Util as PathUtil
import Path.Main.Job as PathJob
import Path.Op.Base as PathOp
import Path.Op.Gui.Selection as PathSelection
import Path.Tool.Controller as PathToolController
from Path.Tool.library.ui.dock import ToolBitLibraryDock
import PathGui
import PathScripts.PathUtils as PathUtils
import importlib
from PySide.QtCore import QT_TRANSLATE_NOOP
from PySide import QtCore, QtGui
from PySide import QtCore, QtGui, QtWidgets
__title__ = "CAM Operation UI base classes"
__author__ = "sliptonic (Brad Collette)"
@@ -212,9 +214,12 @@ class TaskPanelPage(object):
self.isdirty = False
self.parent = None
self.panelTitle = "Operation"
self.tcEditor = None
self.combo = None
if self._installTCUpdate():
PathJob.Notification.updateTC.connect(self.resetToolController)
self.form.toolController.currentIndexChanged.connect(self.tcComboChanged)
def show_error_message(self, title, message):
msg_box = QtGui.QMessageBox()
@@ -389,27 +394,141 @@ class TaskPanelPage(object):
"""populateCombobox(form, enumTups, comboBoxesPropertyMap) ... proxy for PathGuiUtil.populateCombobox()"""
PathGuiUtil.populateCombobox(form, enumTups, comboBoxesPropertyMap)
def tcComboChanged(self, newIndex):
if self.obj is not None and self.tcEditor:
if newIndex == self.combo.count() - 1:
# Special entry: new tool controller. Show the tool dock and reset combo
dock = ToolBitLibraryDock(self.job, True)
dock.open()
self.resetTCCombo()
elif newIndex == self.combo.count() - 2:
# Special entry: copy tool controller
self.copyToolController() # this function also rebuilds the combo
self.resetTCCombo()
else:
tc = PathUtils.findToolController(
self.obj, self.obj.Proxy, self.form.toolController.currentText()
)
self.obj.ToolController = tc
self.setupToolController()
def updateToolControllerEditorVisibility(self):
if self.form.editToolController.isChecked():
self.tcEditor.controller.show()
else:
self.tcEditor.controller.hide()
def resetToolController(self, job, tc):
if self.obj is not None:
self.obj.ToolController = tc
combo = self.form.toolController
self.setupToolController(self.obj, combo)
self.setupToolController()
def setupToolController(self, obj, combo):
def copyToolController(self):
oldTc = self.tcEditor.obj
self.tcEditor.updateToolController()
tc = PathToolController.Create(
name=oldTc.Label, tool=oldTc.Tool, toolNumber=oldTc.ToolNumber
)
job = self.obj.Proxy.getJob(self.obj)
job.Proxy.addToolController(tc)
tc.HorizFeed = oldTc.HorizFeed
tc.VertFeed = oldTc.VertFeed
tc.HorizRapid = oldTc.HorizRapid
tc.VertRapid = oldTc.VertRapid
tc.SpindleSpeed = oldTc.SpindleSpeed
tc.SpindleDir = oldTc.SpindleDir
for attr, expr in oldTc.ExpressionEngine:
tc.setExpression(attr, expr)
self.obj.ToolController = tc
self.setupToolController()
def tcEditorChanged(self):
self.setDirty()
self.resetTCCombo()
def resetTCCombo(self):
controllers = PathUtils.getToolControllers(self.obj)
if self.obj.ToolController is None:
self.obj.ToolController = PathUtils.findToolController(self.obj, self.obj.Proxy)
if len(controllers) > 0 and not self.obj.Proxy.isToolSupported(
self.obj, self.obj.ToolController.Tool
):
self.obj.ToolController = controllers[0]
tcName = self.obj.ToolController.Label if self.obj.ToolController else ""
labels = [c.Label for c in controllers]
labels.append(FreeCAD.Qt.translate("CAM_Operation", "Copy {0}…").format(tcName))
labels.append(FreeCAD.Qt.translate("CAM_Operation", "New tool controller…"))
self.combo.blockSignals(True)
self.combo.clear()
self.combo.addItems(labels)
self.combo.insertSeparator(len(controllers))
self.combo.blockSignals(False)
if self.obj.ToolController is not None:
self.selectInComboBox(self.obj.ToolController.Label, self.combo)
def setupToolController(self, obj=None, combo=None):
"""setupToolController(obj, combo) ...
helper function to setup obj's ToolController
in the given combo box."""
controllers = PathUtils.getToolControllers(self.obj)
labels = [c.Label for c in controllers]
combo.blockSignals(True)
combo.clear()
combo.addItems(labels)
combo.blockSignals(False)
obj = obj or self.obj
combo = combo or self.combo
self.obj, self.combo = obj, combo
if obj.ToolController is None:
obj.ToolController = PathUtils.findToolController(obj, obj.Proxy)
if obj.ToolController is not None:
self.selectInComboBox(obj.ToolController.Label, combo)
self.resetTCCombo()
if hasattr(self.form, "editToolController"):
layout = self.form.editToolController.parent().layout()
oldEditor = self.tcEditor
# Count the number of times the tool controller is used in other operations
# If it is used in other operations, we will offer the "copy tool controller" button
tcCount = 0
for job in PathUtils.GetJobs():
for op in job.Operations.Group:
if op == self.obj:
continue
elif hasattr(op, "ToolController") and op.ToolController == obj.ToolController:
tcCount += 1
self.tcEditor = Path.Tool.Gui.Controller.ToolControllerEditor(
obj.ToolController,
False,
self.tcEditorChanged,
True,
True,
)
self.tcEditor.setupUi()
labelStr = FreeCAD.Qt.translate(
"CAM_Operation", "This tool controller is used by {0} other operations."
).format(tcCount)
self.tcEditor.controller.tcOperationCountLabel.setText(labelStr)
# add to layout -- requires a grid layout
if isinstance(layout, QtWidgets.QGridLayout):
layout.addWidget(
self.tcEditor.controller, layout.rowCount(), 0, 1, layout.columnCount()
)
else:
Path.Log.error(
"Panel uses a layout incompatible with editing tool controllers. Report a bug: it should be a QGridLayout"
)
self.updateToolControllerEditorVisibility()
self.tcEditor.updateUi()
self.form.editToolController.checkStateChanged.connect(
self.updateToolControllerEditorVisibility
)
if oldEditor:
oldEditor.updateToolController()
oldEditor.controller.hide()
layout.removeWidget(oldEditor.controller)
def updateToolController(self, obj, combo):
"""updateToolController(obj, combo) ...
@@ -418,6 +537,8 @@ class TaskPanelPage(object):
tc = PathUtils.findToolController(obj, obj.Proxy, combo.currentText())
if obj.ToolController != tc:
obj.ToolController = tc
if self.tcEditor:
self.tcEditor.updateToolController()
def setupCoolant(self, obj, combo):
"""setupCoolant(obj, combo) ...

2
src/Mod/CAM/Path/Op/Probe.py
View File

@@ -134,7 +134,7 @@ class ObjectProbing(PathOp.ObjectOp):
def isToolSupported(self, obj, tool):
"""Probe operation requires a probe tool"""
support = hasattr(tool, "ShapeName") and (tool.ShapeName == "probe")
support = PathUtils.getToolShapeName(tool) == "probe"
Path.Log.track(tool.Label, support)
return support

131
src/Mod/CAM/Path/Tool/Gui/Controller.py
View File

@@ -188,80 +188,104 @@ class CommandPathToolController(object):
FreeCAD.ActiveDocument.recompute()
class BlockScrollWheel(QtCore.QObject):
def eventFilter(self, obj, event):
if event.type() == QtCore.QEvent.Type.Wheel:
if not obj.hasFocus():
return True
return super().eventFilter(obj, event)
class ToolControllerEditor(object):
def __init__(self, obj, asDialog):
def __init__(
self, obj, asDialog, notifyChanged=None, showCountLabel=False, disableToolNumber=False
):
self.notifyChanged = notifyChanged
self.form = FreeCADGui.PySideUic.loadUi(":/panels/DlgToolControllerEdit.ui")
self.controller = FreeCADGui.PySideUic.loadUi(":/panels/ToolControllerEdit.ui")
self.form.tc_layout.addWidget(self.controller)
if not asDialog:
self.form.buttonBox.hide()
if not showCountLabel:
self.controller.tcOperationCountLabel.hide()
self.obj = obj
comboToPropertyMap = [("spindleDirection", "SpindleDir")]
enumTups = PathToolController.ToolController.propertyEnumerations(dataType="raw")
PathGuiUtil.populateCombobox(self.form, enumTups, comboToPropertyMap)
self.vertFeed = PathGuiUtil.QuantitySpinBox(self.form.vertFeed, obj, "VertFeed")
self.horizFeed = PathGuiUtil.QuantitySpinBox(self.form.horizFeed, obj, "HorizFeed")
self.vertRapid = PathGuiUtil.QuantitySpinBox(self.form.vertRapid, obj, "VertRapid")
self.horizRapid = PathGuiUtil.QuantitySpinBox(self.form.horizRapid, obj, "HorizRapid")
PathGuiUtil.populateCombobox(self.controller, enumTups, comboToPropertyMap)
self.vertFeed = PathGuiUtil.QuantitySpinBox(self.controller.vertFeed, obj, "VertFeed")
self.horizFeed = PathGuiUtil.QuantitySpinBox(self.controller.horizFeed, obj, "HorizFeed")
self.vertRapid = PathGuiUtil.QuantitySpinBox(self.controller.vertRapid, obj, "VertRapid")
self.horizRapid = PathGuiUtil.QuantitySpinBox(self.controller.horizRapid, obj, "HorizRapid")
self.blockScrollWheel = BlockScrollWheel()
self.controller.tcNumber.installEventFilter(self.blockScrollWheel)
self.controller.spindleDirection.installEventFilter(self.blockScrollWheel)
self.controller.tcNumber.setReadOnly(disableToolNumber)
self.editor = None
self.form.toolBox.widget(1).hide()
self.form.toolBox.removeItem(1)
def selectInComboBox(self, name, combo):
"""selectInComboBox(name, combo) ...
helper function to select a specific value in a combo box."""
blocker = QtCore.QSignalBlocker(combo)
index = combo.currentIndex() # Save initial index
with QtCore.QSignalBlocker(combo):
index = combo.currentIndex() # Save initial index
# Search using currentData and return if found
newindex = combo.findData(name)
if newindex >= 0:
combo.setCurrentIndex(newindex)
return
# Search using currentData and return if found
newindex = combo.findData(name)
if newindex >= 0:
combo.setCurrentIndex(newindex)
return
# if not found, search using current text
newindex = combo.findText(name, QtCore.Qt.MatchFixedString)
if newindex >= 0:
combo.setCurrentIndex(newindex)
return
# if not found, search using current text
newindex = combo.findText(name, QtCore.Qt.MatchFixedString)
if newindex >= 0:
combo.setCurrentIndex(newindex)
return
# not found, return unchanged
combo.setCurrentIndex(index)
# not found, return unchanged
combo.setCurrentIndex(index)
return
def updateUi(self):
tc = self.obj
self.form.tcName.setText(tc.Label)
self.form.tcNumber.setValue(tc.ToolNumber)
self.horizFeed.updateWidget()
self.horizRapid.updateWidget()
self.vertFeed.updateWidget()
self.vertRapid.updateWidget()
self.form.spindleSpeed.setValue(tc.SpindleSpeed)
self.selectInComboBox(tc.SpindleDir, self.form.spindleDirection)
with (
QtCore.QSignalBlocker(self.controller.tcName),
QtCore.QSignalBlocker(self.controller.tcNumber),
QtCore.QSignalBlocker(self.horizFeed.widget),
QtCore.QSignalBlocker(self.horizRapid.widget),
QtCore.QSignalBlocker(self.vertFeed.widget),
QtCore.QSignalBlocker(self.vertRapid.widget),
QtCore.QSignalBlocker(self.controller.spindleSpeed),
QtCore.QSignalBlocker(self.controller.spindleDirection),
):
self.controller.tcName.setText(tc.Label)
self.controller.tcNumber.setValue(tc.ToolNumber)
self.horizFeed.updateWidget()
self.horizRapid.updateWidget()
self.vertFeed.updateWidget()
self.vertRapid.updateWidget()
self.controller.spindleSpeed.setValue(tc.SpindleSpeed)
# index = self.form.spindleDirection.findText(
# tc.SpindleDir, QtCore.Qt.MatchFixedString
# )
# if index >= 0:
# self.form.spindleDirection.setCurrentIndex(index)
self.selectInComboBox(tc.SpindleDir, self.controller.spindleDirection)
if self.editor:
self.editor.updateUI()
if self.editor:
self.editor.updateUI()
def updateToolController(self):
tc = self.obj
try:
tc.Label = self.form.tcName.text()
tc.ToolNumber = self.form.tcNumber.value()
tc.Label = self.controller.tcName.text()
tc.ToolNumber = self.controller.tcNumber.value()
self.horizFeed.updateProperty()
self.vertFeed.updateProperty()
self.horizRapid.updateProperty()
self.vertRapid.updateProperty()
tc.SpindleSpeed = self.form.spindleSpeed.value()
tc.SpindleDir = self.form.spindleDirection.currentData()
tc.SpindleSpeed = self.controller.spindleSpeed.value()
tc.SpindleDir = self.controller.spindleDirection.currentData()
if self.editor:
self.editor.updateTool()
@@ -270,23 +294,29 @@ class ToolControllerEditor(object):
except Exception as e:
Path.Log.error("Error updating TC: {}".format(e))
def refresh(self):
def changed(self):
self.form.blockSignals(True)
self.controller.blockSignals(True)
self.updateToolController()
self.updateUi()
self.controller.blockSignals(False)
self.form.blockSignals(False)
if self.notifyChanged:
self.notifyChanged()
def setupUi(self):
if self.editor:
self.editor.setupUI()
self.form.tcName.editingFinished.connect(self.refresh)
self.form.horizFeed.editingFinished.connect(self.refresh)
self.form.vertFeed.editingFinished.connect(self.refresh)
self.form.horizRapid.editingFinished.connect(self.refresh)
self.form.vertRapid.editingFinished.connect(self.refresh)
self.form.spindleSpeed.editingFinished.connect(self.refresh)
self.form.spindleDirection.currentIndexChanged.connect(self.refresh)
self.controller.tcName.textChanged.connect(self.changed)
self.controller.tcNumber.editingFinished.connect(self.changed)
self.vertFeed.widget.textChanged.connect(self.changed)
self.horizFeed.widget.textChanged.connect(self.changed)
self.vertRapid.widget.textChanged.connect(self.changed)
self.horizRapid.widget.textChanged.connect(self.changed)
self.controller.spindleSpeed.editingFinished.connect(self.changed)
self.controller.spindleDirection.currentIndexChanged.connect(self.changed)
class TaskPanel:
@@ -359,6 +389,9 @@ class DlgToolControllerEdit:
Path.Log.info("revert")
self.obj.Proxy.setFromTemplate(self.obj, restoreTC)
rc = True
else:
self.editor.updateToolController()
self.obj.Proxy.execute(self.obj)
return rc

6
src/Mod/CAM/Path/Tool/library/ui/cmd.py
View File

@@ -48,8 +48,10 @@ class CommandToolBitLibraryDockOpen:
def GetResources(self):
return {
"Pixmap": "CAM_ToolTable",
"MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "Toolbit Dock"),
"ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "Toggles the toolbit dock"),
"MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitSelection", "Add toolbit…"),
"ToolTip": QT_TRANSLATE_NOOP(
"CAM_ToolBitSelection", "Opens the toolbit selection dialog"
),
"Accel": "P, T",
"CmdType": "ForEdit",
}

43
src/Mod/CAM/Path/Tool/library/ui/dock.py
View File

@@ -28,7 +28,7 @@ import FreeCADGui
import Path
import Path.Tool.Gui.Controller as PathToolControllerGui
import PathScripts.PathUtilsGui as PathUtilsGui
from PySide import QtGui, QtCore
from PySide import QtGui, QtCore, QtWidgets
from functools import partial
from typing import List, Tuple
from ...camassets import cam_assets, ensure_assets_initialized
@@ -50,12 +50,20 @@ translate = FreeCAD.Qt.translate
class ToolBitLibraryDock(object):
"""Controller for displaying a library and creating ToolControllers"""
def __init__(self):
def __init__(self, defaultJob=None, autoClose=False):
ensure_assets_initialized(cam_assets)
# Create the main form widget directly
self.form = QtGui.QDockWidget()
self.defaultJob = defaultJob
self.autoClose = autoClose
self.form = QtWidgets.QDialog()
self.form.setObjectName("ToolSelector")
self.form.setWindowTitle(translate("CAM_ToolBit", "Tool Selector"))
self.form.setMinimumSize(600, 400)
self.form.resize(800, 600)
self.form.adjustSize()
self.form_layout = QtGui.QVBoxLayout(self.form)
self.form_layout.setContentsMargins(4, 4, 4, 4)
self.form_layout.setSpacing(4)
# Create the browser widget
self.browser_widget = LibraryBrowserWidget(asset_manager=cam_assets)
@@ -69,6 +77,8 @@ class ToolBitLibraryDock(object):
# Create a main widget and layout for the dock
main_widget = QtGui.QWidget()
main_layout = QtGui.QVBoxLayout(main_widget)
main_layout.setContentsMargins(4, 4, 4, 4)
main_layout.setSpacing(4)
# Add the browser widget to the layout
main_layout.addWidget(self.browser_widget)
@@ -88,7 +98,7 @@ class ToolBitLibraryDock(object):
main_layout.addLayout(button_layout)
# Set the main widget as the dock's widget
self.form.setWidget(main_widget)
self.form.layout().addWidget(main_widget)
# Connect signals from the browser widget and buttons
self.browser_widget.toolSelected.connect(self._update_state)
@@ -152,11 +162,12 @@ class ToolBitLibraryDock(object):
translate("CAM_ToolBit", "Please create a Job first."),
)
return
elif len(jobs) == 1:
job = jobs[0]
elif self.defaultJob or len(jobs) == 1:
job = self.defaultJob or jobs[0]
else:
userinput = PathUtilsGui.PathUtilsUserInput()
job = userinput.chooseJob(jobs)
self.defaultJob = job
if job is None: # user may have canceled
return
@@ -169,21 +180,9 @@ class ToolBitLibraryDock(object):
job.Proxy.addToolController(tc)
FreeCAD.ActiveDocument.recompute()
if self.autoClose:
self.form.accept()
def open(self, path=None):
"""load library stored in path and bring up ui"""
docs = FreeCADGui.getMainWindow().findChildren(QtGui.QDockWidget)
for doc in docs:
if doc.objectName() == "ToolSelector":
if doc.isVisible():
doc.deleteLater()
return
else:
doc.setVisible(True)
return
mw = FreeCADGui.getMainWindow()
mw.addDockWidget(
QtCore.Qt.RightDockWidgetArea,
self.form,
QtCore.Qt.Orientation.Vertical,
)
self.form.exec_()

8
src/Mod/CAM/PathScripts/PathUtils.py
View File

@@ -357,6 +357,14 @@ def getToolControllers(obj, proxy=None):
return []
def getToolShapeName(tool):
if hasattr(tool, "ShapeName"):
return tool.ShapeName.lower()
if hasattr(tool, "ShapeType"):
return tool.ShapeType.lower()
return ""
def findToolController(obj, proxy, name=None):
"""returns a tool controller with a given name.
If no name is specified, returns the first controller.