Commit graph

10354 commits

Author SHA1 Message Date
Erwan MATHIEU
facf0b7d4a
Merge branch 'main' into PostProcessing_InsertAtLayerChange_update 2025-06-16 10:24:18 +02:00
HellAholic
cda8c33c2d
Merge branch 'main' into CreateThumbnailBeginBlockOptions 2025-06-16 10:23:10 +02:00
HellAholic
5849fd9c99 Update CreateThumbnail.py 2025-06-16 10:22:40 +02:00
Erwan MATHIEU
44e1c08062
Merge branch 'main' into Update-PurgeAndUnload.py 2025-06-16 10:08:44 +02:00
HellAholic
b7ce5cc07f
Merge branch 'main' into CURA-11978_retract-and-unretract-in-a-travel
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-06-13 17:10:00 +02:00
HellAholic
21cf6ee14e
Merge branch 'main' into AddCoolingProfile 2025-06-13 12:39:33 +02:00
HellAholic
40ba22930b
Merge branch 'main' into Update-PurgeAndUnload.py
Some checks failed
printer-linter-format / Printer linter auto format (push) Has been cancelled
2025-06-13 12:38:25 +02:00
HellAholic
890db9da6e
Update PurgeLinesAndUnload.py 2025-06-13 12:38:02 +02:00
HellAholic
5afb380c0b
Merge pull request #20388 from GregValiant/FilamentChangeUpdate
Update FilamentChange.py
2025-06-13 12:28:21 +02:00
Erwan MATHIEU
b6b2da0c14 Change wording as suggested
Some checks failed
unit-test / Run unit tests (push) Waiting to run
conan-package / conan-package (push) Has been cancelled
CURA-11978
"Unretraction" is a barbaric word, better use "Priming" instead
2025-06-12 08:39:59 +02:00
Erwan MATHIEU
a739fd21f5 Display inactive DL projects as disabled
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12557
2025-06-11 15:48:09 +02:00
Erwan MATHIEU
2e9999ed2d Display the printer activation status
CURA-12557
2025-06-11 13:51:45 +02:00
Erwan MATHIEU
65b0e4f080 Add specific message when sending a print to an inactive printer
CURA-12557
2025-06-11 10:51:47 +02:00
GregValiant
fd2772b55e
Merge branch 'main' into ZhopOnTravel 2025-06-10 10:19:57 -04:00
Erwan MATHIEU
f84923185d Use proper English word for "plane"
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-12544
The word in French to describe a geometric flat surface if "plan", which is a valid word in English but it doesn't have the same meaning, this got me confused. So replacing "plan" by "plane" because we are actually dealing with a geometrical "plane" (although it doesn't fly).
2025-06-10 11:21:17 +02:00
HellAholic
86fe07d1d2
Merge branch 'main' into CURA-11978_retract-and-unretract-in-a-travel 2025-06-10 10:23:49 +02:00
Erwan MATHIEU
b358b93b69 Use proper English word for "plane"
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12544
The word in French to describe a geometric flat surface if "plan", which is a valid word in English but it doesn't have the same meaning, this got me confused. So replacing "plan" by "plane" because we are actually dealing with a geometrical "plane" (although it doesn't fly).
2025-06-10 08:30:43 +02:00
GregValiant
e63243bca8 Update DisplayInfoOnLCD.py
It turns out that some firmware doesn't like colons within M118 commands.
2025-06-07 09:09:59 -04:00
GregValiant
81dc20ce18 Update ZHopOnTravel.py
Removed the Stashed Changes beginning and ends.

Update ZHopOnTravel.py

Add comments.
2025-06-07 09:00:34 -04:00
GregValiant
3f16cc917a Update ZHopOnTravel.py
Bug fix for End_Layer when the entered layer > total layer count.

Update ZHopOnTravel.py

I'm not sure why git desktop did this.

Update ZHopOnTravel.py

I'm not sure why git desktop did this.

Bug fix

Bug fix for End_Layer when the entered layer > total layer count.
Bug fix for 'index_list' when using a layer list.  It now tracks the Z through the file rather than just the layers of interest.
2025-06-07 07:53:20 -04:00
HellAholic
db8a625d8f
Update PurgeLinesAndUnload.py
Fixes an exception thrown upon a clean start.
2025-06-05 20:57:24 +02:00
Remco Burema
12ffe2651b Merge branch 'CURA-12543_painting_ux' into CURA-12528_unwrap_uvs 2025-06-05 15:37:43 +02:00
Remco Burema
14e49c5c73 Merge remote-tracking branch 'origin/CURA-12544_saving-and-loading-painted-files-in-Cura' into CURA-12528_unwrap_uvs 2025-06-05 12:48:17 +02:00
Remco Burema
44042eef6a Start to set up UV-unwrapping.
Needs the new libreary set up for that.

part of CURA-12528
2025-06-05 12:45:34 +02:00
Remco Burema
4a87b48084 Stopgap to prevent texture-patch borders from messing up the painting.
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
This code is expandable into the real solution later, see the TODO left in the code by this commit.

