73 Commits

Author SHA1 Message Date
Ghostkeeper
932eefeb0e Correct data type for extruder number setting
This caused a crash. Stupid mistake.
2016-05-30 17:05: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
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
Tim Kuipers
aa2d09aa08 JSON lil fix: superflious comma (CURA-1616) 2016-05-27 12:44:49 +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
Jaime van Kessel
808f117785 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura 2016-05-25 15:44:08 +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
2683907121 Show Ultimaker Original and Ultimaker Original + in Add Machine wizard
CURA-1278
2016-05-25 13:57:16 +02:00
Arjen Hiemstra
24210246ee Add preferred variant, material and quality to UM2+ definition 2016-05-25 11:31:19 +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
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
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
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
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
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
Ghostkeeper
d0c9b96416
Translate definition for Ultimaker 2 Go
Contributes to issue CURA-1278.
2016-05-18 09:57:25 +02:00
Ghostkeeper
4947dfffb8
Translate definition for Ultimaker 2 Extended+
It remains to be seen what we do with the variants of this machine and consequently the visibility of this machine.

Contributes to issue CURA-1278.
2016-05-18 09:52:54 +02:00
Ghostkeeper
a7f93b2a92
Add category to metadata
Also forgot that. Good morning, Ghost.

Contributes to issue CURA-1278.
2016-05-18 09:50:04 +02:00
Ghostkeeper
34632a762a
Use default_value instead of default
Forgot this again. Good morning Ghostkeeper.

Contributes to issue CURA-1278.
2016-05-18 09:48:44 +02:00
Ghostkeeper
b635b07569
Translate definition for Ultimaker 2 Extended
Contributes to issue CURA-1278.
2016-05-18 09:47:15 +02:00
Jaime van Kessel
51e57b1f91 Added visibility meta data
CURA-1278
2016-05-18 09:44:53 +02:00
Jaime van Kessel
43d42405b2 Updated property names to new API
CURA-1278
2016-05-18 09:39:04 +02:00
Jaime van Kessel
a187747bdc prusa_i3_xl now inherits correct base file
CURA-1278
2016-05-18 09:35:05 +02:00
Arjen Hiemstra
9bfb98e75f Make ultimaker2 definition visible in the add machine dialog 2016-05-17 18:38:06 +02:00
Ghostkeeper
de7fe1185e Translate definition for Ultimaker2
The extruder trains setting has been moved to dual_extrusion_printer.json. It must be merged into fdmprinter later.

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
f15445b1a3 Translate definition for Ultimaker
The preferred variant/profile/material has moved to the metadata.

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
eb11067d15 Translate definition for RigidBotBig
Also translated the very old active_if properties!

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
35dda003c7 Translate definition for RigidBot
Also translated the very old active_if properties!

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
319eef1384 Translate definition for Prusa i3 XL
Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
28703981d5 Translate definition for Prusa i3
Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
da03eab355 Use default value rather than 'default'
Default is outdated.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
e13878b343 Translate definition for 3DMaker Starter
Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
45382dc088 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
0298e3adca Use default value instead of value
Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
9aaa81be50 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
dc82a90047 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00