Commit graph

340 commits

Author SHA1 Message Date
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Jaime van Kessel
8518aba3a5 Adds tests for QualityManager 2019-03-15 14:51:35 +01:00
Jaime van Kessel
1138baa26f Added extra tests for materialManager 2019-03-15 13:57:22 +01:00
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
f7f5123fea WIP: Fix highlighting of selected network printer 2019-03-13 11:03:23 +01:00
Lipu Fei
60f6d881a3 WIP: Fixes and add cloud logic to cloud welcome page 2019-03-13 10:37:41 +01:00
Lipu Fei
0c94ded93d WIP: Refactor and fix network printer list 2019-03-11 14:57:02 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
2019-03-01 10:53:55 +01:00
Lipu Fei
7291026bec Fix material container removal
CURA-6237
2019-02-22 15:13:53 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating.
This allows the QMl to stop the updating when it's not even visible
2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating.
This allows the QMl to stop the updating when it's not even visible
2019-02-21 20:47:38 +01:00
Jaime van Kessel
7754b8a447 Only instantiate setting menus when it's visible
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
2019-02-21 20:20:01 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
fc11286c6c Also ensure that the QualtiyProfilesModel is on a changeTimer on create 2019-02-21 18:38:51 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Jaime van Kessel
b61bf3df4d Only emit signal if the properties actually changed 2019-02-19 17:46:29 +01:00
Jaime van Kessel
22b70e1a34 Ignore sceneChange signals if the camera triggered them in some places
These places weren't interested in all changes. They can probably be more
strict, but the camera is a really safe bet (and already greatly decreases
the number of updates, especially when just moving the camera)
2019-02-19 17:06:48 +01:00
Ghostkeeper
6e883c0431
Use default parameter of getMetaDataEntry
We don't need to do that manually.
2019-02-14 13:33:01 +01:00
Jaime van Kessel
5600d5407c Add default if group_name is not set.
Otherwise we get a crash.

CURA-6153
2019-02-01 12:02:59 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Jaime van Kessel
d928e0979d Handle attempting to remove a favorite material that was already removed 2019-01-09 12:54:33 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Jaime van Kessel
f627560751 Add timer to QualityProfilesDropdownMenuModel to prevent unneeded updates
It's the same old trick we've pulled off quite often, so this should be pretty safe
2018-12-21 17:12:07 +01:00
Jaime van Kessel
dc473dc78d Add missing typing for setting visibility preset model 2018-12-20 11:09:02 +01:00
Lipu Fei
d93e19d530 Add getAllMaterialGroups()
CURA-6035
2018-12-20 10:45:05 +01:00
Ghostkeeper
66ed9ed201
Remove optimisation that broke updates of models upon metadata change
If the metadata changed, such as whether a material was favourite or not, then the materials models were not updating any more because the actual list of available materials was still the same.
I've removed this optimisation and tested performance locally. It seems to be slightly slower (though that might be placebo or measurement error). However most of the performance boost of cura-6016 was resulting from different changes there so the interface still seems to be quite a lot faster than what it used to be.

Contributes to issue CURA-6032.
2018-12-18 16:52:04 +01:00
Ghostkeeper
1b11164340
Remove unused import and add documentation 2018-12-18 16:09:19 +01:00
Lipu Fei
a02bccf74d Fix NozzleModel to work with new ListModel data update
CURA-6015

ListModels should not modify items directly. All ListModels should use
setItems() and the insertions/removals/modifications will be done in
setItems() itself.
2018-12-14 13:00:06 +01:00
Remco Burema
b413b4cdb6 Correct a typo in typing. [CURA-6016] 2018-12-11 17:21:14 +01:00
Jaime van Kessel
f67ac8d7c4 Update far less agressively for the material models
CURA-6016
2018-12-11 10:59:17 +01:00
Jaime van Kessel
d495ec18bb Filter a bit more intelligently on when to check for errors
CURA-6016
2018-12-10 15:28:20 +01:00
Jaime van Kessel
0baa4d20b3 Gracefully handle the case where machine definition is no in the map 2018-11-28 11:42:54 +01:00
Lipu Fei
2c8ed99281 Add is_experimental to Qt models and QMLs
CURA-5879
2018-11-27 15:50:03 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
2018-11-12 12:48:49 +01:00
Diego Prado Gesto
3ab8568a87
Merge pull request #4679 from fieldOfView/fix_create_new_material
Use preferred material instead of generic PLA when creating a new material
2018-11-08 17:16:36 +01:00
Lipu Fei
9c9e81b30c Move InstanceContainer import into type checking closure
CURA-5898
2018-11-06 11:04:18 +01:00
Jaime van Kessel
93467dc29f Ensure that weeding out the duplicates doesn't mess up the order
CURA-5898
2018-11-05 17:33:12 +01:00
Jaime van Kessel
412e5977a6 Fix type issues 2018-11-05 11:30:02 +01:00
Jaime van Kessel
eded0f0297 Make quality manager also include profiles with same GUID in fallback.
This ensures that if a (duplicated) material does not have a generic variant, that
the material it was copied from will be added to the fallback list.

CURA-5898
2018-11-05 11:17:39 +01:00
Jaime van Kessel
90726ecbff Fix situation where the setting visibility model could cause a crash.
Yay for crash logging
2018-11-01 15:28:08 +01:00
fieldOfView
7899b249fc Use preferred material instead of generic PLA when creating a new material 2018-10-28 12:12:14 +01:00