GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,980 Commits 286 Branches 260 Tags
Commit Graph

67 Commits

Author SHA1 Message Date
Ghostkeeper
75a50b73c2
Move pre-heat timer into PrinterOutputDevice 
If it's held inside the device that has two advantages: It's being held per-device, so switching connection doesn't stop the timer. And also, the logic is no longer in the GUI.

Contributes to issue CURA-3161.
 2017-02-16 12:58:32 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Ghostkeeper
0c9b9a3033
Add fallback name property in PrinterOutputDevice 
It'll call this property, which gives an empty string, if the device doesn't implement giving a name.

Contributes to issue CURA-3161.
 2017-02-09 17:34:51 +01:00
Ghostkeeper
e37d8b949e
Add fallback in PrinterOutputDevice for getting address 
The fallback gives a warning that it's not implemented.

Contributes to issue CURA-3161.
 2017-02-09 10:31:35 +01:00
Ghostkeeper
c5655d4d8c
Document preheatBedTimeout 
Must've slipped through the cracks.

Contributes to issue CURA-3161.
 2017-02-09 09:32:14 +01:00
Ghostkeeper
d7b0336c24
Fix colour of unknown material 
The other colour was just used for debugging.

Contributes to issue CURA-3161.
 2017-02-08 12:42:40 +01:00
Ghostkeeper
9354a80504
Document no longer that pre-heating defaults to 15m 
Because that was removed.

Contributes to issue CURA-3161.
 2017-02-07 17:17:45 +01:00
Ghostkeeper
d30430381f
Add default implementations for preheatBed and cancelPreheatBed 
It is a no-op implementation that gives a warning. I'd rather give an exception and have that handled by whatever calls it, but this is how the other methods here do it.

Contributes to issue CURA-3161.
 2017-02-07 17:16:19 +01:00
Ghostkeeper
1a902b21bb
Store default pre-heat time in central location 
Its default is 900s or 15 minutes. QML now requests the time-out time and sends it on to the printer.

Contributes to issue CURA-3161.
 2017-02-07 16:29:41 +01:00
Ghostkeeper
ee3e0ba6ab
Add material indication to extruder boxes 
Only if a material is known of course. But the case where it is unknown is not tested.

Contributes to issue CURA-3161.
 2017-02-03 14:52:09 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jaime van Kessel
e77d7f1f20 PrinterOutput now keeps track of camera state 
CURA-2411
 2016-11-23 13:22:02 +01:00
Thomas Karl Pietrowski
6dc194d8de Revert "PrinterOutputDevice: Adding isConnectionState" 
1. Shouldn't go directly to upstream's master
2. GitHub still loves to kill the last line

This reverts commit bafaf16fcbba5867353d012509f27c1c3f1a8d8f.
 2016-11-20 15:09:20 +01:00
Thomas Karl Pietrowski
bafaf16fcb PrinterOutputDevice: Adding isConnectionState 
Adding isConnectionState here to make direct comparisons, whether the current state is the correct one.
Looks better than `self._connection_state == <my_connection_state>`  in my point of view.
 2016-11-20 14:59:35 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
fieldOfView
236723fc8d Remove unused required argument on _startCamera and _stopCamera 
(they were probably there due to a copy/paste error, see _setJobState)
CURA-2411
 2016-11-09 16:20:34 +01:00
Jaime van Kessel
304696c809 OutputDevices now take file_handler into account 
CURA-1263
 2016-11-09 14:03:57 +01:00
Jaime van Kessel
c769a05408 Added start & stop camera interface 
CURA-2411
 2016-11-04 09:41:26 +01:00
Ghostkeeper
96e516c676
Allow for saving multiple scene nodes at the same time 
The selection saving saves the entire current selection and their child nodes.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Jaime van Kessel
2b117c0450 Added printer type to output device 
CURA-2475
 2016-10-05 14:31:12 +02:00
