Commit graph

45 commits

Author SHA1 Message Date
Jaime van Kessel
36a86adc0f Remove spammy log 2018-11-30 16:08:19 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile
CL-1150 restyle monitor printer tile
2018-11-28 11:31:11 +01:00
Ian Paschal
370fa0fd14 Remove old sidebar
Contributes to CL-1150
2018-11-28 10:46:22 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
ChrisTerBeke
efd5f3799b Also catch TypeError now that we have explicit arguments 2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece Fix typing syntax 2018-11-26 16:19:01 +01:00
ChrisTerBeke
e4d8fb36ab Add more typing as per request from @sedwards2009 2018-11-26 15:53:04 +01:00
ChrisTerBeke
da5683c876 add typing to models 2018-11-26 15:30:30 +01:00
Marijn Deé
a382b77eaa Added validation to the models 2018-11-26 14:30:17 +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
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é
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
Marijn Deé
352427e460 Moved exception handling closer to the cause of error 2018-11-22 10:01:15 +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
Marijn Deé
f3338aa187 Fixed the failing tests 2018-11-20 16:53:01 +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
ChrisTerBeke
2497325d60 Test with named tuples, not working yet 2018-11-19 16:35:19 +01:00
ChrisTerBeke
60dd130393 Use logException where possible 2018-11-19 15:39:12 +01:00
ChrisTerBeke
0b1ac87354 Fix some formatting, cleanup import 2018-11-19 15:03:43 +01:00
ChrisTerBeke
dc17bd8499 Fix the first tests 2018-11-19 13:54:45 +01:00
ChrisTerBeke
ee9210d8d1 Rewrite tests 2018-11-19 10:57:47 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +01:00
Marijn Deé
565f009e9b Added comments 2018-11-16 16:34:44 +01:00
Marijn Deé
1000625d69 Added spaces around all = 2018-11-16 16:07:17 +01:00
Marijn Deé
695d45ffbe Initialize the models with None 2018-11-16 15:54:07 +01:00
Marijn Deé
e9e8c49b2d Added tests for SendMaterialJob and refactored SendMaterialJob for
better testability. This is part of a larger project to create tests
for the UM3NetworkPrinting plugin in preparation for printing from the
cloud
2018-11-16 14:16:45 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:02:57 +01:00
fieldOfView
f12efb7aa1 Fix LegacyUM3OutputDevice post() call 2018-11-07 16:07:45 +01:00
Lipu Fei
88f3325972 Add typing for _createMaterialOutputModel()
CURA-5887
2018-11-05 13:11:58 +01:00
Lipu Fei
fa693aef2b Fix material shown in print jobs
CURA-5887

 - Use MaterialManager to get materials
 - For a GUID with mulitple matches, show the read-only materials first
   if any. Otherwise, show non-read-only materials.
2018-11-05 11:48:19 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
2018-10-29 13:25:23 +01:00
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
Ian Paschal
be5c1c8596
Merge pull request #4436 from Ultimaker/clean_print_job_info_block
CL-897, CL-1051, CL-1111 Cura 3.6 Monitor Tab
2018-10-24 12:29:46 +02:00
Ian Paschal
1bd488dd6c Remove comments
Contributes to CL-897
2018-10-23 15:25:42 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received
Contributes to CL-1051
2018-10-17 14:28:17 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
2018-10-08 15:03:21 +02:00
Ian Paschal
9caeddf824 Merge branch 'master' of https://github.com/Ultimaker/Cura into clean_print_job_info_block 2018-10-03 09:08:26 +02:00
Ian Paschal
82cddf07ad Move ConfigurationChangeModel to plugin
Contributes to CL-897
2018-10-01 17:12:05 +02:00
Jaime van Kessel
c15f8aa693 Move printer type checking to where it belongs; inside the UM3 plugin. 2018-09-27 15:54:23 +02:00
Simon Edwards
b7673a7438 Show Cura Connect alerts in the monitor tab
CL-897
2018-09-19 16:53:18 +02:00
Ian Paschal
2bc1e4b397 Fix bug where disovery window does not appear 2018-09-10 09:27:59 +02:00
Ian Paschal
18e0dacda4 Organize files better
First things first... organize!
2018-09-07 14:11:37 +02:00