Commit graph

3530 commits

Author SHA1 Message Date
Ghostkeeper
cf21e7c74b
Also upgrade definition_changes and user
Because these files share their version numbers with quality changes.

Contributes to issue CURA-5054.
2018-03-09 16:21:42 +01:00
Ghostkeeper
e18b1cde55
Store extruder position under 'position' instead of 'extruder'
Otherwise it thinks it is still an extruder ID.

Contributes to issue CURA-5054.
2018-03-09 15:37:30 +01:00
Ghostkeeper
71afbba789
Merge branch '3.2' 2018-03-09 15:36:51 +01:00
Ghostkeeper
c54ea00111
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-09 15:22:13 +01:00
Ghostkeeper
2962e0e282
Upgrade to quality_changes rather than quality
Oops.

Contributes to issue CURA-5054.
2018-03-09 15:20:20 +01:00
Lipu Fei
206d20c440 Fix empty definition_changes check in MachineSettingsAction
CURA-5060

Should check for both "empty" and "empty_definition_changes".
2018-03-09 15:04:57 +01:00
Ghostkeeper
65591e7c26
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-09 15:00:25 +01:00
Lipu Fei
c9905449eb Clean up MachineSettingsAction imports
CURA-5060
2018-03-09 14:54:13 +01:00
Ghostkeeper
fb814b6519
Implement upgrade for quality changes extruder metadata
The metadata used to be the ID of the extruder. Now it's the position of the extruder stack.

Contributes to issue CURA-5054.
2018-03-09 14:54:08 +01:00
Lipu Fei
8c7e413038 Remove unnecessary setGlobalContainerStack() in project loading
CURA-5073
2018-03-09 14:37:43 +01:00
Lipu Fei
48dae7b6c7 Remove commented code
CURA-5060
2018-03-09 14:35:43 +01:00
Lipu Fei
de72dd3455 Fix material update upon gcode flavour change
CURA-5060
2018-03-09 14:26:53 +01:00
Ghostkeeper
e30d15ab66
Implement getCfgVersion
Mostly copied from the implementation in the 3.0 to 3.1 upgrade.

Contributes to issue CURA-5054.
2018-03-09 14:02:15 +01:00
Ghostkeeper
60de2aff65
Basic upgrade module from 3.2 to 3.3 implementation
'Basic' meaning no implementation at all.

Contributes to issue CURA-5054.
2018-03-09 13:59:31 +01:00
Ghostkeeper
970f1da810
Add missing getVersion and location for quality
It worked out because older plug-ins still defined this, but let's properly put it in here too.

Contributes to issue CURA-5054.
2018-03-09 13:47:19 +01:00
Ian Paschal
6bee5bf1b0 CURA-4972 Tweak per review comments 2018-03-09 10:36:34 +01:00
Lipu Fei
15f017b404 Set dirty for containers created in project loading
CURA-5056
2018-03-09 10:18:51 +01:00
Lipu Fei
ef8cd304dc No keep/discard setting dialog in project loading
CURA-4966
2018-03-08 20:00:21 +01:00
Lipu Fei
b8d3cbfe16 Refactor project loading
CURA-4966
2018-03-08 19:50:45 +01:00
Ghostkeeper
b4cf25cb7f
Call moveHead and moveBed on the printer model
Instead of on the output device. This function was moved, which caused Cura to crash when the bed levelling procedure was called.

Contributes to issue CURA-5061.
2018-03-08 15:29:48 +01:00
Ghostkeeper
676f9b8474
Switch if-statement around for fail checking
This reduces indent and makes the control flow a bit easier to read in my opinion.

Contributes to issue CURA-5061.
2018-03-08 15:23:08 +01:00
Ghostkeeper
375770818b
Add typing for _getPrinterOutputDevices
Then my IDE will give hints on where a printer of the wrong type is being added.

