24359 Commits

Author SHA1 Message Date
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 458acb356f11f50c3327b5af0be8531fb761548f.
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
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
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
Ghostkeeper
8b59fe83d8
Clarify description of infill mesh rank
Translators found it confusing, and I think users would find so too. Hopefully this is a bit better.
2020-08-12 14:15:38 +02:00
Jaime van Kessel
dd42c87da7
Merge branch 'CURA-7646_Settings_not_applied_when_creating_new_CFFF_from_project_file' of github.com:Ultimaker/Cura into 4.7 2020-08-12 13:42:14 +02:00
Ghostkeeper
ff42b44d41
Merge branch 'patch-1' of https://github.com/n7484443/Cura into n7484443-patch-1
Conflicts:
	resources/i18n/ko_KR/fdmprinter.def.json.po -> I had applied a change from the reseller before seeing that the change actually originated from this pull request. The reseller made some further improvements, so those are held rather than the original suggestion from the PR.
2020-08-12 12:05:18 +02:00
Ghostkeeper
3bba47cd27
Merge branch '4.7' 2020-08-12 11:43:57 +02:00
Ghostkeeper
67ef640524
Improve ironing flow setting name
Another suggestion for an improvement, this time by William Lee from Ultimaker.
2020-08-12 11:43:46 +02:00
Ghostkeeper
975588065b
Merge branch '4.7' 2020-08-12 11:41:26 +02:00
Ghostkeeper
33ea62bb3d
Update translation of ironing flow description
This is an improvement suggested by Kwang jun Ko from Brulé via e-mail.
2020-08-12 11:40:40 +02:00
Ghostkeeper
615c124960
Remove MouseArea if tooltip is not visible
It should unnecessarily catch any mouse events then. And neither should the ScrollView inside.
2020-08-12 11:07:09 +02:00
Ghostkeeper
3de3d438a5
Prevent MouseArea from stealing mouse clicks
Possibly this is a problem if the tooltip is invisible. We're not sure yet how to reproduce that bug though. In any case, it's neater to not catch mouse events you don't need.
2020-08-12 11:02:04 +02:00
Ghostkeeper
4ecab892e5
Further improve translated strings
Remove this formatting from the translated part.
2020-08-12 10:53:37 +02:00
Ghostkeeper
5ec57d42d0
Improve translatability of cloud printer syncing texts
Here are a number of improvements to the translated texts that make it easier for the translators to translate them:
* Never include layout elements such as <ul> or <li> in the translated text. The translators don't know what to do with them. Instead, leave the tags out of the translated parts and then wrap them around it in Python.
* If there are replacement keys in the source text, explain all of them in the context.
* Use a name within the brackets, to make it clear from context what the brackets mean and to disambiguate multiple keys if there are multiple.
* No invisible whitespace (such as space at the end of a line).
* Use plural forms with i18ncp if applicable (or i18np if no context is necessary).

I also changed the catalogue variable to lowercase with underscores, as per our code style.
2020-08-12 09:45:51 +02:00
Jaime van Kessel
5840205442
Merge branch 'setting_tooltip_interaction' of github.com:Ultimaker/Cura 2020-08-11 14:26:03 +02:00
Ghostkeeper
c49056f319
Merge branch '4.7' 2020-08-11 13:30:09 +02:00
Ghostkeeper
55dbb1ea0c
Temporarily remove warning message for cloud cameras
It's incorrect; the camera is possible with development firmware, but not implemented yet in Cura.

Removed this in lieu of the actual fix in CURA-7637, which takes too much time to fix for the 4.7 release.
2020-08-11 13:29:53 +02:00
Kostas Karmas
01d5e846aa Document possible theoretical issue when loading a project file
The issue will happen only if the machine_extruder_count is a formula.
In this case, the project loading will not work properly if "Create new" printer is selected,
as the settings of all extruders but the first one will not be applied.
Workaround in this case will be to load the project again and select to update the existing
printer, in which case all settings will load properly.

CURA-7646
2020-08-11 12:37:34 +02:00
Jaime van Kessel
e42369179f
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-11 11:38:31 +02:00
Kostas Karmas
84bc7f5094 Merge branch '4.7' 2020-08-11 11:34:30 +02:00
Kostas Karmas
ccd4add3ef Apply different filtering per category when pressing Back
Back now applies the same filters that are applied when pressing the tab buttons.

CURA-7649
2020-08-11 11:32:53 +02:00
Ghostkeeper
23ba40e54f
Clarify replacement key in translated text
This is done as a reaction to translators asking what the brackets mean.
2020-08-11 11:28:25 +02:00
Kostas Karmas
7690dc7bac Merge branch '4.7' 2020-08-11 11:23:25 +02:00
Kostas Karmas
c7525719d5 Fix wrong filtering in Marketplace when pressing Back
It was trying to apply a wrong filter, which was causing a slowdown.
It is now applying the correct filter.

Fixes https://github.com/Ultimaker/Cura/issues/8161

CURA-7649
2020-08-11 11:18:37 +02:00