Commit graph

4854 commits

Author SHA1 Message Date
Ghostkeeper
96c38bce2b
Merge branch '3.1' 2017-11-30 16:57:01 +01:00
ChrisTerBeke
3abf067d25 Fix loading .curaproject files with stack setups from earlier versions - CURA-4646 2017-11-30 15:24:51 +01:00
Jaime van Kessel
f30f0a7194 Mismatched configuration is now shown correctly again
CL-541
2017-11-30 11:04:13 +01:00
Ruben D
d29d73413f
Remove unused function
Contributes to issue CURA-4243.
2017-11-30 01:11:10 +01:00
Ruben D
f9c59c7e1e
Don't update model if extruders haven't all been loaded yet
This model is created while the extruder stacks have not yet been filled in. You can't connect yet. When the extruder is ready, _extrudersChanged will be called again and then the new extruder will also get connected.

Contributes to issue CURA-4243.
2017-11-30 00:33:10 +01:00
Lipu Fei
320330b788 Take DebugMode flag from CuraVersion
CURA-4539
2017-11-29 14:36:00 +01:00
Ghostkeeper
838e49f3da
Pass just metadata through quality manager instead of full containers
Where we only need metadata, we should pass metadata instead of full containers.
Also add some type hinting.

Contributes to issue CURA-4243.
2017-11-29 14:33:04 +01:00
Lipu Fei
b7fed81fc1 Pass "is_debug_mode" flag to Application
CURA-4539
2017-11-29 14:01:19 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types
Improved mesh type UX (Per Model Settings)
2017-11-29 13:24:38 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Diego Prado Gesto
e5ac33a929 CURA-4641 Minor changes 2017-11-29 11:19:11 +01:00
ChrisTerBeke
16e07fc461 Update color indicators for extruders when changing material color - CURA-4641 2017-11-29 10:47:39 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
2017-11-28 17:30:00 +01:00
Ghostkeeper
381d9bf3f1
Log which file caused it to go wrong
Contributes to issue CURA-4243.
2017-11-28 16:15:20 +01:00
Ghostkeeper
56d6664c8c
Guard against materials not having a definition
The empty container has no definition.

Contributes to issue CURA-4243.
2017-11-28 15:33:21 +01:00
ChrisTerBeke
b961c37ead Fix generating view for machine action - CURA-4568 2017-11-28 15:18:05 +01:00
ChrisTerBeke
11f50f1cd3 Update machine action and image reader dialogs with new component creation method - CURA-4568 2017-11-28 14:55:35 +01:00
Ghostkeeper
eb3981b4e0
Let _fetchInstanceContainers return containers split by loaded or not
It must now return two dictionaries: One for the profiles that have been completely loaded and one for the profiles that are only metadata. We could probably improve on these a little bit, since all of these (except the material model) will now load all available quality profiles. I'll see if it is necessary to optimise that.

Contributes to issue CURA-4243.
2017-11-28 14:26:14 +01:00
ChrisTerBeke
74eb4958af Fixes for printer output device views - CURA-4568 2017-11-28 14:21:47 +01:00
ChrisTerBeke
cfbb553182 Use new QML element creator for output device view - CURA-4568 2017-11-28 14:16:58 +01:00
Jaime van Kessel
9084dfd6bd It's now possible to send print jobs to cluster again
CL-541
2017-11-28 12:59:54 +01:00
Jaime van Kessel
cfc6a3ad48 Added some convenience functions to NetworkedPrinterOutputdevice
This also moves the getUser from legacy to networked printer

