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
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
fieldOfView
6a77f67c34
Rearrange sidebar top
...
CURA-340
2016-05-26 09:42:04 +02:00
fieldOfView
098cf515df
Fix tooltips for simple mode helpers
...
CURA-790
2016-05-26 09:41:49 +02:00
fieldOfView
fe53a43819
Combine support checkbox & support extruder selection & remove main extruder selection
...
CURA-790
2016-05-26 09:41:25 +02:00
Jaime van Kessel
808f117785
Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura
2016-05-25 15:44:08 +02:00
Arjen Hiemstra
6305c70820
Remove old version of FDM printer base file
2016-05-25 15:12:56 +02:00
Arjen Hiemstra
386aec32a8
Merge branch 'settings_rework'
...
Contributes to CURA-1278
* settings_rework: (224 commits)
Improve slice trigger documentation
Import Cura in materials preferences page so we can use the active definition id
Add layer height to high quality profile so we have something that changes
Update example XML material to use the right product names
Filter available materials by the machine definition
Show the add machine dialog when we do not have an active machine
Create machine-specific material containers for machine specific overrides in XML material files
When creating a new container stack, add empty containers for things where we cannot find containers
Add preferred variant, material and quality to UM2+ definition
Account for global container stack being None in the backend plugin
Use the global stack instance variable and account for it potentially being None
Store the global container stack as an instance property
Added wildcard to filtering
Per object settings filter now uses correct bool types (instead of strings)
Removed stray = sign.
Fix creating print job name
Disable asynchronous loading of SettingItem when Qt Version < 5.5
Document QTbug
Properly serialise all settings to g-code file
Document GCodeWriter class
...
2016-05-25 15:12:25 +02:00
fieldOfView
f349221fa6
Make simple mode extruder selection work with settings_rework
...
CURA-1278 & CURA-790
2016-05-25 14:56:05 +02:00
fieldOfView
a0c09063ee
Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework
2016-05-25 13:57:33 +02:00
fieldOfView
2683907121
Show Ultimaker Original and Ultimaker Original + in Add Machine wizard
...
CURA-1278
2016-05-25 13:57:16 +02:00
Jaime van Kessel
1256f4a752
Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework
2016-05-25 12:04:12 +02:00
Ghostkeeper
6522aae915
Improve slice trigger documentation
...
Contributes to issue CURA-1278.
2016-05-25 11:53:35 +02:00
Jaime van Kessel
5ba3f3ebad
Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework
2016-05-25 11:50:22 +02:00
Arjen Hiemstra
9bb4917ae7
Import Cura in materials preferences page so we can use the active definition id
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
ab0d34d9ac
Add layer height to high quality profile so we have something that changes
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
81d0b34f20
Update example XML material to use the right product names
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
b2a8810d04
Filter available materials by the machine definition
...
Since we now have some machine-specific materials
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
2654033fae
Show the add machine dialog when we do not have an active machine
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
e29cc5e699
Create machine-specific material containers for machine specific overrides in XML material files
2016-05-25 11:31:19 +02:00
Arjen Hiemstra
a1d48fd511
When creating a new container stack, add empty containers for things where we cannot find containers
...
Additionally, record this information in the metadata of the stack
2016-05-25 11:31:19 +02:00
Arjen Hiemstra
24210246ee
Add preferred variant, material and quality to UM2+ definition
2016-05-25 11:31:19 +02:00
Arjen Hiemstra
396f023bdf
Account for global container stack being None in the backend plugin
2016-05-25 11:31:19 +02:00
Arjen Hiemstra
b1f887a70f
Use the global stack instance variable and account for it potentially being None
2016-05-25 11:31:19 +02:00
Arjen Hiemstra
2e0205f174
Store the global container stack as an instance property
...
This reduces the amount of function calls and makes it simpler to check
for container existance
2016-05-25 11:31:19 +02:00
Jaime van Kessel
81cdb3fd8c
Added wildcard to filtering
...
CURA-1278
2016-05-25 11:28:58 +02:00
Jaime van Kessel
5f54d611cf
Per object settings filter now uses correct bool types (instead of strings)
...
CURA-1278
2016-05-25 11:16:57 +02:00
Jaime van Kessel
fd3788ba7c
Removed stray = sign.
...
CURA-1278 CURA-1592
2016-05-25 11:06:48 +02:00
Ghostkeeper
c80455c6bc
Fix creating print job name
...
Also fixed up the code style of that bit.
Perhaps this should've been done in Python, but that is for later.
Contributes to issue CURA-1278.
2016-05-24 15:04:08 +02:00
Arjen Hiemstra
332321b991
Disable asynchronous loading of SettingItem when Qt Version < 5.5
2016-05-24 11:50:39 +02:00
Ghostkeeper
b1d5cad898
Document QTbug
...
Took a while to find!
Contributes to issue CURA-1278.
2016-05-24 11:43:57 +02:00
