3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
28446 commits 302 branches 270 tags 773 MiB
Commit graph

1712 commits

Author SHA1 Message Date
ChrisTerBeke
115936c46b
Target correct cloud API version 2018-11-19 20:27:38 +01:00
ChrisTerBeke
69ca7c0f89
CloudOutputDevice scaffolding 2018-11-19 20:08:05 +01:00
Ian Paschal
421a64c7b0 Replace queued print job cards with new design 
Contributes to CL-1148
 2018-11-19 16:42:36 +01:00
ChrisTerBeke
2497325d60 Test with named tuples, not working yet 2018-11-19 16:35:19 +01:00
ChrisTerBeke
c04ce7fce8 Use call_count on specific method to be more precise 2018-11-19 15:44:07 +01:00
ChrisTerBeke
60dd130393 Use logException where possible 2018-11-19 15:39:12 +01:00
ChrisTerBeke
66fbadf2de Convert all single quotes to double quotes 2018-11-19 15:37:56 +01:00
ChrisTerBeke
d65114bd56 use call_count to assert device was not called 2018-11-19 15:08:58 +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é
22aac7b566 Renamed TestContainerRegistry to ContainerRegistryMock 2018-11-16 16:35:08 +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é
0062250238 Moved the test to the plugin directory 2018-11-16 16:06:36 +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
Diego Prado Gesto
7a12cc53cc Merge branch 'master' into ui_rework_4_0 2018-11-09 08:53:31 +01:00
Lipu Fei
369747d106 Merge remote-tracking branch 'origin/3.6' 2018-11-08 15:28:42 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor 
CL-1140 Show print time in monitor tab
 2018-11-08 11:53:47 +01:00
Ian Paschal
aa6ec9e44b Make text black 
Contributes to CL-1040
 2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:05:47 +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
Ian Paschal
35ed234991 Show print time in monitor tab 
Contributes to CL-1040
 2018-11-08 10:49:22 +01:00
fieldOfView
f12efb7aa1 Fix LegacyUM3OutputDevice post() call 2018-11-07 16:07:45 +01:00
Jaime van Kessel
36a9642c90 Merge branch 'CURA-5887_fix_material_shown_in_print_job' of github.com:Ultimaker/Cura 2018-11-07 12:39:41 +01:00
Simon Edwards
7ecffdef3d Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6 2018-11-06 17:06:04 +01:00
Diego Prado Gesto
2d59ca02ca Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 16:59:07 +01:00
Ian Paschal
4c831de06c Remove console logs 
Contributes to CL-1126
 2018-11-06 16:41:59 +01:00
Ian Paschal
dc4b69c386 Show context menu at the right times 
Contributes to CL-1126
 2018-11-06 16:37:47 +01:00
Ian Paschal
c84aa9cf21 Use default font for configuration override 
Contributes to CL-1124
 2018-11-05 17:19:22 +01:00
Ian Paschal
1abd0b3499 Show "Pausing...", "Aborting...", and "Resuming..." texts 
Contributes to CL-1126
 2018-11-05 15:45:17 +01:00
Lipu Fei
88f3325972 Add typing for _createMaterialOutputModel() 
CURA-5887
 2018-11-05 13:11:58 +01:00
Ian Paschal
4f10b7809a Configuration override improvements 
Contributes to CL-1124
 2018-11-05 12:15:17 +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
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Ian Paschal
1ba8eff7fa Don't show camera icon unless printer details are expanded 
Contributes to CL-1063
 2018-10-31 13:52:31 +01:00
Ian Paschal
7960772ac8 Do show "delete" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:46:19 +01:00
Ian Paschal
ac7a566ae1 Do not show "move to top" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:45:30 +01:00
Ian Paschal
903054190d Fixing some spacing issues with camera button 
Contributes to CL-1063
 2018-10-31 11:23:57 +01:00
Simon Edwards
03dd26e6e2
Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements 
Monitor tab spacing improvements
 2018-10-30 14:57:18 +01:00
Ian Paschal
30c7a2cbe5 Monitor tab spacing improvements 
Fixing CL-1063 (adding camera button at all times) introduced a few small spacing issues. This PR fixes them.
 2018-10-30 13:58:42 +01:00
Ian Paschal
0273cd2a0e Don't show the context menu for printed jobs (only active ones and queued ones) 
Contributes to CL-1118
 2018-10-30 13:44:24 +01:00
Ian Paschal
1680548a39 Remove extra empty line 2018-10-30 13:36:52 +01:00
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +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
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00