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
2683907121
Show Ultimaker Original and Ultimaker Original + in Add Machine wizard
...
CURA-1278
2016-05-25 13:57:16 +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
24210246ee
Add preferred variant, material and quality to UM2+ definition
2016-05-25 11:31:19 +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
Arjen Hiemstra
a1115649cf
Rename all variant profiles to .inst.cfg and correctly mark them as type variant
...
Still some issues with formulas causing errors, but it is getting closer
2016-05-23 18:21:23 +02:00
Arjen Hiemstra
f90be96bc6
Add back the Profiles page
2016-05-23 18:21:23 +02:00
Arjen Hiemstra
8284ab9de5
Insert printers and materials pages at the right location
2016-05-23 18:21:23 +02:00
Ghostkeeper
c996bcb191
Remove extruder drive upgrade option
...
It was originally included with the thought that there would be different firmware for this, but there isn't. So this setting is not needed.
Contributes to issue CURA-1278.
2016-05-23 17:19:18 +02:00
Arjen Hiemstra
f68a9ae90f
Fix materials page so it displays the proper data
...
Also, make sure the code is reasonably clean
2016-05-23 14:43:56 +02:00
Arjen Hiemstra
c23980437d
Fix naming of quality profiles
2016-05-23 14:43:56 +02:00
fieldOfView
0969356cb6
Fix bq_hephestos_2 json definition
2016-05-23 14:22:21 +02:00
fieldOfView
4877c35f06
Fix layout of SettingTextField items
...
CURA-1278
2016-05-23 13:35:52 +02:00
Arjen Hiemstra
e0c7ed8561
Add a plugin that loads XML materials and an example material
2016-05-23 02:19:39 +02:00
Arjen Hiemstra
b452cf7ba4
Add a materials management page
...
Based off Aldo's work which is in a different branch
2016-05-23 02:19:11 +02:00
Ghostkeeper
8e3d6cf2b5
Repair x and y nozzle offsets
...
The setting name is different. This probably wasn't updated for a while.
Contributes to issue CURA-1278.
2016-05-20 13:34:47 +02:00
Ghostkeeper
7656f5a19b
Make definition of machine_extruder_drive_upgrade
...
This setting is specific to UMO, so I'm defining it in the UMO definition.
Contributes to issue CURA-1278.
2016-05-20 13:30:19 +02:00
Ghostkeeper
6fe70fc7e9
Add definition for machine_use_extruder_offset_to_offset_coords
...
While this was only used by Ultimaker printers, it is not specific to Ultimaker's printers so I'm putting the definition in FDMPrinter.
Contributes to issue CURA-1278.
2016-05-20 13:28:05 +02:00
Ghostkeeper
9dc70fba02
Add missing category-metadata
...
Forgot to add this, apparently.
Contributes to issue CURA-1278.
2016-05-20 12:42:18 +02:00
fieldOfView
570910187f
Fix typo in method name
...
CURA-1278
2016-05-19 16:27:51 +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
222d8ba828
Merge branch '2.1'
2016-05-18 12:46:07 +02:00
Ghostkeeper
14f860f8ae
Also change default raft fan speed for subsettings
...
Contributes to issues PL-162, PL-163, PL-164 and PL-165.
2016-05-18 12:39:39 +02:00
Ghostkeeper
cad6d87a0c
Change inheritance for initial layer z overlap
...
This makes the defaults more accurate. The overlap is a little bigger now.
Contributes to issues PL-162, PL-163, PL-164 and PL-165.
2016-05-18 12:36:22 +02:00
Ghostkeeper
fa81604b89
Set default raft fan speed to 0
...
This makes layer adhesion better.
Contributes to issues PL-162, PL-163, PL-164 and PL-165.
2016-05-18 12:34:10 +02:00
Ghostkeeper
afb7a45bb0
Translate ancient machine_nozzle_gantry_distance setting
...
It was changed to gantry_height long ago but not updated in these definitions.
Contributes to issue CURA-1278.
2016-05-18 11:48:43 +02:00
Ghostkeeper
a8fc830f2b
Translate ancient machine_head_shape settings
...
It has been machine_head_polygon for a while.
Contributes to issue CURA-1278.
2016-05-18 11:36:45 +02:00
Ghostkeeper
54c29187c9
Also use different speeds and coast volumes for UME+ variants
...
I've discussed this with Paul and he confirms that they should also be different for Extended just like not-Extended.
Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Ghostkeeper
1e1aec5746
Remove superfluous variants
...
These are now in the resources/variants folder in the translated form.
Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Ghostkeeper
dce4b71f63
Add variants for Ultimaker 2 Extended+
...
Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Ghostkeeper
25c9c95e10
Fix ID of Ultimaker 2 Extended+
...
It's no longer necessary to append '_base' to the ID of printers with variants.
Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Ghostkeeper
5ed881859d
Fix ID of Ultimaker 2+
...
It's no longer necessary to append '_base' to the ID of printers with variants.
Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Ghostkeeper
cbf3fe0ddf
Add variants for Ultimaker 2+
...
Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Jaime van Kessel
1578fdee98
Fixed minor errors in definitions
...
CURA-1278
2016-05-18 11:06:39 +02:00
Jaime van Kessel
8cab9afe66
Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework
2016-05-18 11:04:12 +02:00
Jaime van Kessel
dafff9159e
Added materials & qualities
...
CURA-1278
2016-05-18 11:03:44 +02:00
Ghostkeeper
4e3e466a11
Move platform offset to metadata
...
Also removed the setting from fdmprinter just to be clear.
Contributes to issue CURA-1278.
2016-05-18 10:34:28 +02:00
Ghostkeeper
64c15eb876
Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework
2016-05-18 10:28:29 +02:00
Ghostkeeper
07fea431c7
Translate definition for Uniqbot One
...
Contributes to issue CURA-1278.
2016-05-18 10:28:23 +02:00
Ghostkeeper
39907c23db
Translate definition for Ultimaker Original+
...
Contributes to issue CURA-1278.
2016-05-18 10:25:03 +02:00
Ghostkeeper
13726f1ec1
Use default_value instead of default
...
D'oh.
Contributes to issue CURA-1278.
2016-05-18 10:24:18 +02:00
Ghostkeeper
7714d6f720
Translate definition for Ultimaker Original
...
Contributes to issue CURA-1278.
2016-05-18 10:21:30 +02:00
Ghostkeeper
2b47fc738b
Translate definition for Ultimaker 2+
...
I've translated the inherit functions as values.
Contributes to issue CURA-1278.
2016-05-18 10:16:54 +02:00