Commit graph

10177 commits

Author SHA1 Message Date
HellAholic
c1d12709b4
Merge branch 'main' into Annealing 2025-09-03 13:29:16 +02:00
HellAholic
bfefad0c94
Merge branch 'main' into DisplayInfoOnLCD 2025-09-03 13:19:03 +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
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
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
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
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
6547eb6ff3
Merge branch 'main' into CURA-12660_painting-UI-improvements 2025-08-04 08:46:04 +02:00
GregValiant
8353d55ce2 Create AnnealingOrDrying.py
A new script.  The user can hold the build plate and chamber temepratures to "anneal" a print.  Optionally the heated be can be used to attempt to dry filament rolls.
2025-08-02 14:32:00 -04:00
GregValiant
8c3c36b241 Update DisplayInfoOnLCD.py
Changes per Reviewer request.
2025-08-02 14:04:29 -04:00
GregValiant
f6486bdffc Update DisplayInfoOnLCD.py
If the printer was a UM then the statistics and model list weren't being added.  This is the fix.
2025-08-01 14:28:38 -04:00
Erwan MATHIEU
78daa94ebf Save and restore painting tool settings
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12660
2025-08-01 17:08:53 +02:00
Erwan MATHIEU
ab58dec5d1 Fix unability to paint with visible message box
CURA-12660
When a message box is displayed, some offscreen rendering passes (face selection) render an unpredictable result and we are unable to start painting.
This went through a refactoring of the rendering passes. Since doing the offscreen rendering outside the Qt rendering loop caused some troubles, we now use the rendering passes only inside the Qt rendering loop, so that they work properly. Tools also have the ability to indicate which extra passes they require, so that we don't run all the passes when they are not required.
Since this issue also concerns the support blockers placement and rotation by face selection, they have been updated so that they now also always work.
The face selection mechanism using the Selection class was partially working and used only by the rotation, so now it has been deprecated in favor of the new mechanism.
2025-08-01 13:10:03 +02:00
HellAholic
be88e9d18f
Merge branch 'main' into CURA-12528_unwrap_uvs
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-01 11:27:11 +02:00
Erwan MATHIEU
3cb7eb3c87 Avoid too dark or too light areas while painting
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
This avoid having parts of the model where you cannot see the painted areas anymore
2025-07-31 11:47:41 +02:00
Erwan MATHIEU
ef7bde87fa Allow painting only when 1 object is selected
CURA-12660
2025-07-31 11:24:36 +02:00
Erwan MATHIEU
6292f5b133 Hide paint-on-support option until it is implemented
CURA-12660
2025-07-30 16:57:29 +02:00
Erwan MATHIEU
91e986697d Fix painting after changing the selected object
CURA-12660
2025-07-30 16:54:05 +02:00
Erwan MATHIEU
6896c0ed4b Display classic view when there is no selection
CURA-12660
2025-07-30 16:53:41 +02:00
Erwan MATHIEU
6bf9a8a0ae Ignore invisible object for selection in paint mode
CURA-12660
2025-07-30 16:00:13 +02:00
Erwan MATHIEU
73f5b817b4 Display build plate in paint mode
CURA-12660
2025-07-30 15:59:30 +02:00
Erwan MATHIEU
da0509cda3 Fix painting through an invisible object
CURA-12660
2025-07-30 15:58:26 +02:00
Erwan MATHIEU
5d2aca4e31 Avoid crash when UV coordinates not loaded/generated
CURA-12664
2025-07-30 12:10:40 +02:00
Erwan MATHIEU
890543b7de Change Marketplace dialog creation and destruction
CURA-11810
This will hopefully fix some display issues we have, especially on Mac platforms
2025-07-25 11:02:37 +02:00
Erwan MATHIEU
e8423755a4 Add button to auto-disable unused extruders
CURA-12622
2025-07-24 11:14:36 +02:00
Erwan MATHIEU
a39f6c94fa Make the warning message more concise
CURA-12622
The purpose being to make the message as short as possible so that people are not too much discouraged to read it
2025-07-24 10:50:31 +02:00
Erwan MATHIEU
b43bc95e2b
Merge branch 'main' into CURA-12622_warn_on_actual_unused
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-07-21 13:56:58 +02:00
Erwan MATHIEU
3fa0dad1bf
Merge branch 'main' into CURA-12528_unwrap_uvs
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-07-21 11:37:58 +02:00
HellAholic
249d5f5245
Merge pull request #20640 from Ultimaker/CURA-12543_painting_ux
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-12543] Painting UI
2025-07-17 12:07:12 +02:00
Remco Burema
b3552d8b20 Basic warning on unused extruder.
Since the bed-temp (for example) might be unfluenced by unused but (probably accidentally) enabled extruders, we want to be able to warn the user of such.

part of CURA-12622
2025-07-16 11:27:49 +02:00
Erwan MATHIEU
20a2664294 Remove the desired texture definition
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12528
2025-07-14 13:36:48 +02:00
Erwan MATHIEU
55ee4ec6e1 Calculate and apply UV coordinates
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
CURA-12528
2025-07-08 15:47:46 +02:00
Erwan MATHIEU
4cb7a0dc9f Merge remote-tracking branch 'origin/CURA-12543_painting_ux' into CURA-12528_unwrap_uvs 2025-07-08 10:50:28 +02:00
Erwan MATHIEU
bbddcab4e9 Proper paint-on-seam UI
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12578
2025-07-03 11:05:09 +02:00
GregValiant
3ad2c1b578 Update DisplayInfoOnLCD.py
Add "Electricity Cost" to the statistics added to the gcode.

Update DisplayInfoOnLCD.py

Formatting changes for layer heights
2025-07-02 06:45:55 -04:00