CL-541
2017-11-28 12:43:49 +01:00
ChrisTerBeke
9db8bff924 Merge pull request #2838 from fieldOfView/fix_crashhandler_crash
Fix error when CrashHandler is opened before opengl is initialised
2017-11-28 10:38:23 +01:00
ChrisTerBeke
e6e8353ea8
Merge pull request #2838 from fieldOfView/fix_crashhandler_crash
Fix error when CrashHandler is opened before opengl is initialised
2017-11-27 17:18:38 +01:00
ChrisTerBeke
a072af5585 Merge branch '3.1' 2017-11-27 17:17:02 +01:00
Jaime van Kessel
c1c59925de Removed duplicated code
CL-541
2017-11-27 17:14:30 +01:00
Jaime van Kessel
83b13546fb Moved compressing of GCode to one class higher
CL-541
2017-11-27 17:12:36 +01:00
ChrisTerBeke
26b9fc3163 Only create extruder stack for single extrusion machine when not yet existing - CURA-4482 2017-11-27 16:55:01 +01:00
ChrisTerBeke
8cfaa44580 Fix resolving global stack definition when switching variant - CURA-4620 2017-11-27 16:40:23 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components
CL-541
2017-11-27 15:54:44 +01:00
Ghostkeeper
e5427eded6
Refactor _getBasicMaterials to only handle metadata
Otherwise the full profile of all materials and all their definitions gets loaded.

Contributes to issue CURA-4243.
2017-11-27 15:38:11 +01:00
ChrisTerBeke
9e6704a162 Fix extruder stack machine definition link for per extruder settings resolvement - CURA-4627 2017-11-27 15:14:32 +01:00
Jaime van Kessel
52a137a68c Ensured that sidebar has the right properties to show again
CL-541
2017-11-27 14:42:45 +01:00
Ghostkeeper
952e3974eb
Remove convenience handling of 'None'
Because this parameter has type checking, we'll get warned if this variable is None.

Contributes to issue CURA-4243.
2017-11-27 14:22:09 +01:00
Lipu Fei
49cac860a8 Fix project loading
CURA-4617
2017-11-27 14:17:13 +01:00
Ghostkeeper
17a25f98a4
Merge branch '3.1' 2017-11-27 13:58:52 +01:00
Jaime van Kessel
f791b53ad8 Enabled monitor items for ClusterOutputDevice again
CL-541
2017-11-27 13:54:34 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
Ghostkeeper
99780c3b44
Fix casing of getMetadataEntry
This is done a bit inconsistently because it's unclear whether metadata should be considered as one word or two. I'd say it is one word, not 'meta data', but people seem to disagree.

Contributes to issue CURA-4243.
2017-11-27 13:31:29 +01:00
Jaime van Kessel
0613b1e4b7 Creating components is now done with the prefab function
CURA-4568
2017-11-27 13:00:49 +01:00
Lipu Fei
1866c4ee66 Split user settings for single extrusion machines
CURA-4617
2017-11-27 12:56:53 +01:00
Ghostkeeper
4189f8dfa3
Use new findDirtyContainers function
This prevents all instance containers from being loaded every time we auto-save.

Contributes to issue CURA-4243.
2017-11-27 11:59:37 +01:00
Jaime van Kessel
f570ba046b Added rudimentary jogging controls for UM3
This needs a bit more love; The machine is a bit stupid when it comes to
moving outside of build area.

CL-541
2017-11-27 11:02:56 +01:00
Jaime van Kessel
00eeb835ac ManualPrinterControl uses correct functions again
CL-541
2017-11-27 10:22:30 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Ghostkeeper
9938678347
Fix setting IDs of empty containers
The _id hasn't been used for a very long time.

Contributes to issue CURA-4243.
2017-11-27 09:16:27 +01:00
Ruben D
ffef26097d
Merge branch '3.1' 2017-11-26 18:48:42 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder
CURA-4620
2017-11-25 02:25:36 +01:00
fieldOfView
77d134a3b7 Fix python error when CrashHandler is opened before opengl is initialised
Contributes to #2837
2017-11-24 16:55:18 +01:00
Ghostkeeper
ebe766a7c8
Set definition by their ID
The new function for setting the definition just adds the ID to the metadata.

Contributes to issue CURA-4243.
2017-11-24 16:45:09 +01:00