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
Ghostkeeper
9f89678e42
Update when switching printers
...
I confused globalContainerChanged with activeStackChanged.
Contributes to issue CURA-4606.
2018-03-14 08:26:12 +01:00
Diego Prado Gesto
2bf6d071d1
Merge branch 'master' into feature_sync_button
2018-03-13 13:54:22 +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
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
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
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
Jack Ha
859ac88357
Merge branch 'master' into feature_enable_disable_extruder
2018-03-07 12:59:40 +01:00
Lipu Fei
6cae5c2e35
Remove unnecessary signal connection in MaterialsModel
...
CURA-5052
2018-03-07 10:39:23 +01:00
Jack Ha
32ce458516
CURA-4400 solved merge conflict
2018-03-06 17:05:39 +01:00
Lipu Fei
cb7677347d
Fix material model update upon variant change
...
CURA-5052
2018-03-06 15:27:05 +01:00
Lipu Fei
27b3a71a98
Sort branded materials for dropdown menu
...
CURA-4606
2018-03-06 11:26:16 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
Lipu Fei
d79a9f6449
Add logging for quality settings model
2018-03-05 10:35:54 +01:00
Lipu Fei
f86c2a2f8a
Add comments for quality settings model
2018-03-05 10:32:59 +01:00
Lipu Fei
2255dc628b
Remove unnecessary comments
2018-03-05 10:31:04 +01:00
Lipu Fei
b4deb3e828
Better logging in quality profile model
2018-03-05 10:23:36 +01:00
Lipu Fei
844a597e08
Fix materials models
2018-03-02 09:28:25 +01:00
Lipu Fei
59f31c9fe0
Add doc for quality settings model grouping
2018-03-01 16:29:56 +01:00
Lipu Fei
71e8478419
Rename to selected_position
2018-03-01 16:26:12 +01:00
Lipu Fei
afae550b5a
Store layer_height as float
2018-03-01 16:00:46 +01:00
Lipu Fei
e87077802f
Change to layer_height and layer_height_unit
2018-03-01 15:55:44 +01:00
Lipu Fei
b74e2553e7
Use more descriptive variable names
2018-03-01 15:47:52 +01:00
Lipu Fei
d1c518f6d7
Fix the usage of protected variables in quality models
2018-03-01 15:44:06 +01:00
Lipu Fei
06ec16d627
Rename quality drop down menu models
2018-03-01 15:37:48 +01:00
Lipu Fei
a395f93706
Add docs for quality models
2018-03-01 15:28:58 +01:00
Lipu Fei
52da140833
Add doc and copyright headers for MultiBuildPlateModel
2018-03-01 15:27:13 +01:00
Lipu Fei
c0604e5c75
Move MultiBuildPlateModel into Models folder
2018-03-01 15:25:11 +01:00
Lipu Fei
72b42113b3
Add doc for BrandMaterialsModel
2018-03-01 15:19:01 +01:00
Lipu Fei
d6f6dbe45e
Rename to available_material_dict
2018-03-01 15:12:34 +01:00
Lipu Fei
4b7c8a8a80
Add doc for BaseMaterialsModel
2018-03-01 15:09:58 +01:00
Lipu Fei
b4c3536999
Move getAvailableMaterials() into MaterialManager
2018-03-01 15:02:57 +01:00
Jack Ha
ac76d6ea52
Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder
2018-03-01 13:14:10 +01:00
