Tim Kuipers
4f793d2fc5
JSON fix: default ==> default_value for acceleration and jerk (CURA-1443)
2016-05-30 14:41:04 +02:00
Tim Kuipers
c80e3fa62a
JSON fix: min_value ==> minimum_value (and for max) for acceleration and jerk settings (CURA-1443)
2016-05-30 14:37:57 +02:00
Tim Kuipers
7742073818
Removed old dual_extrusion_printer.json which wass reintroduced due to faulty merge. (CURA-1443)
2016-05-30 14:34:32 +02:00
Tim Kuipers
871d4087b0
JSON refactor: moved dual extrusion acceleration and jerk settings to new .def.json (CURA-1443)
2016-05-30 14:32:58 +02:00
Tim Kuipers
0e7c34c883
JSON refactor: moved dual category to above meshfix (CURA-1443)
2016-05-30 14:32:15 +02:00
Ghostkeeper
19695a93b5
Move extruder trains to metadata
...
Uranium doesn't know about extruder trains so it can't load that. Cura doesn't have access to anything outside of metadata or settings. So I'm putting it into metadata.
Contributes to issues CURA-1278 and CURA-351.
2016-05-30 14:27:04 +02:00
Arjen Hiemstra
93873a2ce8
Also trigger a reslice when the containerstack's containers change
...
Contributes to CURA-1278
2016-05-30 14:02:51 +02:00
Arjen Hiemstra
8039184c18
Move setting error checking to StartSliceJob and allow the job to return a proper response
...
Now the job can determine if we can continue with slicing or not and if
not, why not.
This also means we can now show a message when we cannot find any
slicable objects.
Contributes to CURA-1278
2016-05-30 13:03:06 +02:00
Arjen Hiemstra
cd2b853fff
Remove "slicing" message since it is now displayed in the sidebar
...
Now removed for good
Contributes to CURA-1278
2016-05-30 13:01:25 +02:00
Arjen Hiemstra
0b3b718e87
Make CuraEngineBackend respond to changes to the global container stack
...
This way we can properly connect to propertyChanged signals and trigger
a reslice.
Contributes to CURA-1278
2016-05-30 12:23:28 +02:00
Arjen Hiemstra
c63eb3871c
Account for the changes to BackendState in Uranium
...
Contributes to CURA-1278
2016-05-30 12:22:12 +02:00
fieldOfView
472012a5b9
Fix debug code introduced in f5fce51238
2016-05-27 17:46:53 +02:00
fieldOfView
5927aa5578
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-05-27 17:21:32 +02:00
fieldOfView
6aa00a951f
Fix triggering actions from the extensions menu
...
Contributes to CURA-1540, CURA-1278
2016-05-27 17:21:14 +02:00
Ghostkeeper
525f608b24
Remove reference to machine_extruder_count
...
This setting is not defined in this definition so it can't find the value of it here. I've re-introduced the maximum_value statically in the Jedi implementations of this setting.
Contributes to issue CURA-1278 and CURA-351.
2016-05-27 17:18:52 +02:00
fieldOfView
f5fce51238
Fix "Defaults" button on General page
...
CURA-1278
2016-05-27 17:11:54 +02:00
Jaime van Kessel
c1b64274e8
Merge branch 'master' of github.com:Ultimaker/Cura
2016-05-27 15:29:15 +02:00
Jaime van Kessel
89c1136d7f
Per object settings can now be added & changed
...
CURA-1278
2016-05-27 15:28:54 +02:00
Ghostkeeper
41425fd36e
Replace symbols in default visible settings before usage
...
These characters are just for visualisation in the code. They should never be used during the normal operation of the program, nor should they be saved to the file. So just replace them immediately.
Contributes to issue CURA-1278.
2016-05-27 14:39:53 +02:00
Ghostkeeper
8bd06ee8ec
Merge branch 'master' of github.com:Ultimaker/Cura
2016-05-27 14:09:38 +02:00
Jaime van Kessel
d5dbd0f77b
Merge branch 'master' of github.com:Ultimaker/Cura
2016-05-27 14:01:06 +02:00
Jaime van Kessel
990d05815b
Added qml files to import path
2016-05-27 14:00:38 +02:00
Tim Kuipers
aa2d09aa08
JSON lil fix: superflious comma (CURA-1616)
2016-05-27 12:44:49 +02:00
fieldOfView
545678e18b
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-05-27 11:54:24 +02:00
fieldOfView
6355631842
Activate another machine when we remove the currently active MachineManagerModel
...
CURA-1278
2016-05-27 11:53:53 +02:00
fieldOfView
64a613f407
Fix "Activate" button on the Manage Printers page
...
CURA-1278
2016-05-27 11:47:50 +02:00
Jaime van Kessel
a9efa3e612
Merge branch 'master' of github.com:Ultimaker/Cura
2016-05-27 11:27:16 +02:00
Jaime van Kessel
c914446060
Initial changes for perobject stuff
...
CURA-1278
2016-05-27 11:26:41 +02:00
Ghostkeeper
3311fa8033
Add resource type for extruder definitions
...
The definition is derived with inheritance, just like the printers. Therefore I decided to call this 'ExtruderStack' in line with how the resource type for the printer is named.
Contributes to issue CURA-1278.
2016-05-27 10:23:28 +02:00
Ghostkeeper
75a0604871
Merge branch 'master' of github.com:Ultimaker/Cura
2016-05-27 09:06:58 +02:00
fieldOfView
b60e704aa6
Fix typo
...
CURA-1606
2016-05-26 22:29:21 +02:00
fieldOfView
53661b2739
Ensure a machine gets a unique names when adding or renaming a machine
...
CURA-1606
2016-05-26 22:18:34 +02:00
fieldOfView
6bc61a6352
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-05-26 18:07:00 +02:00
fieldOfView
c01e7144d1
Consistently change the spelling of bounding box
...
bounding box, bounding_box, boundingBox
2016-05-26 18:06:40 +02:00
Tim Kuipers
16450ec614
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-05-26 17:11:52 +02:00
Tim Kuipers
214d385dae
fix: moved extruder definition settings to a new file fdmextruder.def.json (CURA-1616)
2016-05-26 17:11:41 +02:00
Ghostkeeper
e02e2bde8d
Remove semicolon at the end of the line
2016-05-26 16:35:34 +02:00
Jaime van Kessel
5acdc9a579
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-05-26 16:20:35 +02:00
Arjen Hiemstra
7ce4e23677
Add all categories to default visible list
...
Since otherwise none of the children will be visible
Contributes to CURA-1278
Fixes CURA-1614
2016-05-26 15:52:36 +02:00
Jaime van Kessel
c2a25b131e
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-05-26 15:35:51 +02:00
Jaime van Kessel
c814e47b0e
SettingView now works with PreferenceVisibility handler
...
CURA-1278
2016-05-26 15:35:28 +02:00
Arjen Hiemstra
4fc1407c00
Update variant profiles to use the right syntax for formulas
...
Contributes to CURA-1278
2016-05-26 15:32:08 +02:00
Arjen Hiemstra
43ec037c55
Do not load ComboBox items asynchronously
...
Since there is a bug with Qt 5.5 that will do strange reordering.
Contributes to CURA-1278
2016-05-26 15:29:56 +02:00
Arjen Hiemstra
8804c2837f
Make reset and restore default buttons work properly again
...
Contributes to CURA-1278
2016-05-26 15:28:57 +02:00
Simon Edwards
5f638f6e69
Better handling of degenerate convex hull cases.
...
Contributes to CURA-1504
2016-05-26 14:39:22 +02:00
Arjen Hiemstra
d5fa6d884f
Fix XML material profiles so the global properties are properly set
...
Contributes to CURA-339
2016-05-26 13:32:14 +02:00
Arjen Hiemstra
5975fa1b0d
Fix enabled state of setting items
...
Contributes to CURA-1278
2016-05-26 13:29:56 +02:00
fieldOfView
f7f9dc036e
Show correct page when opening profile manager
...
CURA-1278
2016-05-26 09:42:44 +02:00
fieldOfView
f0b956c3c6
Add selection "tab" for active extruder
...
Only visible for multi-extrusion printers. Doesn't do anything but setting a qml property, but is to be used to change the variant/material per extruder, and to apply a filter to the advanced mode settings.
CURA-340
2016-05-26 09:42:31 +02:00
fieldOfView
85370dad87
Fix indent
...
CURA-340
2016-05-26 09:42:16 +02:00