Commit graph

36839 commits

Author SHA1 Message Date
HellAholic
747b309a6f add mock for the get property
default to None for user time estimation factor
2025-09-06 13:49:11 +02:00
HellAholic
21ebe14cc2 Adjust the width of the message so it does not overlap with the info button 2025-09-06 13:38:04 +02:00
HellAholic
f567540d12 refactor the qml for the time estimation text 2025-09-06 12:47:53 +02:00
HellAholic
af746f00d0 Refactor the code and add defensive measures 2025-09-06 12:09:11 +02:00
HellAholic
d110bc5577 Add the user adjusted with a signal to the UI 2025-09-06 11:52:52 +02:00
HellAholic
de4886a0e0 Apply the user time estimation factor to the print time 2025-09-06 11:09:03 +02:00
HellAholic
4d89114fb9 add time estimation factor field to the machine setting printer tab 2025-09-06 10:33:08 +02:00
HellAholic
b6adeb0fe3 add machine_time_estimation_factor to the fdmprinter
Setting is only front-end side and does not affect slicing.
2025-09-06 10:14:05 +02:00
HellAholic
ede8b7ea3a Merge remote-tracking branch 'origin/5.10'
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-09-05 14:22:55 +02:00
HellAholic
39a322bfee
Merge pull request #20921 from Ultimaker/PP-650-High-Speed-S-line-improvement-pt2
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
Pp 650 high speed s line improvement pt2
2025-09-05 14:20:49 +02:00
THeijmans
28f2e4fb49 PP-650 R5 2025-09-05 10:08:40 +02:00
THeijmans
969cbf09e3 PP-650 R3 2025-09-05 10:08:40 +02:00
HellAholic
803d872e4f
Merge pull request #20835 from GregValiant/Annealing
Some checks failed
conan-package / conan-package (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
Create AnnealingOrDrying.py
2025-09-03 13:29:31 +02:00
HellAholic
c1d12709b4
Merge branch 'main' into Annealing 2025-09-03 13:29:16 +02:00
HellAholic
e7ff346616
Merge pull request #18774 from GregValiant/DisplayInfoOnLCD
Update DisplayInfoOnLCD.py
2025-09-03 13:19:44 +02:00
HellAholic
bfefad0c94
Merge branch 'main' into DisplayInfoOnLCD 2025-09-03 13:19:03 +02:00
HellAholic
8aee04a968
Merge pull request #20842 from Ultimaker/CURA-12661_make-more-global-paint-undo
Some checks failed
conan-package / conan-package (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12661 make more global paint undo
2025-08-26 13:06:04 +02:00
HellAholic
88b4b0729c
Merge branch 'main' into CURA-12661_make-more-global-paint-undo 2025-08-26 13:05:43 +02:00
HellAholic
a55cca73f4 Apply Review
clear_mask -> clear_texture_bit_mask
2025-08-26 13:05:56 +02:00
HellAholic
6defd4cea3 Merge remote-tracking branch 'origin/5.10'
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-08-21 10:37:04 +02:00
HellAholic
627e7f3c99
Merge pull request #20840 from Ultimaker/CURA-12660_painting-UI-improvements
Cura 12660 painting UI improvements
2025-08-21 09:58:53 +02:00
HellAholic
d372c68bd7 Set conan package version 5.10.3
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-12 11:58:41 +00:00
HellAholic
57fc187dbd
Merge pull request #20822 from Ultimaker/PP-650-High-speed-profile-improvements
PP-650-High-speed-profile-improvements-S6S8
2025-08-12 13:55:21 +02:00
HellAholic
d0c8dc0aa9
Merge branch '5.10' into PP-650-High-speed-profile-improvements
Some checks failed
conan-package / conan-package (push) Has been cancelled
2025-08-12 13:52:12 +02:00
HellAholic
966ca502d9
Merge pull request #20797 from Ultimaker/CURA-11810_fix-mac-dialogs
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-11810 fix mac dialogs
2025-08-11 14:24:27 +02:00
HellAholic
3da366f316 Apply printer-linter format 2025-08-11 10:58:51 +00:00
HellAholic
e83c21a5d9
Merge pull request #19968 from Asterchades/main
Update Top/Bottom Layers formula
2025-08-11 12:57:44 +02:00
HellAholic
4059744ce7
Merge pull request #20823 from Ultimaker/CURA-12615_early_error_check
Trigger machine error checking during startup. Otherwise slicing will keep failing until selected printer is changed.
2025-08-11 12:55:05 +02:00
HellAholic
0bc7ef72a0
Merge pull request #20432 from jeremysalwen/more_per_object_retraction
Enable more retraction settings to be set per-model
2025-08-11 12:27:04 +02:00
Erwan MATHIEU
243b7c56a6 Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-07 11:08:49 +02:00
Erwan MATHIEU
db514f0be7 Properly prepare the model for painting
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12660
The UV-unwrapping is now done in a background job, and the UI displays a waiting state. This fixes the issue where the user would start painting but the model was not ready yet, and the first stroke would be missing.
2025-08-07 11:03:51 +02:00
Erwan MATHIEU
8a59faceb1 Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-08-06 16:39:49 +02:00
Erwan MATHIEU
e69a436942 Fix sometimes wrongly displayed view
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
This required a refactoring of the management of the active view. The previous behavior was that anyone could set the active view, depending on certain conditions. But now we also have a view that is set by a tool, so sometimes the actually set view would be incorrect. Now each Stage requests an active view, and each tool CAN also request an active view. Then the Controller decides which view should actually be active depending on the active stage and tool.
2025-08-06 16:15:05 +02:00
Erwan MATHIEU
cf24ed91e9 Improve fix for opacity issues
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
Previous fix caused issues when moving to preview
2025-08-05 15:55:23 +02:00
Erwan MATHIEU
9d97eb7d59 Fix sometimes wrong painting color display
CURA-12660
2025-08-05 14:07:44 +02:00
HellAholic
4006272fee
Some housekeeping
- anneal_type -> heating_zone: lines up the variable name with intent.
- Sort the variable inputs of the functions (annealing / drying)
- Add description for parameters in both functions (annealing / drying)
2025-08-05 00:45:48 +02:00
Erwan MATHIEU
b5e2ce6168 Restore disabled support painting
CURA-12661
2025-08-04 16:07:49 +02:00
Erwan MATHIEU
8f9a17d49e Simplify QML code
CURA-12661
2025-08-04 16:03:09 +02:00
Erwan MATHIEU
586c2939a6 Enable undo/redo buttons when appropriate
CURA-12661
2025-08-04 15:46:51 +02:00
Erwan MATHIEU
53ef6fbdf3 Merge remote-tracking branch 'origin/CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo 2025-08-04 15:29:15 +02:00
Erwan MATHIEU
9685764721 Implement undo-redo by full stroke
CURA-12661
2025-08-04 15:19:04 +02:00
GregValiant
47ad02bcf1 Update AnnealingOrDrying.py
Changed some verbiage.

Update AnnealingOrDrying.py

Changes per the review, bug fixes, cleanup my code.  Add more beeps.

Update AnnealingOrDrying.py

Fixed a typo
2025-08-04 08:52:23 -04:00
Erwan MATHIEU
63843b59c4 Merge remote-tracking branch 'origin/main' into CURA-12660_painting-UI-improvements
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-08-04 11:55:26 +02:00
Erwan MATHIEU
862c81e3c0
Merge pull request #20780 from Ultimaker/CURA-12528_unwrap_uvs
Some checks failed
conan-package / conan-package (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12528 unwrap uvs
2025-08-04 11:30:27 +02:00
Erwan MATHIEU
bef7bac6a1
Merge branch 'main' into CURA-12528_unwrap_uvs 2025-08-04 11:29:45 +02:00
Erwan MATHIEU
a7366c86f9
Merge branch 'main' into CURA-12660_painting-UI-improvements 2025-08-04 11:29:06 +02:00
Erwan MATHIEU
44d6c0a969 Call SolidView dynamically instead of by inheritance
CURA-12660
The previous method actually doesn't work when Cura is packaged because the plugins paths change. This method is much safer, and uses the actual SolidView instance.
2025-08-04 11:28:31 +02:00
Erwan MATHIEU
e742ca81f3 Fixed more possible crashes
CURA-12528
2025-08-04 10:24:29 +02:00
Erwan MATHIEU
4c0dc9e026
Merge pull request #20821 from Ultimaker/CURA-12630_fix_reload_differences
[CURA-12630] Use newly exposed 'reloadNodes' so we can use Uraniums version of that.
2025-08-04 09:51:11 +02:00
Erwan MATHIEU
7a4402770a
Merge branch 'main' into CURA-12630_fix_reload_differences 2025-08-04 08:57:10 +02:00