362 Commits

Author SHA1 Message Date
Ghostkeeper
117973ee25 Add todo message for adding profile readers
This should be done when we have a working profile manager again.

Contributes to issue CURA-1278.
2016-05-20 16:22:10 +02:00
Ghostkeeper
5a28eca203 Add profile reader plug-in type
This type of plug-in will load a file as an instance container of the user profile type.

Contributes to issue CURA-1278.
2016-05-20 16:22:10 +02:00
Ghostkeeper
85ce8a719e Merge local with origin
Contributes to issue CURA-1278.
2016-05-20 16:22:10 +02:00
Jaime van Kessel
295cea338c Translate tool is now no longer stopped by ton of errors
CURA-1278
2016-05-20 14:09:58 +02:00
Jaime van Kessel
305cb27ac0 Global_only is now a string, as the filtering does not work with settingFunctions
CURA-1278
2016-05-20 13:35:38 +02:00
Jaime van Kessel
2fa24edc1f Fixed type for global_only property
CURA-1278
2016-05-20 11:29:48 +02:00
Jaime van Kessel
e20691c421 Fleshing out of SettingOverrideDecorator
CURA-1278
2016-05-19 11:41:10 +02:00
Jaime van Kessel
7ec3ca6e75 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-19 11:25:47 +02:00
Jaime van Kessel
0e792e7a22 Added SettingOverrideDecorator stub
CURA-1278
2016-05-19 11:25:25 +02:00
Ghostkeeper
6b0a33e166 Move dual extrusion settings into FDMPrinter
This involves making labels and descriptions for some dual-extrusion machine settings, and default values for everything, making sure inheritance is correct, etc.

Contributes to issue CURA-1278.
2016-05-18 17:53:43 +02:00
Ghostkeeper
3b5a74047b Add setting instance type for extruder
This type is not included in the global stack structure yet since there is no global stack structure per extruder yet.

Contributes to issue CURA-1278.
2016-05-18 17:53:43 +02:00
Arjen Hiemstra
b621958098 Fix uses of getValue after its removal from Uranium API 2016-05-18 16:45:44 +02:00
Jaime van Kessel
a5f8546d69 Fixed cases where getValue was still used.
We now use getProperty instead

CURA-1278
2016-05-18 16:29:57 +02:00
Jaime van Kessel
dafff9159e Added materials & qualities
CURA-1278
2016-05-18 11:03:44 +02:00
Arjen Hiemstra
0664cbd2f6 Make sure to set the right type for the "current settings" instance container 2016-05-17 18:37:18 +02:00
Jaime van Kessel
ffcfba2caa Cura now handles saving of instances & stacks
This is done because Cura has a fundamentally different strategy for this than Uranium.

CURA-1278
2016-05-17 14:46:51 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception
CURA-1278
2016-05-17 12:55:40 +02:00
Jaime van Kessel
59ec593db5 Added way to change active quality
CURA-1278
2016-05-17 10:49:06 +02:00
Jaime van Kessel
9bfe31aeef Added quality type to setting stack
CURA-1278
2016-05-17 10:39:10 +02:00
Arjen Hiemstra
d1d2e1cea7 Set the right defaults for setting visibility in Cura 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
5ff5ed3856 Add an "activeDefinitionId" property to MachineManager 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
efdf1d78d1 Add a "Current Settings" instance container to the stack on stack creation 2016-05-16 18:21:57 +02:00
Arjen Hiemstra
08afad8973 Remove get/setSettingValue from CuraApplication
They are unused and should not be used anyway
2016-05-16 18:16:42 +02:00
Jaime van Kessel
ed49831785 Last active machine is now restored upon restart
CURA-1278
2016-05-13 15:24:49 +02:00
Jaime van Kessel
dd24e488a8 Materials & variants are now correctly checked when active
CURA-1278
2016-05-13 12:04:38 +02:00
Jaime van Kessel
6ffde62bcf Added stubs for hasVariants & hasMaterials
CURA-1278
2016-05-13 11:42:29 +02:00
Jaime van Kessel
f3384b043d Only variants of active machine are now shown
CURA-1278
2016-05-13 11:26:08 +02:00
Jaime van Kessel
b3e741e90c Added variant selection
CURA-1278
2016-05-13 10:16:58 +02:00
Jaime van Kessel
f5e63f2e71 Changing the material is now possible
CURA-1278
2016-05-12 17:38:43 +02:00
Jaime van Kessel
89c0644e4b Added activeMaterial property
CURA-1278
2016-05-12 17:01:47 +02:00
Jaime van Kessel
44f5559db3 Moved addMachine to machineManager
CURA-1278
2016-05-12 15:18:13 +02:00
Jaime van Kessel
a16acddff1 Removed unused code
CURA-1278
2016-05-12 11:59:23 +02:00
Jaime van Kessel
78e9545ece Machines can now be removed
CURA-1278
2016-05-12 11:46:28 +02:00
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura
CURA-1278
2016-05-12 11:24:09 +02:00
Jaime van Kessel
66a29a2f1c Added name for active machine
CURA-1278
2016-05-11 16:21:09 +02:00
Jaime van Kessel
f91a4f9369 Moved registration of MachineManager model to before QML is read
Else the model is undefined on first run, which caused a number of silly issues.
CURA-1278
2016-05-11 16:13:30 +02:00
Jaime van Kessel
573c1c1a5a Added MachineManagerModel to Cura
CURA-1278
2016-05-11 15:35:41 +02:00
Jaime van Kessel
fa8fbb2560 Added global only to setting type for CuraApplication
CURA-1278
2016-05-10 14:42:53 +02:00
Jaime van Kessel
bdccab4b60 Re-added BuildVolume
CURA-1278
2016-05-10 14:35:45 +02:00
Jaime van Kessel
5fdd0e8156 BuildVolume no longer crashes when width/height/depth is None
CURA-1278
2016-05-10 14:34:07 +02:00
Jaime van Kessel
67b6c5aa29 Re-added platform again
CURA-1278
2016-05-10 13:47:27 +02:00
Jaime van Kessel
170df747b3 Use globalContainer stack instead of activeInstance
CURA-1278
2016-05-10 11:40:36 +02:00
Jaime van Kessel
04f1e8d27c Renames to from activeStack to global stack
CURA-1278
2016-05-10 11:16:35 +02:00
Jaime van Kessel
dbd2c911ce Renamed active containerstack to global containerstac
Cura-1278
2016-05-10 10:34:02 +02:00
Jaime van Kessel
c0c24f1f70 BuildVolume now uses StackContainer
CURA-1278
2016-05-10 09:36:48 +02:00
Arjen Hiemstra
44246c0676 Comment out all things that use settings related things so we can at least start 2016-05-09 12:06:11 +02:00
Jaime van Kessel
4e722d61ce Removed unused code 2016-04-28 15:28:50 +02:00
Ghostkeeper
fe68be4f62 Merge branch 'connection_rework' 2016-04-26 11:51:09 +02:00
Thomas-Karl Pietrowski
37ba88351a Adding marker for the Nvidia workaround 2016-04-19 20:24:56 +02:00
Arjen Hiemstra
c2ac0e8217 Fix resource paths after Uranium API change
Contributes to CURA-1390
2016-04-19 18:11:11 +02:00