Commit graph

24384 commits

Author SHA1 Message Date
Jelle Spijker
71570e7d6f
Merge pull request #8189 from Ultimaker/CURA-7555_Beading_strategy_user_control
CURA-7555: Add libArachne parameters in the front-end
2020-08-24 11:54:47 +02:00
Kostas Karmas
8f58a7e3a0 Merge branch 'libArachne_rebased' into CURA-7555_Beading_strategy_user_control 2020-08-20 17:16:10 +02:00
Kostas Karmas
bbfbadc981 Merge branch 'master' into libArachne_rebased 2020-08-20 17:16:02 +02:00
Kostas Karmas
045ba3b8c4 Modify description of libArachne settings.
So that the settings can easily be found with the keywords 'libArachne' and 'beading'.

CURA-7555
2020-08-20 17:14:01 +02:00
Kostas Karmas
bbc0b0e54c Rename libArachne settings to use user-friendly terminology
I am leaving the descriptions to contain the word "beading" so that the related settings can
easily be found during testing.

CURA-7555
2020-08-20 17:08:03 +02:00
Ghostkeeper
9ea418c0a1
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
This reverts commit 28f4d8513d.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
2020-08-20 16:35:52 +02:00
Ghostkeeper
a757dc7fa0
Merge branch '4.7' 2020-08-20 16:34:58 +02:00
Jaime van Kessel
af05aa61b7
Remove unneeded binding
This binding wasn't needed to prevent a binding loop, but it did cause
the length to not be updated correctly sometimes

CURA-7589
2020-08-20 16:05:52 +02:00
Ghostkeeper
28f4d8513d
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"
This reverts commit 7f47f12bf0, reversing
changes made to dd42c87da7.
2020-08-20 16:01:46 +02:00
Ghostkeeper
7f70acbaf1
Also use FindPythonInterp when gathering the tests 2020-08-20 14:34:36 +02:00
Ghostkeeper
808a0bf4aa
Don't use the new FindPython3 script from CMake
I don't know what it is with this one, but it's finding the wrong one. We specify through the prefix that it should search in the cura-build-environment first, but apparently it's not listening to that. As a result it's getting Python 3.6, and then stops because it can't find the headers for that version. It wouldn't need the headers in this case, but if it didn't crash here it would crash during the run time because libArcus and libSavitar have been linked to Python 3.5.
2020-08-20 14:30:28 +02:00
Kostas Karmas
720740dcc8 Remove parent-child relationship of libArachne settings
If all children of a parent get overridden, the parent is disabled. We don't want that in
the libArachne settings.

CURA-7555
2020-08-19 17:54:00 +02:00
Kostas Karmas
ec633feb37 Remove transition_length from the front-end
It is set as 2*wall_line_width in CuraEngine.

CURA-7555
2020-08-19 17:48:43 +02:00
Kostas Karmas
217e01b5b3 Remove LimitedDistributed option from the beading strategies setting
As the Limited will always apply on top of the others, so selecting the Distributed is
essentially the same as selecting the LimitedDistributed.

CURA-7555
2020-08-19 17:29:54 +02:00
Kostas Karmas
4954746ee4 Remove transitioning angle from the user settings
Tt will be a constant on the CuraEngine side.

CURA-7555
2020-08-19 17:17:40 +02:00
Kostas Karmas
a029e0ce50 Remove limited beading as an option
As it will be applied by default in the Engine to ensure that libArachne will generate only the
required walls (based on the Wall Line Count setting).

CURA-7555
2020-08-19 17:02:44 +02:00
Jelle Spijker
b685da5a24
Merge pull request #8195 from Ultimaker/GetPropertySpeedImprovements
Get property speed improvements
2020-08-19 16:41:26 +02:00
Ghostkeeper
74b9771c7d
Code style: Fields have lower camel casing
As specified in the Ultimaker/Meta repository.
2020-08-19 15:46:08 +02:00
Ghostkeeper
9145a7e9e6
Remove unused import
Done during investigation of #8075.
2020-08-19 15:35:57 +02:00
Jaime van Kessel
44885ab9a4
Merge branch '4.7' of github.com:Ultimaker/Cura 2020-08-18 14:14:11 +02:00
Jaime van Kessel
2fe9ee2cf2
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-18 13:54:58 +02:00
Jaime van Kessel
907caa53f0
Ensure that changing material type results in profile re-evaluation
CURA-7657
2020-08-18 13:54:21 +02:00
Ghostkeeper
cb11dd763d
Merge branch '4.7' 2020-08-18 11:12:24 +02:00
Ghostkeeper
dea53b9c02
Revert "Use extruderList rather than deprecated extruders property"
This reverts commit 458acb356f.
The change was wrong. The code refers to PrinterOutputModel.extruders which is not deprecated, not to GlobalStack.extruders (which is deprecated).

