Commit graph

6981 commits

Author SHA1 Message Date
Ghostkeeper
a6707217c7
Get scale factor from global stack
This is the one that's actually used by CuraEngine. If I get it per-object, the material profile overrides it.

Contributes to issue CURA-7118.
2020-09-02 02:08:18 +02:00
Ghostkeeper
a7b2f7de5a
Upgrade setting_version to 16
We have a change now that requires a version upgrade. This triggers all profiles to update for the user, and we must update accordingly in the built-in profiles.

Contributes to issue CURA-7118.
2020-09-02 01:51:13 +02:00
Ghostkeeper
af03bc8f24
Adjust collision area based on shrinkage compensation ratio
So now if the model is grown due to shrinkage compensation, its collision area will also grow. This prevents objects adjacent to each other from hitting each other.

Contributes to issue CURA-7118.
2020-09-02 00:51:58 +02:00
Jaime van Kessel
ff21761d92
Add log line for when attempting to read a local file
Contributes to #8286
2020-09-01 16:51:12 +02:00
Ghostkeeper
4058790491
Merge branch '4.7' 2020-08-27 16:40:33 +02:00
Ghostkeeper
a0decbf8c4
Code style: Spaces around binary operators
Contributes to issue CURA-7672.
2020-08-27 14:38:40 +02:00
Jaime van Kessel
2b4d9f648e
Ensure that quality_changes profile is correctly created on profile duplication
I have no idea why it wasn't being created, but it has been wrong for a very long time.

Fixes #8245
2020-08-27 14:34:09 +02:00
Jaime van Kessel
1097dbdfa5
Fix copypaste mistake 2020-08-24 10:11:49 +02:00
Jaime van Kessel
13600504d4
Fix mypy failure 2020-08-24 09:33:56 +02:00
Jaime van Kessel
87fb495e07
Add some property tests for MachineManager 2020-08-21 16:36:04 +02:00
Jaime van Kessel
4a47606176
Fix mypy issue 2020-08-21 15:52:13 +02:00
Jaime van Kessel
ce930220e9
Add tests for SetActiveMachine 2020-08-21 15:14:44 +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
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
Jelle Spijker
b685da5a24
Merge pull request #8195 from Ultimaker/GetPropertySpeedImprovements
Get property speed improvements
2020-08-19 16:41:26 +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
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
Jaime van Kessel
7f47f12bf0
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-14 10:01:26 +02:00
Remco Burema
6ad696e69a
Fix non-printing objects in preview. 2020-08-12 17:45:31 +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
c49056f319
Merge branch '4.7' 2020-08-11 13:30:09 +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
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
61cc8c9a95 Remove reference to JIRA ticket in comments
CURA-7646
2020-08-10 14:58:59 +02:00
Kostas Karmas
2828f45e89 Add optional machine_extruder_count when creating a machine
If the machine_extruder_count is not taken into consideration on machine creation, calling the
extruderList of that machine will return an incomplete list of extruders (since it considers the
default machine_extruder_count). This causes problems in machines with settable number of extruders
where the default machine_extruder_count is 1 while the machine may have more than 1 extruders.

The problem becomes especially visible when opening a project file with e.g. a CFFF with multiple
extruders, because when the machine is created we do not know yet how many extruders the printer
actually has.

CURA-7646
2020-08-10 14:49:41 +02:00
Ghostkeeper
e7d95f6d90
Give an error message when stack fails to build
This way we may venture at a reason why it failed to build.
2020-08-10 11:26:09 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7
CURA-7641
2020-08-07 11:12:27 +02:00
Jaime van Kessel
724498cba7
Reset quality if none was found
CURA-7589
2020-08-06 17:12:14 +02:00
Jaime van Kessel
eb17e146bc
Fix some quality_changes being incorrectly shown for some configurations
CURA-7589
2020-08-06 16:59:30 +02:00
Jaime van Kessel
c9239ed32e
Hide unavailable quality groups in profile preferences
CURA-7589
2020-08-06 16:01:11 +02:00
Jaime van Kessel
f9c6bbb092
Fix strict noneCHeck mypy issue 2020-07-29 12:24:38 +02:00
Jaime van Kessel
fb2f40fba7
Add missing typing 2020-07-29 12:12:54 +02:00
Jaime van Kessel
65377770c4
Remove invalid quality_changes from the container registry
Fixes CURA-3T
2020-07-29 12:03:03 +02:00
Jaime van Kessel
6934e9521f
Make sure that loading an invalid container gets handled correctly
Previously it would still add them, which caused issues.
2020-07-29 11:08:10 +02:00
Jaime van Kessel
56fc5f9706
Create i18Catalog for QualitySettingsModel
CURA-7575
2020-07-28 11:20:23 +02:00
Ghostkeeper
c7b960edfa
Don't send -1 as profile count
The server gives an error about this and we got complaints about it. As far as we know this can only happen when users mess with their profile folders. Still, it's good to not send -1. The original implementation of this is indeed very naive, but we don't have the resources to refactor that now.
2020-07-21 10:42:24 +02:00
Jaime van Kessel
f948b7c4fc
Add bit more logging around MachineNode loading 2020-07-20 16:03:06 +02:00
Jaime van Kessel
4bb9cf29d0
Merge branch 'CURA-6980_tower_brim_disallowed_areas' of github.com:Ultimaker/Cura 2020-07-20 15:08:38 +02:00
Nino van Hooff
8464121001 Fix prime tower adhesion size
CURA-6980
2020-07-16 13:04:06 +02:00
Nino van Hooff
bc51db321f Merge branch 'master' into CURA-6711_support_structure_dropdown 2020-07-15 11:57:34 +02:00
Nino van Hooff
e39f004202 Do not increase diallowed area margin when tower brim is used
CURA-6980
2020-07-13 13:38:20 +02:00
Ghostkeeper
4372099e1d
Don't crash if material preferences are corrupt
This time we don't need to catch permission errors and such since we're reading it from a string that was stored in memory (read when the preferences file was read). However we do need to catch JSON Decoding Errors since the JSON syntax might be broken by the user modifying these files or because the file wasn't saved properly before.

Fixes Sentry issue CURA-112.
2020-07-13 11:45:16 +02:00
Nino van Hooff
649cc4a881 Replace support_tree_enable by a support_structure enum
CURA-6711
2020-07-09 17:17:40 +02:00
Nino van Hooff
816aaafc19 Revert changes for CURA-5479
It was decided that functionality present in existing plugins is
sufficient. No need to replicate it in our own codebase and
take on the burden of maintenance

CURA-5479
2020-07-07 16:11:03 +02:00