Commit graph

3611 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
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +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
Diego Prado Gesto
fe2a08a46b CURA-4870 Do not store buildplate information coming from connect if the
printer don't have buildplate in its definition.
2018-03-09 13:38:06 +01:00
Diego Prado Gesto
ebbb30a5be CURA-4870 Replace network key and connect group name metadata values
when the connection changes.
2018-03-09 13:37:15 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
2018-03-09 12:42:49 +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
Diego Prado Gesto
b212781a19 Merge branch 'master' into feature_sync_button 2018-03-08 16:57:21 +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
Diego Prado Gesto
ae094c8201 CURA-4870 Disable the connect button in the discovery list when the
printer is not a host of printers.
2018-03-08 14:02:22 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker
Docker support
2018-03-07 11:08:42 -08:00
Diego Prado Gesto
e7294e1299 CURA-4870 Correctly look for the buildplate variants using the
machine_buildplate_type that is also sent in the gcode and is the
information that Cura gets from connect.
Create a new dict in the VariantManager that maps the
machine_buildplate_type with the right container
2018-03-07 18:52:48 +01:00
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading
CURA-5056
2018-03-07 16:38:24 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output
model so it can be used to show the buildplate name in the configuration
list.
2018-03-07 13:57:13 +01:00
Jack Ha
859ac88357 Merge branch 'master' into feature_enable_disable_extruder 2018-03-07 12:59:40 +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
Jack Ha
ff1c378c08 CURA-4400 fix start slicing when disabled extruder is incompatible 2018-03-07 11:38:35 +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
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Jack Ha
095d9fbdf6 CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 17:01:30 +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
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00