Fixes #8204.
2020-08-18 10:38:50 +02:00
Ghostkeeper
16d934ff96
Merge branch '4.7' 2020-08-17 15:07:38 +02:00
Ghostkeeper
6d90c85fb2
Also show Connect Support Lines for lines pattern
Previously this was disabled because you should probably use the ZigZag pattern then. But I'm enabling it now because of two inconsistencies:
* The setting still works. So you can change the setting by switching to grid, triangles, cross or gyroid, then switch back to lines and still get connected support lines.
* The same happens with the infill patterns, where this setting is visible for the lines pattern.

Rather than changing the other two things (which involves changes to CuraEngine too to make it ignore the setting value for the lines pattern), I've opted to change it here and fix both inconsistencies at once. If I were to make the setting dysfunctional, it would also lead to user confusion, because they then need to discover that they need to change the infill pattern, which may look unlogical to them.

Fixes #8192.
2020-08-17 15:07:26 +02:00
Jaime van Kessel
0c994da4bb
Merge pull request #8106 from Ultimaker/CURA-7559_remove_wall_overlap_compensation_in_arachne
CURA-7559: Remove all references to Wall Compensation from the resources/ in arachne
2020-08-17 14:13:01 +02:00
Jaime van Kessel
4bc214f859
Merge branch '4.7' of github.com:Ultimaker/Cura 2020-08-17 14:10:36 +02:00
Jaime van Kessel
ea7dc0ff01
Fix custom profiles not always being visible in menu
CURA-7589
2020-08-17 14:09:27 +02:00
Jaime van Kessel
04c216462a
Fix the unit test
Previously we would only look at the state, but that isn't the only thing it should look at.
It should override the value of a resolve if it's defined in user changes or QualityChanges.
2020-08-14 15:44:47 +02:00
Jaime van Kessel
43efac491d
Fix the unit test
Previously we would only look at the state, but that isn't the only thing it should look at.
It should override the value of a resolve if it's defined in user changes or QualityChanges.
2020-08-14 15:41:40 +02:00
Jaime van Kessel
bc67b057ea
Add missing required typing 2020-08-14 15:19:59 +02:00
Jaime van Kessel
eee84a82bf
Use exception instead of check if key is in dict
Since the amount of times that the key is in there is orders of magnitude
larger, it's better to catch the exception when it doesn't (as that is
slightly faster)
2020-08-14 15:15:33 +02:00
Jaime van Kessel
9c904f95ce
Add a cache for settable_per_extruder property 2020-08-14 14:51:46 +02:00
Jaime van Kessel
51737dccd6
Don't create a context when it's not provided
The rest of the functions already assume that None is an empty context
2020-08-14 14:19:19 +02:00
Jaime van Kessel
4c00a8ff2c
Add extra short-circuit for resolve 2020-08-14 13:57:09 +02:00
Jaime van Kessel
9a0264644b
Simplify the _shouldResolve function
This increases the speed of the setting resolvement.
2020-08-14 13:41:20 +02:00
Kostas Karmas
cee7ac2ccc Merge branch '4.7' 2020-08-14 13:33:53 +02:00
Konstantinos Karmas
2d56cd4e13
Merge pull request #8152 from thushan/cocoon-printer-profiles
Adds Cocoon Create Printer profiles
2020-08-14 11:48:09 +02:00
Jaime van Kessel
7f47f12bf0
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-14 10:01:26 +02:00
Jaime van Kessel
ec48496790
Remove unneeded binding
This binding wasn't needed to prevent a binding loop, but it did cause
the length to not be updated correctly sometimes

CURA-7589
2020-08-14 10:00:33 +02:00
Kostas Karmas
c8901e3b92 Merge branch 'master' into CURA-7376_full_of_spiders 2020-08-13 16:53:17 +02:00
Kostas Karmas
3e3d9bcd0a Don't reset the min feature size and bead_width based on the widening
We can just keep the value, since it is ignored in CuraEngine if the enable widening is false.

CURA-7555
2020-08-13 16:43:32 +02:00
Kostas Karmas
41475ff243 Remove bead_width in favor of wall_line_width
CURA-7555
2020-08-13 15:28:59 +02:00
Jaime van Kessel
1374c2faa9
Properly fix the translation crash 2020-08-13 15:13:11 +02:00
Jaime van Kessel
aba76d8bca
Merge branch 'CURA-7586_striped_in_layerview' of github.com:Ultimaker/Cura 2020-08-13 14:54:55 +02:00
Jaime van Kessel
5c8132a944
Fix translation crash 2020-08-13 14:54:34 +02:00
Remco Burema
6ad696e69a
Fix non-printing objects in preview. 2020-08-12 17:45:31 +02:00
Remco Burema
99cd8ab1b0
Show models outside of BP clearly in layerview.
CURA-7586
2020-08-12 17:42:10 +02:00
Kostas Karmas
20f7423024 Add libArachne beading parameters in the fdmprinter
CURA-7555
2020-08-12 17:28:28 +02:00