Jaime van Kessel
4db1db302b Changed guid to GUID in the filter 
We use the veriable as upper.
 2016-09-13 14:35:45 +02:00
Jaime van Kessel
cb50c61293 Added missing import statement 
CURA-2276
 2016-09-13 12:51:37 +02:00
fieldOfView
224e6d37a8 Add materialNames property to get user-facing texts from printer 
inb4 string-freeze
CURA-2276
 2016-09-13 10:53:21 +02:00
Jaime van Kessel
8dbe67a6bf Added printer state to output device 
CURA-2235
 2016-09-12 13:30:43 +02:00
Jaime van Kessel
544941e33e Signals are now only emitted when setting changed instead of always. 2016-09-08 17:20:01 +02:00
fieldOfView
063faf1520 Move the "Changes on Printer" dialog to JediWifiPrinting 
...to have full control over the terminology
CURA-2116
 2016-08-16 16:48:35 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:43:09 +02:00
fieldOfView
0faa7f4abb Fix error in PrinterOutputDevice.acceptsCommands 
CURA-1851
 2016-08-04 15:49:07 +02:00
fieldOfView
ed669925ad Disable print monitor if the printer is not (yet) ready to receive commands 
CURA-1851
 2016-08-04 15:06:22 +02:00
fieldOfView
a74d5dd8cb Show error text in print monitor 
CURA-1990
 2016-08-04 13:25:28 +02:00
fieldOfView
dd249206ac Fix codestyle 
CURA-491
 2016-07-04 16:33:32 +02:00
fieldOfView
a1a7518317 Switch materials/nozzle when the printer signals a material/nozzle change 
CURA-491
 2016-07-04 11:49:27 +02:00
Jaime van Kessel
d0aa33f57f Added jobName property 
CURA-1036
 2016-06-23 17:05:45 +02:00
Jaime van Kessel
640e1a2350 Implemented interface for setting printjobstate 
CURA-1038
 2016-06-16 15:35:11 +02:00
Jaime van Kessel
2d78f0a610 Added job_state property 
CURA-1036
 2016-06-16 11:43:25 +02:00
Jaime van Kessel
c130d4d9cf Added properties for total time and time spend on print 
CURA-1036
 2016-06-15 16:46:03 +02:00
Jaime van Kessel
3777acd4cd Changed order of inheritance. 
Because the python new is stupid, it fails to notice the qObject if it's not defined first
 2016-06-14 11:50:59 +02:00
Jaime van Kessel
b429f98d6a Added signalemitter decoration 
CURA-49
 2016-06-14 09:42:05 +02:00
Jaime van Kessel
02e02a8f98 Added way to update the head position 
CURA-1339
 2016-04-19 15:30:34 +02:00
Jaime van Kessel
d33a75906a Progress is now only emitted if it changed 
CURA-1339
 2016-04-19 12:04:22 +02:00
Jaime van Kessel
a59c113887 Added busy & error state to ConnectionState 
CURA-1339
 2016-04-18 14:47:51 +02:00
Jaime van Kessel
fb52d39936 Changed enum values to lowerCamelCase 
CURA-1339
 2016-04-18 14:43:04 +02:00
Jaime van Kessel
96e821cc3d PrinterOutputDevice now uses safer super().__init 
CURA-1339
 2016-04-18 13:27:36 +02:00
Jaime van Kessel
6ad926b9b8 connect & close are now pure virtual 
CURA-1339
 2016-04-18 11:38:57 +02:00
Jaime van Kessel
0015d9d027 Documented signals 
CURA-1339
 2016-04-18 11:37:08 +02:00
Jaime van Kessel
94d3309a35 Removed duplicate bedTemperature declaration 
CURA-1339
 2016-04-18 11:33:43 +02:00
Jaime van Kessel
c2b1753d25 Updated documentation 
CURA-1339
 2016-04-14 15:59:10 +02:00
Jaime van Kessel
6f7b80299e Added warning logging 
CURA-1339
 2016-04-14 15:46:16 +02:00