Commit graph

2372 commits

Author SHA1 Message Date
Lipu Fei
7326ee8c40 Fix typo
CURA-5218
2018-04-18 11:19:04 +02:00
Lipu Fei
bae1d2a59d Switch to a default quality if the specified is not available
CURA-5218
2018-04-18 11:16:19 +02:00
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials()
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
2018-04-12 16:12:07 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
33949c3b71 Update build plate compatibility upon extruder enabled/disabled
CURA-5219
2018-04-12 14:02:56 +02:00
Lipu Fei
1c4c3a4a0b Fix quality changes that are based on no-long-available quality_type
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
8d3c3c0e80 Fix the case that a quality_type is not available
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
b55570f3fb Merge branch '3.3' 2018-04-10 13:13:38 +02:00
Lipu Fei
b314d2bbe2 Fix extruder nr handling for -1 Not Overriden
CURA-5213
2018-04-10 12:56:20 +02:00
Lipu Fei
4615c756a7 More clear error handling for container deserialization
CURA-5045

 - If a container cannot be deserialized in project loading, it should fail
   right on the spot because even if it continues, it still won't work.
 - In other places, at least log deserialization errors if any of them show
   up.
2018-04-09 14:51:05 +02:00
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
2018-04-06 13:26:16 +02:00
Lipu Fei
e36ef583b7 Minor changes and cleanup 2018-04-05 15:14:15 +02:00
Lipu Fei
19bc2b78f4 Add Version upgrade 3.3 to 3.4
Need to distinguish between quality and quality_changes in the cura directory,
so we need to move all custom quality profiles into the quality_changes directory.
2018-04-05 15:14:15 +02:00
Lipu Fei
c3fe53123b Create module cura.ReaderWriters
CURA-4644

Move all reader writer classes into cura.ReaderWriters.
2018-04-05 15:14:15 +02:00
Aleksei S
720a85dd06 Remove comment
CURA-4844
2018-03-29 14:31:25 +02:00
Aleksei S
c81d5d9741 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 11:54:43 +02:00
Aleksei S
290adbd906 Fix: bed leveling for UM+
CURA-4844
2018-03-29 11:53:31 +02:00
Jack Ha
c9dc429b2b CURA-5045 solve merge conflicts 2018-03-29 09:22:19 +02:00
Diego Prado Gesto
acff530871 CURA-5169 Fix a typo 2018-03-28 15:54:42 +02:00
Lipu Fei
9efad28599 Fix setQualityChangesGroup when quality_type is not_supported
CURA-5169
2018-03-28 12:55:43 +02:00
Lipu Fei
e3c578aa18 Revert "Use global_stack.extruders instead of ExtruderManager.extruderIds"
CURA-5168

Causes side effects.
2018-03-28 12:18:01 +02:00
Lipu Fei
90d2c29fb4 Use global_stack.extruders instead of ExtruderManager.extruderIds
CURA-5168

We want to remove ExtruderManager eventually, and keeping two separate
pieces of data can cause it to be out of sync.
2018-03-28 12:12:49 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container
changes and output devices change.
2018-03-28 11:07:48 +02:00
Lipu Fei
f15771856f Add parent for stacks and containers that are created 2018-03-27 15:03:11 +02:00
Ghostkeeper
d6205d5d85
Show configuration error when extruder positions don't match
When any extruder position doesn't match when adding a container, don't add any of the extruders. Don't add faulty half-data to the registry!

Contributes to issue CURA-5045.
2018-03-27 14:38:15 +02:00
Lipu Fei
98eed89686 Remove global changed check that prevents signal emit
CURA-5157
2018-03-27 14:32:40 +02:00
Ghostkeeper
013bb04a7d
Show configuration error if finding definition to add wasn't found
It must've gotten this ID from somewhere.

Contributes to issue CURA-5045.
2018-03-27 14:32:13 +02:00
Ghostkeeper
544c2c69b4
Remove unused imports
Contributes to issue CURA-5045.
2018-03-27 14:30:48 +02:00
Jack Ha
ca4cb419ff CURA-5157 prevent some startup crash after upgrading from 2.7 2018-03-27 14:08:12 +02:00
Jack Ha
04a135e6a3 CURA-5157 renamed extruder to position in addExtruderStackForSingleExtrusionMachine, fixes loading some upgrades from 3.0 2018-03-27 13:04:05 +02:00
Ghostkeeper
1aea5356b6
More early out if no global stack
This prevents all sorts of crashes on start-up, instead causing no active printer to appear and the add printer wizard to show up.

Contributes to issue CURA-5045.
2018-03-27 09:43:37 +02:00
Ghostkeeper
f2c8d8756e
Don't emit changed signals if the global stack ID doesn't exist
Because nothing will change then.

This is equivalent to putting the call to self.__emitChangedSignals() in the if-statement. But I switched the condition of the if-statement around because it looks more like error handling to me. This is the main case.

Contributes to issue CURA-5045.
2018-03-27 09:41:14 +02:00
Ghostkeeper
75e993eb60
Don't crash when updating material list without global container
There is nothing to update then.

Contributes to issue CURA-5045.
2018-03-27 09:39:10 +02:00
Ghostkeeper
d74c1e0d7a
Don't crash if getting container changed signals before global stack
Just don't get any signals. This function should be called again if the global container changed anyway.

Contributes to issue CURA-5045.
2018-03-27 09:29:41 +02:00
Ghostkeeper
bd4aba2572
Return empty extruder list if no global stack
Just about every call of this function (except 2) would break when this returns None. The signature also says it doesn't return None. Let's return an empty list instead.

Contributes to issue CURA-5045.
2018-03-27 09:28:19 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
2018-03-26 15:48:03 +02:00
Jack Ha
c7a3d33411 CURA-5138 generate unique name for each per object setting container, fix per object settings being lost when multiplying 2018-03-26 11:20:35 +02:00
Lipu Fei
fd2abdd9fb
Merge pull request #3507 from guillemavila/Copy-all-values-to-all-extruders
add Copy all values to all extruders
2018-03-22 16:16:30 +01:00
Guillem
fecbf82551 Replace all user changed values
Removed check to change the values only if they were different
2018-03-22 15:49:30 +01:00
Guillem
01ec20f5ce Fixed docs, removed todo, changed way to get extruder stacks, slightly faster 2018-03-22 11:39:42 +01:00
Jack Ha
a2b03a2ac1 CURA-4400 fix setting extruders_enabled_count so print_sequence for Custom FDM printer is available again 2018-03-20 13:30:48 +01:00
Ian Paschal
d7b0f11ddf CURA-4400 Fixed project loading
"enabled" metadata is now read from saved projects (.3mf)
2018-03-20 11:17:39 +01:00
Diego Prado Gesto
51e7a18d1c Add high level functions for setting the variant, material and quality
using the name, id and quality_type respectively.
2018-03-19 17:25:49 +01:00
Guillem
faf8ed3ba6 Replace only user changed values
removed machine_settings and settable_per_extruder_check. Not needed.
2018-03-19 14:57:31 +01:00
Guillem
18fba5b529 Avoid replacing machine_settings and not settable_per_extruder settings 2018-03-19 14:21:45 +01:00
Lipu Fei
b13bfaa8e1 Rename setVariantGroup() -> setVariant()
There is no such thing as VariantGroup.
2018-03-19 12:27:15 +01:00
Lipu Fei
4a0b3ace9e Fix missing getExtruderPositionValueWithDefault() error
PerObjectContainerStack was not a PerObjectContainerStack so it didn't
have getExtruderPositionValueWithDefault(), and this will break SliceInfo.
2018-03-19 12:23:42 +01:00