Commit graph

2372 commits

Author SHA1 Message Date
Lipu Fei
54363bad02 WIP: Refactor NozzleMenu.qml 2018-02-16 14:20:03 +01:00
Lipu Fei
cd53ae0639 WIP: Refactor ProfileMenu.qml 2018-02-16 14:20:03 +01:00
Lipu Fei
8f8de0454f WIP: Cleanup the current MachineManager 2018-02-16 14:20:03 +01:00
Jack Ha
e65adc7258 WIP: New setMaterial/Variant/Quality in MachineManager 2018-02-16 14:20:03 +01:00
Lipu Fei
8ac9811b41 WIP: Create QualityManager 2018-02-16 14:20:02 +01:00
Lipu Fei
f0d9fba2f5 WIP: Create MaterialManager 2018-02-16 14:20:02 +01:00
Lipu Fei
55bdc0c853 WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
Diego Prado Gesto
744313af27 CURA-4946 Add the quality_definition metadata entry to the gcode so when
parsing, the quality definition is taken into account instead of the
definition.
The message when importing a profile to a different machine,
now shows the expected machine and the current machine definition id.!!
2018-02-16 14:01:46 +01:00
Diego Prado Gesto
85059882fe CURA-4959 Add buildplate information to the summary when saving a
project file.
- The activeVariantNames now returns only the names of the variants in
the extruder stacks.
2018-02-16 11:01:02 +01:00
Diego Prado Gesto
735dac6a4a Modify debug message to show the correct/useful information 2018-02-16 09:15:06 +01:00
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
fieldOfView
4c1002bf47 Move setting visibility resource type from Uranium to Cura 2018-02-09 09:31:13 +01:00
fieldOfView
f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets
This is closer to the current Cura intend
2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb Move setting visibility presets into a model
Handling of "Custom" is still under consideration
2018-02-08 23:07:45 +01:00
Jaime van Kessel
b36d3c759f Codestyle & typing fixes 2018-02-08 11:40:23 +01:00
Jaime van Kessel
22e0c80b3d Removed unneeded extra error check
This caused an extra 1.5 second delay on changing machine configurations for dual extrusion machines.
2018-02-08 10:27:54 +01:00
Lipu Fei
ffa4df6a06 Merge 3.2 into master 2018-02-07 13:20:24 +01:00
Jack Ha
3a88c1ee88 CURA-4923 fix handle setting function in material_diameter 2018-02-07 11:27:02 +01:00
Jack Ha
98f925d50c CURA-4924 now creating the extruder container with metadata extruder 2018-02-07 10:00:02 +01:00
Jack Ha
cb6b465ce7 CURA-4924 fix loading profiles with % in it 2018-02-07 09:55:22 +01:00
Lipu Fei
25713a6e64 Merge remote-tracking branch 'origin/3.2' 2018-02-01 11:23:20 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
alekseisasin
e5c72cfdc5 Validate material profile
CURA-4851
2018-01-31 14:58:44 +01:00
Lipu Fei
3927c70625 Fix material_diameter handling in ExtruderStacks
CURA-4898
2018-01-31 13:32:45 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Diego Prado Gesto
4cf07f5fe6 CURA-4868 Fix typo 2018-01-30 17:23:55 +01:00
Lipu Fei
759e596eb6 Fix add extruder function
CURA-4868
2018-01-30 12:19:16 +01:00
Lipu Fei
f1363fab73 Move newline format
CURA-4863
2018-01-29 16:33:52 +01:00
Lipu Fei
924f3972fd Create quality_changes for extruder stack if missing in profile importing
CURA-4868
2018-01-29 14:50:08 +01:00
Lipu Fei
34e6816f83 Fix container ID modification in profile importing
CURA-4868
2018-01-29 14:50:07 +01:00
Lipu Fei
507b967946 Minor fixes
CURA-4868
2018-01-29 14:50:07 +01:00
Lipu Fei
7dfc1a4aa7 Add encoding='utf-8' for text file reading
CURA-4875

When encoding is not provided, the behaviour is system dependent and it
can break on OS X.
2018-01-29 12:29:20 +01:00
Ghostkeeper
650ca4e5e8
Merge branch '3.2' 2018-01-29 10:25:29 +01:00
Lipu Fei
4a9fc4b7d4 Set imported containers to bedirty so they will get saved
CURA-4875
2018-01-26 14:17:18 +01:00
Diego Prado Gesto
38f1ad5db9 Merge branch '3.2' 2018-01-25 17:10:17 +01:00
Diego Prado Gesto
e38cf957bb CURA-4839 Avoid creating unique names for the extruder instance
containers if the strategy is upgrade existing
2018-01-24 16:04:11 +01:00
Jack Ha
994969634e Merge branch '3.2' 2018-01-23 16:17:50 +01:00
Jack Ha
def86defe6 CURA-4848 Global stack now does its infinite resolve prevention on per thread basis 2018-01-23 16:17:38 +01:00
Jack Ha
cde3799702 CURA-4848 removing the debugging list because it's not a threading issue 2018-01-23 14:46:44 +01:00
Jack Ha
b0d0b75662 Merge branch '3.2' 2018-01-23 14:25:11 +01:00
Jack Ha
07e6875199 CURA-4848 added logging for when the crash occurs 2018-01-23 14:24:00 +01:00
Lipu Fei
b14fdb1d0d Merge remote-tracking branch 'origin/3.2' 2018-01-23 11:20:49 +01:00
Lipu Fei
1c605a5108 Fix different strategies for machine and quality in project loading
CURA-4839
2018-01-23 10:58:43 +01:00
Jack Ha
92e99012d3 CURA-4785 now actually checking for extruder position, improved logs 2018-01-23 09:33:52 +01:00
Jack Ha
dc119d74bd CURA-4785 added logging for measuring time for validation check 2018-01-23 09:21:38 +01:00
ChrisTerBeke
2eef282b40 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-22 17:18:19 +01:00
ChrisTerBeke
129f9cc16c Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835 2018-01-22 17:18:09 +01:00
Jack Ha
204af1b6ed CURA-4785 fix slow cura for Custom FDM printer: now it's not checking for errors in unused extruders 2018-01-22 16:17:37 +01:00
ChrisTerBeke
e17fbb0db2 Remove copying 1st extruder value to all extruders as that breaks re-loading from files 2018-01-22 16:05:43 +01:00
Ghostkeeper
ec0fca30a4
Merge branch '3.2' 2018-01-22 12:48:54 +01:00