Commit graph

394 commits

Author SHA1 Message Date
HellAholic
d1aee97ea2
Merge branch '5.11' into CURA-12742_add-message-when-painted-with-disabled-extruder
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-10-17 13:57:44 +02:00
Erwan MATHIEU
df31cc8e31 Use separate node attribute to indicate assigned to disabled extruder
CURA-12742
2025-10-16 09:50:09 +02:00
Remco Burema
f9c77f8730 For multi-material painting; stack needs to be updated.
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
... because the extruders used for the current object can change (clear all bits of extruder #2 paint on a single object, which results in the object printed with extruder #1 only, which could result in the prime-tower needing to be gone -- or the other way around).

The _previous_ way of doing that was just spamming the stack changes, but that gave other problems.

part of CURA-12752
2025-10-15 11:15:08 +02:00
Remco Burema
0396a782b7
Change from code-review.
Easier to read.

done as part or CURA-12752

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2025-10-14 11:35:28 +02:00
Erwan MATHIEU
375f030c09 Update extruders count only when inactive
CURA-12752
The previous method was not efficient enough in case of large models, where a single painting stroke can easily cover almost the whole texture (in bounding box). Reverted to the version where the whole texture is counted, but cached in the SliceableObjectDecorator and updated on timer so that it is not done during painting.
2025-10-13 14:22:39 +02:00
Remco Burema
c412def982 Extruder counts in image was too slow, cache and do per bounding-rect.
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
Rewrite the whole 'count pixels to get extruders for paint on materials' so that it's cached outside of the extruder manager instead, so that counting pixels in a 4096x4096 image isn't called xx of times per second.

part of CURA-12752
2025-10-08 09:58:05 +02:00
Remco Burema
e3204707db Move 'get painted on extruders' method, use for build-volume.
(Not sure I'm happy with this, but) now we can use this _both_ in the slicing itself _and_ the bounds. The big downsides are a) I had to connect the scene changed signal to the on-stack-changed method, that seems ugly and potentially slow b) I'm not sure this method belongs in the ExtruderManager -- otoh, where else is it going to live (unless we want to make a new type of plugin-object?).

CURA-12752
2025-10-01 22:39:22 +02:00
Remco Burema
c89b708525 Make grid-translucency depend on if machine has texture on BP.
part of CURA-12188
2024-11-05 20:44:25 +01:00
Remco Burema
32369e39e3 Fix z-fighting between build-plate-grid and printer-model.
Since both of them where a different render type (solid versus transparent) the sorting didn't work. Make them both transparent. (Though no changes where made there, see also UM/Scene/Platform -- which is not to be confused with UM/Platform.)

should fix CURA-12188
2024-10-24 09:48:36 +02:00
Erwan MATHIEU
fb33dfe665 Register notification on prime tower enable
CURA-11645
2024-02-26 11:15:34 +01:00
Erwan MATHIEU
d5e8a0acb9 Fix prime tower shadow visible when disabled
CURA-11645
2024-02-26 11:12:31 +01:00
Erwan MATHIEU
f00636d374 Merge remote-tracking branch 'origin/main' into optimized-prime-tower 2024-01-10 16:30:34 +01:00
Jaime van Kessel
2be8113859
Merge branch 'fix_oneatatime_modifiermeshes' of github.com:fieldOfView/Cura 2023-11-29 13:30:03 +01:00
c.lamboo
2569c4c3d1 Use flip up/down to reverse list
CURA-11293
2023-11-10 18:42:10 +01:00
c.lamboo
2be72ca22b Revert "Use intersection instead of convex hull intersection"
This reverts commit 4982680dfc.
2023-11-10 18:00:00 +01:00
Erwan MATHIEU
4982680dfc Use intersection instead of convex hull intersection
CURA-11293
2023-11-09 16:22:52 +01:00
Erwan MATHIEU
b8e8f2ac0e Code readability improvement
CURA-11293
2023-11-09 16:19:35 +01:00
Erwan MATHIEU
6539841f3e Fix possibly wrong disallowed area display
CURA-11293
2023-11-09 14:23:46 +01:00
Erwan MATHIEU
39db261b4b Integrate prime tower mode setting 2023-11-03 13:13:27 +01:00
Erwan MATHIEU
acb0406e8e Better handling of prime tower base with raft
CURA-10783
2023-10-13 14:40:49 +02:00
Erwan MATHIEU
a91032f62e Fixed prime tower placement warning issue
CURA-10783
2023-10-13 11:37:50 +02:00
Erwan MATHIEU
0a2ee541e3 Include prime tower base size into footprint
CURA-10783
2023-10-13 09:14:41 +02:00
fieldOfView
eecdceffdb Fix available height when adding modifier mesh in One at a Time printing
Cura lowers the available build volume height when more than 1 model is loaded. This count should include grouped nodes as one (since they will be slice as one and thus not affect the gantry), and should not include modifier meshes or support meshes (since support-meshes are always printed with the first model anyway).

Fixes https://github.com/Ultimaker/Cura/issues/16566
2023-08-28 15:42:04 +02:00
saumya.jain
4096fc864b grid placement available for elliptical buildplates
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
2023-08-22 15:06:17 +02:00
Jaime van Kessel
3f83799229
Only show build volume height message if it was changed
Fixes #15373 && CURA-10580
2023-05-08 11:04:27 +02:00
Remco Burema
ab51bd699e Merge branch 'main' into brim_per_material_optimized_order 2022-10-25 17:31:13 +02:00
j.delarago
41cc78af1a Add at a minumum a very small border around the edges of the build plate. Otherwise models with shrinkage compensation (or any model with disallowed areas around it) can be placed so that the output model is off the build plate.
CURA-9271
2022-06-24 15:00:42 +02:00
j.delarago
aeb7f33c62 We were previously both scaling down the buildplate and scaling up the disallowed areas of the models with shrinkage compensation. Doing both reduces the max usable area when scaling.
The solution is to do only one of these options.

Removing the disallowed area works fine when scaling models from their center. However we scale 2 or more models from the buildplate center rather than the model center. This means that the models can go outside the buildplate without it being obvious from the visualization.

The better solution is to remove the buildplate x/y scaling and keep the disallowed areas.

Removed shrinkage factor build volume scaling on x and y. This information is shown already by scaling the allowed areas around the objects.

Kept the bounding box scaling for z. This shows the max height a model can be. The objects disallowed area does not show this information.

Also removed scaling on non model disallowed areas on the build plate since this does not need to scale with the build plate anymore.

CURA-9271
2022-06-08 15:25:03 +02:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
Jaime van Kessel
fa1554a62e Merge branch 'fix_disallowed_brim_gap_distance' of github.com:Ultimaker/Cura 2022-03-22 15:23:32 +01:00
Tim Kuipers
6da67e3d82 remove special case for prime tower brim disallowed area
It's now handled in CuraEngine
2022-03-17 14:41:57 +01:00
Tim Kuipers
4d146e882e remove skirt/brim adhesion size constraint
it is handled by CuraEngine now.
2022-03-17 14:39:24 +01:00
Tim Kuipers
fb8787f7bd fix: fix wrong placement of prime tower disallowed area
The prime tower should no longer be displaced by the brim width
2022-03-17 11:47:36 +01:00
Tim Kuipers
0339e4f1ca reduce clearance needed between prime tower and models
With the new implementation we don't need that much clearance.
2022-03-16 11:31:40 +01:00
Tim Kuipers
33e3a45b5c fixes for optional skirt_brim_extruder_nr 2022-03-16 11:31:40 +01:00
Tim Kuipers
2698cd76c5 make skirt_brim_extruder_nr an optional_extruder to allow for the brim_per_material feature 2022-03-16 11:31:40 +01:00
Tim Kuipers
f7049ca3ea fix disallowed areas taking brim_gap into account 2022-03-16 11:31:40 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
10r3n20
4383f2ddf2 adjusted colors and size of origin gizmo 2022-02-15 16:45:57 +01:00
Tim Kuipers
c308e2d7d2 fix disallowed areas taking brim_gap into account 2022-02-11 11:26:26 +01:00
Ghostkeeper
5cc8fdeb7a
Count multiple raft interface layers
We need the raft thickness to determine the maximum height of the model. If using multiple interface layers, this height should be reduced.

Contributes to issue CURA-8915.
2022-02-03 15:55:31 +01:00
Casper Lamboo
41f1029dc0
Use updated python type notation 2022-01-14 09:07:41 +01:00
Ghostkeeper
304f57293d
Adjust build volume depending on new adhesion extruder sub-settings
It should get these settings from the correct extruders even if they are different from one another.

Contributes to issue CURA-8868.
2022-01-12 14:09:57 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Jaime van Kessel
d59cd602ee FIx failing mypy test
CURA-8083
2021-12-16 10:00:11 +01:00
Jaime van Kessel
6c64e08299 Fix typing of scaleAreas
The change in e5be3e56dc wasn't quite correct

CURA-8083
2021-12-16 09:58:09 +01:00
casper
e5be3e56dc Use correct definition of Polygons
Only saw this error after the merge so pushing directly to master.

part of CURA-8083
2021-12-15 17:48:20 +01:00
Remco Burema
f51cc84a7c
Temporary? solution for UX w.r.t. material shrinkage.
Material shrinkage now alters both the disallowed areas+, and the blue wireframe, toghether repressenting the usable build-volume. This doesn't shrink the build-plate/printer model, still keeping in line with the 'show the size of the result object in Prepare, not the resized one we do print becasue it will shrink later' principle we had originally agreed on enough. Note that the disallowed areas also take the object themzelves into account, so the user could still tell when objects are going to be printed overlapped (as the dissalowed areas of those respective models then overlap -- but not, of course, the models themselves).

part of CURA-8083
2021-12-15 12:50:01 +01:00
Remco Burema
b6c0a49657
Attempt to compensate build-area/volume for material shrinkage.
part of CURA-8083
2021-12-14 17:04:20 +01:00
Jaime van Kessel
73ca50d958 Handle exception when adhesion extruder could not be found
This should be pretty rare; the crash would only happen due to a race condition

cura-8584
2021-11-09 10:17:32 +01:00