Contributes to issue CURA-5061.
2018-03-08 14:23:14 +01:00
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker
Docker support
2018-03-07 11:08:42 -08:00
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading
CURA-5056
2018-03-07 16:38:24 +01:00
Lipu Fei
c0d55ac2a8 Postpone signals in project loading to avoid incomplete data update
CURA-5056
2018-03-07 11:45:49 +01:00
Aleksei S
23653d7357 Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page
CURA-4960
2018-03-07 11:34:10 +01:00
Ghostkeeper
507de9c22c
Catch timeout exceptions when printing via USB
If the firmware froze or something...
2018-03-07 11:30:36 +01:00
Ghostkeeper
ecfb62b69e
Rename ColorChange to FilamentChange
I think this is more clear to the users what this should actually do.
2018-03-07 11:01:00 +01:00
Lipu Fei
75d9297c7d Optimize 3MF writer and XML material serialization
CURA-5049
2018-03-06 17:05:58 +01:00
Ghostkeeper
3b0a9bf16c
Fix checking whether to render objects in X-ray pass
Otherwise nothing gets drawn there.

Contributes to issue CURA-5040.
2018-03-06 15:53:34 +01:00
Ghostkeeper
b179edf60e
Document which layer is which pass
Contributes to issue CURA-5040.
2018-03-06 15:53:34 +01:00
Aleksei S
6bb42da056 Removed related commits to Settins per Object validation and
added short validation in StartScliceJob
CURA-4972
2018-03-06 15:40:26 +01:00
Aleksei S
42ac725705 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-06 12:40:55 +01:00
Aleksei S
1f883f3312 Remove reply hanlder to prevent crash after canceling a printing job
CURA-4960
2018-03-06 12:39:54 +01:00
ChrisTerBeke
96b40433a9 Merge branch 'master' into docker 2018-03-06 11:19:30 +01:00
Ian Paschal
8d5a643c9b Removed print() statement 2018-03-06 10:51:39 +01:00
Aleksei S
a35d4ae400 Fix: After clicking "cancel" button while sending a print job
the connection is disconnected
CURA-4960
2018-03-05 16:43:58 +01:00
ChrisTerBeke
cd01b096b5 Emit backend errors so we can process them differently than through a qml notification 2018-03-05 14:33:13 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Lipu Fei
6c42b662c8 Add doc for apply_to_all in XMLMaterialProfile 2018-03-05 10:54:01 +01:00
Aleksei S
6781627672 Fix: Flat model and reset all rotation did not work
CURA-5039
2018-03-05 10:42:09 +01:00
Lipu Fei
1e467b66c0 Fix protected variable access 2018-03-05 10:22:11 +01:00
Lipu Fei
2567642626 Remove outdated TODO 2018-03-03 16:13:35 +01:00
Lipu Fei
ca88e0df88 Add doc for calllater active machine in project loading 2018-03-03 16:12:33 +01:00
Ian Paschal
1f403f815d CURA-4972 Moved validation to SettingOverrideDecorator.py
**The diagnosis:**
The issue arrises from the fact that while the original object is subscribed to be validated, that subscription is only created by setting it as a settings override object. A clone of that object, while still a settings-override object, never gets subscribed because it's not explicitly set with the tool.

**The solution (?):**
I moved all the validation stuff over to SettingOverrideDecorator.py, and use its onSettingChanged() function to trigger the validation. Unfortunately, I can't use the timer because of some limitation with QTTimer and threads. So it's _a bit laggy in some places, and I'd be open to tips about how to fix this. It does work reliably though.
2018-03-02 17:05:58 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ian Paschal
f646f11020 CURA-4890 Removed print() statement. 2018-02-28 15:16:04 +01:00
Ian Paschal
3eab99c25c CURA-4890 Empty material no longer displayed as Unknown
"Get learned how to make Cura more better-er!"
2018-02-28 15:06:02 +01:00
Aleksei S
77a624d3b4 In monitor view show Finished for "wait_user_action" in printjob.status
CURA-4873
2018-02-28 13:04:51 +01:00
Lipu Fei
07824c21e1 Move getMachineDefinitionIDForQualitySearch() into QualityManager.py 2018-02-28 11:48:20 +01:00