Commit Graph

93 Commits

Author SHA1 Message Date
sliptonic
bb388f7f94 Merge pull request #23724 from davidgilkaufman/adaptive_reenable_profile
[CAM] regression fix: re-enable adaptive profile mode
2025-09-17 16:41:51 -05:00
David Kaufman
5ceaaaad70 also add qt5 compatibility for checkbox state change signal 2025-09-14 14:59:21 -04:00
David Kaufman
06d833fe4e [CAM] replace python uses of QSignalBlocker 2025-09-13 22:13:55 -04:00
David Kaufman
771d35cc18 [CAM] re-enable adaptive profile mode 2025-09-07 10:55:24 -04:00
J-Dunn
28552c29f2 CAM: fix G0 regression in drilling (#22602)
* CAM: fix G0 regression in drilling

At some point the initial rapid to Safe Height got dropped from drilling cycles. 
This leads to excessive air drilling.
It also alters "OLD_Z" which sets the Retraction plane under G98.

The defect is causing much confusion and time wasting in the roadmap discussions

This PR fixes the G0 regression.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-05 11:14:58 -05:00
tarman3
341a239375 CAM: Fix Task panels for expression in App::PropertyLink (#22955) 2025-09-02 11:22:32 -05:00
David Kaufman
db9a615985 [CAM] Add UI elements for viewing and editing tool controller parameters from within the operation edit UI (#23180)
* [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
2025-09-02 10:19:33 -05:00
jffmichi
f3e83368b1 CAM: use dict constructor for Command in VCarve 2025-09-01 11:24:32 -05:00
Max Wilfinger
3b215da227 Update UI strings from Crowdin reports for consistency 2025-08-28 11:45:38 -05:00
tarman3
bb444a4a04 CAM: Fix seach tool controller in Operations group (#22728) 2025-08-11 11:04:06 -05:00
Ryan Kembrey
4ff71394da CAM: Update UI strings for consistency
Closes: #22350
2025-08-04 20:13:52 +02:00
sliptonic
35a6d485ee Merge pull request #22228 from knipknap/fix-custom-attribute-edit
CAM: Various bugfixes for CAM tool management
2025-08-04 10:39:25 -05:00
sliptonic
6c71317029 Merge pull request #22314 from tarman3/vcarve
CAM: Vcarve fix
2025-07-25 12:44:16 -05:00
sliptonic
0665872310 Merge pull request #22398 from dbtayl/fix_22073
CAM: Adaptive: Fix NULL input shapes when top of stock equals top of model
2025-07-21 11:35:39 -05:00
jffmichi
5d48197a5d CAM: remove redundant move after drilling 2025-07-16 20:31:42 +02:00
Dan Taylor
99d435b3c2 CAM: Adaptive: Fix NULL input shapes when top of stock equals top of model (fix #22073) 2025-07-08 20:09:33 -05:00
tarman3
55ae838394 CAM: Vcarve fix 2025-07-07 19:56:02 +03:00
tarman3
3836f8dbb9 CAM: Changes in warnings of old Array 2025-07-01 06:11:56 +03:00
Samuel Abels
59b73c08d3 CAM: Fix: rename vbit and threadmill back to v-bit and thread-mill to avoid backward compatibility issues 2025-06-30 22:59:14 +02:00
tarman3
8a0d3d2423 Merge branch 'main' into engrave 2025-06-24 08:14:59 +03:00
sliptonic
062f40d2b6 Refactor slot op. (#21799)
* Refactor slot op.
Move out of experimenation features

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Incorporate Hyarion's suggestions

* Update src/Mod/CAM/Path/Op/Slot.py

Co-authored-by: Benjamin Nauck <benjamin@nauck.se>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Benjamin Nauck <benjamin@nauck.se>
2025-06-23 21:22:33 +02:00
jffmichi
f829a09018 CAM: sort tool paths for Engrave and Deburr operation (#21531)
Co-authored-by: jffmichi <>
2025-06-23 10:22:21 -05:00
tarman3
91cc7c37e5 CAM: Custom gcode - Improve error messages (#21509) 2025-06-23 10:05:01 -05:00
Syres916
8844319d33 [BIM][Draft][CAM] preparation for deprecation of QCheckBox… (#21939)
* [BIM][Draft]{CAM] preparation for deprecation of QCheckBox stateChanged -> checkStateChanged
2025-06-18 11:24:21 +02:00
tarman3
be86286688 CAM: Engrave - Fix step down for closed profile 2025-06-17 13:22:26 +03:00
tarman3
af88760744 CAM: Vcarve - fix zStart 2025-06-02 22:53:37 +03:00
sliptonic
3aa55b0f7b Merge pull request #21644 from tarman3/drill
CAM: Drilling - RetractMode readonly
2025-06-02 10:55:54 -05:00
sliptonic
3f02a8b845 Merge pull request #21338 from dbtayl/fix-21058
CAM: Adaptive: Fix helix entry start height (fix #21058)
2025-06-02 10:54:50 -05:00
sliptonic
e6119c2ce5 Merge pull request #21425 from knipknap/btl
CAM: Integration of the tool and shape editors from BTL (Better Tool Library)
2025-06-02 10:37:38 -05:00
sliptonic
44bfe2bc9a Merge pull request #21617 from tarman3/profileoutside
CAM: Offer correct side for Profile
2025-06-02 10:28:45 -05:00
sliptonic
e12d63a655 Merge pull request #21519 from tarman3/x0y0
CAM: Do not create useless G0 X0 Y0 movements for multiprofile operations
2025-06-02 10:11:42 -05:00
tarman3
34b449bd0c CAM: Drilling - Retract mode readonly 2025-05-30 00:23:38 +03:00
sliptonic
f3b6c29784 Merge pull request #21303 from tarman3/array
CAM: Added property CycleTime to old Array
2025-05-29 15:43:47 -05:00
sliptonic
40ed30397c Merge pull request #21416 from jffmichi/custom_gcode_allow_empty_lines
CAM: allow empty lines in Custom operation
2025-05-29 09:47:32 -05:00
sliptonic
093fbf5f40 Merge pull request #21530 from jffmichi/sort_all_drilling
CAM: sort locations for all drilling operations
2025-05-28 13:55:20 -05:00
tarman3
8e1c90d09c CAM: Set outside by default for selected Edges 2025-05-27 20:10:57 +03:00
Luz Paz
5d27b46a87 Fix various typos
Found via codespell
2025-05-26 21:40:10 +02:00
Samuel Abels
45b2755de8 CAM: Fix SurfaceSupport operation for new type toolbits 2025-05-26 17:53:32 +02:00
tarman3
07c774b872 CAM: Added property CycleTime to old Array 2025-05-26 12:13:03 +03:00
jffmichi
b77f63c7c6 CAM: sort locations for all drilling operations 2025-05-25 00:27:03 +02:00
tarman3
214fe91a75 CAM: Do not create useless G0 X0 Y0 movements for mutliprofile operations 2025-05-22 08:55:16 +03:00
Samuel Abels
0fb67224d3 CAM: Fix: updateSpinBox renamed to updateWidget 2025-05-20 17:08:21 +02:00
jffmichi
4959cd0ab0 CAM: fix Custom operation UI panel dropping trailing blank lines 2025-05-20 03:29:24 +02:00
sliptonic
10c2e8819e Merge pull request #21108 from tarman3/pathshape2
CAM: PathShape with Tool Controller
2025-05-19 09:12:58 -05:00
Luz Paz
ee4fa234c9 Fix various typos
Missed by the codespell CI not being functional for a period of time.
2025-05-15 10:59:48 -05:00
Dan Taylor
55514c0297 CAM: Adaptive: Fix helix entry start height (fix #21058) 2025-05-14 20:07:33 -05:00
tarman3
7df127bcbc CAM: PathShape with Tool Controller 2025-05-12 22:57:23 +03:00
sliptonic
349b879979 Merge pull request #21193 from davidgilkaufman/adaptive_helix_fixes
[CAM] Adaptive helix fixes
2025-05-12 11:09:16 -05:00
sliptonic
e699fe37d8 Merge pull request #20873 from tarman3/startpoint
CAM: Fixes PickStartPoint
2025-05-12 10:40:57 -05:00
tarman3
1648ee6cdc CAM: PickStartPoint fixes 2025-05-12 16:57:32 +03:00