Commit graph

1712 commits

Author SHA1 Message Date
ChrisTerBeke
aaf0f69820 Fix some more relative imports 2018-11-26 15:10:36 +01:00
ChrisTerBeke
42ccabc7b6 Fix relative imports for plugin 2018-11-26 15:09:56 +01:00
ChrisTerBeke
39f92ced90 Comment out test 2018-11-26 15:02:52 +01:00
ChrisTerBeke
269d596f5d Fix typing for cluster list 2018-11-26 14:54:24 +01:00
ChrisTerBeke
856276d8b7 Cleanup plugin imports 2018-11-26 14:53:08 +01:00
ChrisTerBeke
6a43d10982 Use BaseModel for CloudCluster, some fixes 2018-11-26 14:51:24 +01:00
ChrisTerBeke
7654f1c71c Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-26 14:30:50 +01:00
Marijn Deé
a382b77eaa Added validation to the models 2018-11-26 14:30:17 +01:00
ChrisTerBeke
89e88a73bb Temporary patch for when printer has one or more materials not installed 2018-11-26 14:11:20 +01:00
ChrisTerBeke
45159f7a80 Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-26 14:09:13 +01:00
ChrisTerBeke
68a90ec510 Use simple models instead of namedtuples
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
2018-11-26 14:08:21 +01:00
ChrisTerBeke
014b1d6e4e test 2018-11-26 13:45:37 +01:00
Mark
8bae9fa667 Merge branch 'master' into ui_rework_4_0 2018-11-26 13:41:25 +01:00
ChrisTerBeke
21c81603b4 Use application singleton instead of locally cached application 2018-11-26 13:33:14 +01:00
Marijn Deé
908628e2aa Added a model to represent a cluster 2018-11-26 10:47:53 +01:00
Marijn Deé
d8232caec0 Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-26 10:14:34 +01:00
Aleksei S
2b45262a85 Added test for definition container
CURA-5977
2018-11-23 17:01:05 +01:00
ChrisTerBeke
1adf1096a3 Merge branch 'master' into cloud-output-device 2018-11-23 14:17:26 +01:00
ChrisTerBeke
cf27a211df Remove unused TYPE_CHECKING import 2018-11-23 14:15:40 +01:00
ChrisTerBeke
ef5ca6f5a9 Remove unused typing import 2018-11-23 14:15:21 +01:00
ChrisTerBeke
3e100775df Fix instantiating CloudOutputDeviceManager 2018-11-23 14:14:35 +01:00
ChrisTerBeke
8ee39c0489 Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-23 14:08:55 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
Marijn Deé
76542a82d5 Removed the asserts on internals 2018-11-23 10:33:57 +01:00
Ian Paschal
9f1ce72b9e Add Cura 4.0 printer cards
Contributes to CL-1150
2018-11-23 10:03:08 +01:00
Marijn Deé
294527f7fe Review changes 2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de Used duoble quotes iso single quotes 2018-11-23 09:20:19 +01:00
Diego Prado Gesto
81c776213a Merge branch 'master' into ui_rework_4_0 2018-11-22 16:11:06 +01:00
Ian Paschal
963b8aa974 Fix QML warnings
Contributes to CL-1148
2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations
Contributes to CL-1148
2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop
Contributes to CL-1148
2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else"
Contributes to CL-1148
2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state
Contributes to CL-1148
2018-11-22 13:11:59 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link
Contributes to CL-1148
2018-11-22 11:09:35 +01:00
Marijn Deé
352427e460 Moved exception handling closer to the cause of error 2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091 Moved some of the mocks to class level because they are used in every test method 2018-11-22 09:37:47 +01:00
Marijn Deé
7b0f8882a2 Reverted models to namedtuples from collections because
NamedTuple is a Python3.6 feature
2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints 2018-11-21 10:12:53 +01:00
ChrisTerBeke
c7bb6931f4
Refactor networked output device
All networking related stuff is moved to a separate class called NetworkClient for reusability.
As example it is now also used in the WIP CloudOutputDeviceManager to clean up network calling there.
2018-11-20 23:44:28 +01:00
ChrisTerBeke
ff2d8b9076
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
* tests-for-um3networkplugin:
  Fixed the failing tests
  Made the tests work with the named tuples Tests only use the _onGetRemoteMaterial
  Fixed some bugs and added the color_code field to the named tuple
2018-11-20 18:57:42 +01:00
Marijn Deé
f3338aa187 Fixed the failing tests 2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292 Made the tests work with the named tuples
Tests only use the _onGetRemoteMaterial
2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f Fixed some bugs and added the color_code field to the named tuple 2018-11-20 16:33:52 +01:00
Ian Paschal
2f84339f5c Finalize queue
Contributes to CL-1148
2018-11-20 15:58:09 +01:00
Ian Paschal
fb3cb67da0 Add printer configuration components
Contributes to CL-1148
2018-11-20 13:46:41 +01:00
Diego Prado Gesto
fab0d5a4b7 Rename the color of the sidebar to main_background, since it was deleted
but not updated in the usages.

Contributes to CURA-5785.
2018-11-20 13:25:15 +01:00
ChrisTerBeke
04cc6193d6
More implementation for getting remote clusters, add some TODOs 2018-11-19 23:25:54 +01:00
ChrisTerBeke
ca1c5fb48c
Add some documentation 2018-11-19 22:30:17 +01:00
ChrisTerBeke
10576d1242
Some scaffolding and implementation for cloud output device manager 2018-11-19 22:24:35 +01:00
ChrisTerBeke
228325eb89
Add CloudOutputDeviceManager, test implementation 2018-11-19 21:59:57 +01:00