part of CURA-12543
2025-06-05 08:25:20 +02:00
Remco Burema
40f02dc15f Defensive coding; deal with degenerate triangles, co-linearity or query pt equal to corner.
This shouldn't happen on a well UV-mapped, manifold mesh -- well, unless someone manages to click exactly on one of the triangle corners. Better to get this fixed now then to run into floating point shenanigans later.

part of CURA-12543
2025-06-05 08:23:22 +02:00
Remco Burema
12d788db62 Review comments: Fix crash when click next to object.
Refactoring that part to up top caused the problem I think -- getSelectedObject(0) over getAllSelectedObjects()[0] is clearly the better call in this case anyway.

part of CURA-12543
2025-06-04 21:00:27 +02:00
Erwan MATHIEU
b940179c54 Set proper tooltip text color
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-11978
2025-06-04 11:01:51 +02:00
HellAholic
b4c023479c Merge remote-tracking branch 'origin/5.10'
Some checks failed
conan-package-resources / conan-package (push) Waiting to run
conan-package-resources / signal-curator (push) Blocked by required conditions
printer-linter-format / Printer linter auto format (push) Waiting to run
Scorecard supply-chain security / Scorecard analysis (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
conan-package / conan-package (push) Has been cancelled
2025-06-04 10:40:21 +02:00
Erwan MATHIEU
21443faa92 Merge remote-tracking branch 'origin/CURA-12543_painting_ux' into CURA-12544_saving-and-loading-painted-files-in-Cura
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-06-03 16:08:40 +02:00
Erwan MATHIEU
57f811af88 Load painted texture from 3MF file
CURA-12544
2025-06-03 15:59:02 +02:00
Erwan MATHIEU
f0764134cc Store painted texture to 3MF file
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12544
Also allows having multiple texture for multiple models while painting
2025-06-03 13:27:57 +02:00
HellAholic
05d1738fa8 Fix image mode of the F4
Restore transparency
2025-05-28 17:19:45 +02:00
Remco Burema
d28c2aac68 Painting: Fix non-drag not producing a circle (square was already OK though).
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
part of CURA-12543
2025-05-28 17:12:42 +02:00
HellAholic
da32232158 Resize images uniformly
All images now have a width of 300px as a constant factor. This is still more than twice the width that will display on the Monitor Tab.
Render quality on the user's screen remains the same.
2025-05-28 17:09:49 +02:00
Remco Burema
c9ca999f10 PaintTool: Undo/Redo should be working now.
Also fix missing pen-shape I suppose.

part of CURA-12543
2025-05-28 16:43:33 +02:00
MariMakes
240abc0929 Updates for 5.10.1`
Updates Changelog and introduces pictures for the monitor page for the newer printers
2025-05-28 15:30:24 +02:00
Erwan MATHIEU
5873222c15 Merge remote-tracking branch 'origin/CURA-12543_painting_ux' into CURA-12544_saving-and-loading-painted-files-in-Cura 2025-05-28 15:16:43 +02:00
Erwan MATHIEU
50ea216a60 Store UV coordinates to 3MF file
CURA-12544
2025-05-28 15:13:22 +02:00
Remco Burema
4e5b0115ea Painting: Separate brush image didn't work properly, construct stroke-image by pen instead.
This also simplifies things nicely.

part of CURA-12543
2025-05-28 14:39:07 +02:00
Remco Burema
109f37657b Painting UI work: Update image-part(s) instead of pixel(s) w.r.t. render-backend.
part of CURA-12543
2025-05-28 12:32:36 +02:00
Erwan MATHIEU
96d2caf195 Load UV coordinates from 3MF file
CURA-12544
2025-05-28 11:00:55 +02:00
Erwan MATHIEU
b298fa6b39 Merge remote-tracking branch 'origin/main' into CURA-12544_saving-and-loading-painted-files-in-Cura 2025-05-28 09:12:53 +02:00
Remco Burema
704f9453f0 Properly completed drag to paint (no more just clicking points).
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
The most important thing to make it work is actually notifying the scene that something has changed -- the rest are just refactorings and (hopefully) optimizations.

part of CURA-12543
2025-05-27 17:03:38 +02:00
Erwan MATHIEU
1003d750b9
Merge branch 'main' into CURA-11978_retract-and-unretract-in-a-travel
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-05-27 08:51:07 +02:00
Erwan MATHIEU
e1d579c6c8 Display legend tooltip for travel types
CURA-11978
2025-05-26 16:53:34 +02:00
Erwan MATHIEU
86777ac666 Add new travel types and display z-hops
CURA-11978
2025-05-26 11:52:53 +02:00
GregValiant
6152306217 Update DisplayInfoOnLCD.py
Made some changes to the print stats that are added to the gcode.

Update DisplayInfoOnLCD.py
2025-05-22 12:20:44 -04:00
Remco Burema
33b5918acd Painting: Sort-of able to drag the mouse now, not just click.
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
Also typing. The way it now works is way too slow though, and it doesn't add 'inbetween' the moude-move-positions yet. Also several other things of course.

part of CURA-12543
2025-05-22 11:02:08 +02:00
Remco Burema
a176957fa7 Painting: Set color, brush-size, brush-shape.
part of CURA-12543
2025-05-22 10:48:22 +02:00