Aleksei S
2240c38fd7
Exclude HIPS and PETG material for UM
...
CURA-5149
2018-03-26 17:11:38 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None
...
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.
Contributes to issue CURA-5045.
2018-03-26 15:48:03 +02:00
Jack Ha
38e15f009f
CURA-5149 add possibility to exclude specific items from materials list
2018-03-26 15:20:31 +02:00
Jack Ha
2a39d81a3c
Revert "Filter generic list for Ultimaker printers."
...
This reverts commit 767789d394
.
2018-03-26 15:07:37 +02:00
Jack Ha
18e3e084a5
Revert "Check for Ultimaker printers based on manufacturer"
...
This reverts commit 5b36b4fb84
.
2018-03-26 15:07:35 +02:00
Jack Ha
07ac09e878
Revert "Use set for searching"
...
This reverts commit 80c2b3b7e8
.
2018-03-26 15:07:27 +02:00
Lipu Fei
80c2b3b7e8
Use set for searching
...
CURA-5149
2018-03-26 14:40:25 +02:00
Lipu Fei
5b36b4fb84
Check for Ultimaker printers based on manufacturer
...
CURA-5149
2018-03-26 14:40:25 +02:00
Aleksei S
767789d394
Filter generic list for Ultimaker printers.
...
CURA-5149
2018-03-26 13:51:37 +02:00
Lipu Fei
f0dc138b37
Fix visibilty preset update
...
CURA-5088
2018-03-19 14:14:22 +01:00
Lipu Fei
d676b85289
Fix createMaterial() for non-2.85 diameter materials
...
CURA-5113
2018-03-19 11:09:07 +01:00
Lipu Fei
43ac565c20
Fix visibility preset initialization
...
CURA-5088
2018-03-16 15:45:17 +01:00
Lipu Fei
5ca4203940
Remove material types that have no fallbacks from fallback_materials_map
...
CURA-5098
2018-03-16 15:12:54 +01:00
Lipu Fei
8e39849aad
Refactor setting visibility preset
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2
Change SettingVisibilityPresetsModel to non-singleton
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4
Move SettingVisibilityPresetsModel to Machines.Models
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
496c8f2f79
Cleanup MachineManagementModel
2018-03-15 10:44:02 +01:00
Jack Ha
98b0559c9a
Merge branch 'master' into speedup
2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d
CURA-5090 speedups by using qtimers on updating mostly visual elements
2018-03-14 16:09:59 +01:00
Lipu Fei
241611546e
Fix quality details view
...
CURA-5054
2018-03-14 14:41:44 +01:00
Lipu Fei
22573a685d
Fix quality definition comparison in quality importing
...
CURA-4946
2018-03-14 14:31:30 +01:00
Lipu Fei
3cefacdfcc
Remove root_material_nod is None check in MaterialManager
...
CURA-5056
This will no longer happen.
2018-03-14 09:28:35 +01:00
Ghostkeeper
9f89678e42
Update when switching printers
...
I confused globalContainerChanged with activeStackChanged.
Contributes to issue CURA-4606.
2018-03-14 08:26:12 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
...
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Lipu Fei
c8a882849f
Simplify task queue for machine error check
...
CURA-5059
2018-03-13 16:08:46 +01:00
Jack Ha
9e0a78929a
CURA-5059 changed error check timer interval and added measured time in logging
2018-03-13 16:02:57 +01:00
Diego Prado Gesto
2bf6d071d1
Merge branch 'master' into feature_sync_button
2018-03-13 13:54:22 +01:00
Lipu Fei
934d297e6c
Split error checking into smaller sub-tasks
...
CURA-5059
Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
2018-03-13 13:21:44 +01:00
Diego Prado Gesto
fa2b5f141c
CURA-4870 Remove dinamic connections to the signals in the machine
...
model. The model is still updated when the container changed.
2018-03-13 10:35:48 +01:00
Ghostkeeper
1db8c967f2
More specific exception catching
...
So that we can still find programming errors in this code.
Contributes to issue CURA-4606.
2018-03-12 17:10:17 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int
...
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.
Contributes to issue CURA-4606.
2018-03-12 17:08:13 +01:00
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
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
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
81d036d5e4
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 15:15:27 +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
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
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
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
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