3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
17030 commits 340 branches 299 tags 734 MiB
Commit graph

4475 commits

Author SHA1 Message Date
Ian Paschal
8db4396ee7
Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder 
CURA-4400 Feature enable disable extruder
 2018-03-12 16:42:25 +01:00
Diego Prado Gesto
39a7f5a53d CURA-4870 Update the configuration also when the type or the buildplate 
changed signal is emitted.
 2018-03-12 16:37:35 +01:00
Ghostkeeper
f08407cf97
Document Available role 
Contributes to issue CURA-4606.
 2018-03-12 16:32:10 +01:00
Ghostkeeper
5afcf2beac
Don't update brand and generic materials models upon switching active extruder 
Because the list of materials can't change by that action.

Contributes to issue CURA-4606.
 2018-03-12 16:28:41 +01:00
Ghostkeeper
0078340175
Only update NozzleModel when machine changes 
The available nozzles only change upon changing machines.

Contributes to issue CURA-4606.
 2018-03-12 16:19:47 +01:00
Lipu Fei
1f08accbec Fix profile importing for version upgrade 
CURA-4946
 2018-03-12 16:15:16 +01:00
Ghostkeeper
1512a8096b
Require MaterialGroup to always have a base material 
The material group is loaded lazily whenever the base material is not yet in the dictionary.

Contributes to issue CURA-4606.
 2018-03-12 15:43:42 +01:00
Lipu Fei
220e4a64c6 Fix VariantManager.getVariant() and simplify NozzleModel 
CURA-4606
 2018-03-12 15:25:29 +01:00
Jack Ha
c4fb15a569 CURA-4400 resolve merge conflict 2018-03-12 15:18:35 +01:00
Jack Ha
81d036d5e4 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 15:15:27 +01:00
Diego Prado Gesto
da54c93fda CURA-4870 Remove commented code 2018-03-12 15:12:27 +01:00
Diego Prado Gesto
55c3f06e73 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-12 15:10:43 +01:00
Diego Prado Gesto
809db6a4d9 CURA-5078 Remove material warning if the mismatch was the buildplate. 2018-03-12 15:09:56 +01:00
Ghostkeeper
bb7fccbd48
Add logging for every setting model update 
You can clearly see that some models are updated 4 times or so now.

Contributes to issue CURA-4606.
 2018-03-12 14:48:56 +01:00
Jack Ha
d889795721 CURA-4400 correctly cope with quality changes that conflict with the current enabled extruders 2018-03-12 14:15:49 +01:00
Jack Ha
aa3cd8ba9d Solved merge conflict 2018-03-12 11:39:39 +01:00
Jack Ha
a3d6127dcb CURA-4400 removed unnecessary correctExtruderSettings 2018-03-12 11:33:54 +01:00
Lipu Fei
2c5cc17b49 Fix build plate compatibility check 
CURA-5078
 2018-03-12 10:34:18 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Lipu Fei
e09325bf82 Fix project loading for version upgrade 
CURA-5054
 2018-03-09 17:16:27 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
e62ed62bdd Remove duplicate import 2018-03-09 16:57:09 +01:00
Diego Prado Gesto
87380e007c CURA-4870 Switch the hidden metadata entry also when switching printes 
so the active printer is correctly shown in the machines page.
 2018-03-09 16:44:46 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
Lipu Fei
a81981a27a Better info on no profiles to import for gcode 
CIRA-4946

If a gcode is sliced with default profiles, there won't be any custom
profiles to import from that gcode. In that case, we show a info message
telling the user about this instead of showing an error message.
 2018-03-09 16:40:57 +01:00
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the 
printers grouped by local or networked.
 2018-03-09 16:35:23 +01:00
Lipu Fei
c41af83b41 Fix create quality changes for extruders 
CURA-5054
 2018-03-09 16:29:49 +01:00
Ghostkeeper
d8a066c1e7
Increment instance container version number instead of just quality_changes 
Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.

Contributes to issue CURA-5054.
 2018-03-09 16:14:24 +01:00
Ghostkeeper
3a832d66a9
Safer check for extruder vs. global 
Because it might be an empty string.

Contributes to issue CURA-5054.
 2018-03-09 16:07:54 +01:00
Ghostkeeper
b797ac1a15
Read only position from metadata 
We now determine whether this is a global or an extruder profile based on whether the position metadata field is present, instead of whether the extruder metadata field is present.

Contributes to issue CURA-5054.
 2018-03-09 16:07:06 +01:00
Ghostkeeper
5d2e98cdd4
Translate to American English 
The spelling in AmE is with a Z.
 2018-03-09 15:55:27 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Ghostkeeper
71afbba789
Merge branch '3.2' 2018-03-09 15:36:51 +01:00
Ghostkeeper
5caa92cf7a
Update current version for quality changes 
We now need to upgrade up to version 3000004.

Contributes to issue CURA-5054.
 2018-03-09 15:21:45 +01:00
Lipu Fei
de72dd3455 Fix material update upon gcode flavour change 
CURA-5060
 2018-03-09 14:26:53 +01:00
Diego Prado Gesto
ebbb30a5be CURA-4870 Replace network key and connect group name metadata values 
when the connection changes.
 2018-03-09 13:37:15 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network 
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
 2018-03-09 12:42:49 +01:00
Ghostkeeper
d8853b8a98
Sort profile models case-insensitively 
Cast every sorting key to uppercase before doing this. Don't cast to lowercase or there will be problems with characters that don't have lowercase and with Turkish dotted i vs. undotted i.

Fixes #3460.
 2018-03-09 11:40:33 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML 
CURA-5063
 2018-03-09 11:00:39 +01:00
Diego Prado Gesto
4be4d08d97 CURA-4870 Add the ability in Cura to switch between different types of 
printers. Create a new container stack if it doesn't exist with the same
network connection key.
 2018-03-09 10:47:08 +01:00
Lipu Fei
ef8cd304dc No keep/discard setting dialog in project loading 
CURA-4966
 2018-03-08 20:00:21 +01:00
Lipu Fei
6aefb2215d Fix _setQualityChangesGroup() 
CURA-4966
 2018-03-08 19:50:45 +01:00
Lipu Fei
d1beae4603 Better logging for checkIsValidProjectFile() 
CURA-4966
 2018-03-08 19:50:22 +01:00
Diego Prado Gesto
b212781a19 Merge branch 'master' into feature_sync_button 2018-03-08 16:57:21 +01:00
Diego Prado Gesto
fa5aa0a53f CURA-4870 React to outputdeviceschanged signal, to update the list of 
the configurations.
 2018-03-08 16:55:40 +01:00
Jack Ha
0d61b6652c CURA-4400 merge two if statements in 1 2018-03-08 15:38:32 +01:00
Diego Prado Gesto
591d3f29ec CURA-4870 Don't crash when there is not buildplate variant for the 
current machine
 2018-03-08 15:36:12 +01:00
Jack Ha
138f77179d CURA-4400 fix errors when switch or adding to new machine 2018-03-08 14:31:55 +01:00
Jack Ha
f576b1f117 CURA-4400 fix crash when switching from disabled 1st extruder to single extruder machine 2018-03-08 14:28:57 +01:00