GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 05:18:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,315 Commits 290 Branches 260 Tags
Commit Graph

740 Commits

Author SHA1 Message Date
ChrisTerBeke
67045b34b5 Add some more explanation 2019-07-29 17:39:27 +02:00
ChrisTerBeke
6d9b6668e2 Add TODO 2019-07-29 17:38:07 +02:00
ChrisTerBeke
14808c5de1 Don't cache application instance 2019-07-29 17:34:31 +02:00
ChrisTerBeke
93146610f7 Fix local pause, resume and abort 2019-07-29 17:31:05 +02:00
ChrisTerBeke
1aa70748af Consistent naming, some bug fixes 2019-07-29 17:24:10 +02:00
ChrisTerBeke
ddd282eef3 Remove absolute plugin imports, some fixes 2019-07-29 16:11:01 +02:00
ChrisTerBeke
4b212d6c05 Merge more stuff, re-use models for local networking as well 2019-07-29 14:53:50 +02:00
ChrisTerBeke
4268c011a7 Start inheriting both output devices from a base device 2019-07-26 17:05:39 +02:00
ChrisTerBeke
bd4f0c4e25 Extract API calls to separate class 2019-07-26 15:34:37 +02:00
ChrisTerBeke
fb434ec81a Remove unneeded import 2019-07-26 15:08:49 +02:00
ChrisTerBeke
3c1b377308 Restructure codebase - part 1 2019-07-26 15:07:52 +02:00
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
Jaime van Kessel
1e7875de48 Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura 2019-07-23 13:57:31 +02:00
Lipu Fei
4b8a216771 Fix typing 2019-07-22 09:34:00 +02:00
ChrisTerBeke
25130b63e2 Fix logic 2019-07-12 09:19:30 +02:00
ChrisTerBeke
6210135b92 Send the correct action name when using local network 2019-07-12 08:14:28 +02:00
ChrisTerBeke
99e2939801 Add defense for when active printer is None 2019-07-10 12:55:12 +02:00
ChrisTerBeke
f1df7b93c4 Fix printer and print job ordering, add back 'move to top' 2019-07-10 12:42:01 +02:00
ChrisTerBeke
1d09cb5b9c
Fix typing for optional data argument 
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
 2019-06-24 13:18:27 +02:00
ChrisTerBeke
baf9dc041c Fix typing of Any 2019-06-20 12:56:45 +02:00
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00
ChrisTerBeke
eb8d353e11 Add basic support for print job actions via Cloud output device 2019-06-19 13:58:11 +02:00
Jaime van Kessel
14f96bd9b6 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-28 12:41:33 +02:00
Jaime van Kessel
63316fa4e9 Fix manual output devices not being added on boot 2019-05-28 11:59:17 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing
changes made to 7094b222b10076af3a13f11b03dd3416eae12156.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button 
CL-1259 hide useless override button
 2019-05-20 15:47:26 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 15:46:07 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:12:08 +02:00
Ian Paschal
3cf2e19692 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 10:59:34 +02:00
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Ian Paschal
c7f6351903 Add typings 
Contributes to CL-1331
 2019-05-15 10:09:27 +02:00
ChrisTerBeke
913fac0094
Should be non-human readable string 2019-05-14 21:18:00 +02:00
ChrisTerBeke
b1920b05e9
Remove hacky code that is now not needed anymore 2019-05-14 21:13:29 +02:00
ChrisTerBeke
56c1da2580
printer_type has a default value so cannot be Optional 2019-05-14 21:01:34 +02:00
ChrisTerBeke
70c679859a
Use default value for printer type, allow printer_type field from cloud 2019-05-14 20:56:28 +02:00
Ian Paschal
c4ca133b40 Update UM3OutputDevicePlugin.py 
Contributes to CL-1331
 2019-05-13 15:39:29 +02:00
Ian Paschal
8b25816b1b Fix typo and white space 
Contributes to CL-1331
 2019-05-13 14:44:39 +02:00
Ian Paschal
d391ec4e6b Comments 
Contributes to CL-1331
 2019-05-09 16:41:01 +02:00
Ian Paschal
f7ef24819d Remove unused code 
I'm not sure why loadConfigurationFromPrinter is not used... but it's not.

Contributes to CL-1331
 2019-05-09 16:23:12 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML 
Contributes to CL-1331
 2019-05-09 16:19:59 +02:00
Ian Paschal
26ab359a93 Add more endpoints to machines API 
- getCurrentMachine
- setCurrentMachineGroupName
- updateCurrentMachineConfiguration

Also shortened `global_container_stack` to `global_stack` since every stack is a container stack.

Contributes to CL-1331
 2019-05-09 16:01:44 +02:00
Ian Paschal
20a9b65ea5 Use API endpoint for machine association 
Contributes to CL-1331 and CL-1323
 2019-05-09 14:54:24 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request 
CURA-6483
 2019-04-25 11:55:49 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Ian Paschal
6f762c676e Set the printer type on printer configuration 
No idea why we didn't already do this
Contributes to CL-1055
 2019-04-23 14:38:07 +02:00
ChrisTerBeke
76d0b5f198 Ensure printers length is larger than 0 before accessing index 2019-04-18 14:26:38 +02:00
ChrisTerBeke
0028ec6746 Ensure all property values are of type bytes 2019-04-18 14:22:05 +02:00