Commit graph

55 commits

Author SHA1 Message Date
Tim Kuipers
911f80f237 JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting 2016-06-29 14:52:39 +02:00
Ghostkeeper
ac0f743855
Clarify descriptions of jerk settings
This description was established after discussion with several mechanics guys as well as BagelOrb, FieldOfView and RobinMDH.
2016-06-28 17:28:44 +02:00
Jaime van Kessel
1543e4a6e0 Merge branch 'feature_zhop_over_other_material' of github.com:Ultimaker/Cura 2016-06-28 11:34:25 +02:00
Thomas Karl Pietrowski
fa36197574 CURA-1284: Changing icon for experimental category
Needs an icon in resources/themes/cura/icons
2016-06-27 23:21:07 +02:00
Tim Kuipers
4eaf09e982 JSON fix: the height of the extruder switch z hop is now equal to the zhop height (CURA-1506 CURA-1061)
making the height configurable is quite difficult with how retraction currently works and there is not a lot of added value
2016-06-24 15:25:18 +02:00
Tim Kuipers
ccd97f1994 JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061) 2016-06-24 13:29:40 +02:00
Tim Kuipers
b22d65c369 Merge branch 'master' into feature_zhop_over_other_material 2016-06-22 13:25:50 +02:00
Ghostkeeper
63edd6f74d
Improve default raft settings
Results from materials testing.
2016-06-21 12:57:33 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
2016-06-20 12:00:56 +02:00
Tim Kuipers
0f92f78916 JSON fix: z hop inheritance functions and default value (CURA-1506) 2016-06-17 17:26:23 +02:00
Tim Kuipers
611c88c630 JSON fix: lil indent (CURA-1506) 2016-06-17 16:52:04 +02:00
Tim Kuipers
94dcacb27e JSON feat: Z Hop only over printed parts and Z Hop Enable (CURA-1506) 2016-06-17 16:51:37 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
fieldOfView
33c4e86163 Change abbreviation of "seconds" to IEEE-recommended "s" (instead of "sec") 2016-06-13 16:14:16 +02:00
fieldOfView
18e69c7580 Add missing "enabled" functions for support_extruder_nr children
CURA-1278
2016-06-13 13:09:52 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Tim Kuipers
795291a117 fix/feat: introduced and fixed inheritance for all acceleration and jerk settings (CURA-1443) 2016-06-10 13:32:57 +02:00
Tim Kuipers
b2d57207a4 fix: global_only ==> settable_per_X for acceleration and jerk settings (CURA-1560 CURA-1443) 2016-06-10 13:20:55 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
Tim Kuipers
b0198aedb0 JSON fix: line_width didn't supply any settable_per info (CURA-1558) 2016-06-09 17:27:20 +02:00
Tim Kuipers
959305ddf7 JSOn fix: removed buggy default:true for numeric values (CURA-1558) 2016-06-09 17:26:43 +02:00
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
Ghostkeeper
1149a96d70
Fix spelling 2016-06-09 10:45:48 +02:00
Tim Kuipers
8a7e549a27 Merge fix of 2.1
Max Retraction count 45 ==> 90 wasn't taken along
2016-06-08 15:40:15 +02:00
Tim Kuipers
061cbfe46b JSON fix: make base of raft with thicker lines than nozzle size (CURA-695) 2016-06-08 14:20:06 +02:00
Tim Kuipers
482bc21a9f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 13:49:37 +02:00
Tim Kuipers
e53a961ba7 JSON fix: topbottom thickness had max value for no apparent reason (CURA-1352) 2016-06-08 13:49:27 +02:00
Tim Kuipers
3e10335e03 JSON fix typo: missing dot 2016-06-08 13:28:37 +02:00
Tim Kuipers
61b674b74e JSON fix: removed sentences from jerk settings which were only applicable for speed. (CURA-1443) 2016-06-08 13:28:11 +02:00
Tim Kuipers
472477eee2 JSON fix type: effect ==> affect (CURA-1443) 2016-06-08 13:27:06 +02:00
Tim Kuipers
0dcf13a243 JSON fix typo: ar ==> or (CURA-1443) 2016-06-08 13:26:24 +02:00
Tim Kuipers
6cca612d7d JSON rename: Raft Interface ==> Raft Middle ; Raft Surface ==> Raft Top (CURA-1443) 2016-06-08 12:30:29 +02:00
Tim Kuipers
2b3efe4329 JSON fix: type boolean should be bool (CURA-1443) 2016-06-08 12:23:54 +02:00
Tim Kuipers
56b00ad425 JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560)
removed:settable_globally: true
settable_per_meshgroup: true
settable_per_extruder: true when settable_per_mesh was also true
2016-06-08 11:54:25 +02:00
Tim Kuipers
406baf49af JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally (CURA-1558) 2016-06-07 18:25:03 +02:00
fieldOfView
e33eb52e93 Hide Support Extruder in advanced mode when support is disabled
CURA-1663
2016-06-07 17:32:28 +02:00
Ghostkeeper
1a30dd96b1
Change setting type for extruder_nr settings
This way it can determine the difference between an integer and an index in the extruder list.

Contributes to issues CURA-1278.
2016-06-02 16:09:10 +02:00
fieldOfView
ed3d01ed7b Add icon to Machine category to squelch some warnings
CURA-1278
2016-06-02 06:38:57 +02:00
Tim Kuipers
3953da7a50 JSON fix: support roof speed was visible when roof enabled but support not (CURA-1498) 2016-05-31 18:13:47 +02:00
Ghostkeeper
932eefeb0e Correct data type for extruder number setting
This caused a crash. Stupid mistake.
2016-05-30 17:05:15 +02:00
Tim Kuipers
b8df3825f6 JSON fix: remove visible property (and add visibility defaults (CURA-1443)
for acceleration and jerk settings
2016-05-30 14:54:33 +02:00
Tim Kuipers
6b5e72de72 JSON refactor: inherit_function ==> default for acceleration and jerk (CURA-1443) 2016-05-30 14:42:01 +02:00
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
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
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
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
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