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
13,199 Commits 286 Branches 260 Tags
Commit Graph

114 Commits

Author SHA1 Message Date
Diego Prado Gesto
fa5aa0a53f CURA-4870 React to outputdeviceschanged signal, to update the list of 
the configurations.
 2018-03-08 16:55:40 +01:00
Diego Prado Gesto
d02d845d1b CURA-4870 Update the selected configuration in the UI when the 
configuration in the printer changes.
Modify again the hash function.
 2018-03-06 09:24:42 +01:00
Diego Prado Gesto
b8ad0959a7 CURA-4870 Add call to the QObject constructor 2018-03-05 09:41:22 +01:00
Diego Prado Gesto
22b1c2127f CURA-4870 Add information of the current configuration selected in the active printer 2018-03-04 18:13:27 +01:00
Diego Prado Gesto
49fcf35d9b CURA-4870 Prepare the UI to show the list of configurations 2018-03-04 17:26:37 +01:00
Diego Prado Gesto
dead2122dd CURA-4870 Add list of unique configurations to the output device. The printer output model calculates the configuration every time a change is received from the output device 2018-03-03 20:29:06 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Jaime van Kessel
1986677276 re-addded connection text 
CL-541
 2018-01-12 10:58:16 +01:00
Diego Prado Gesto
de98a62dc8 CURA-4461 Read buildplate id from the printer and set the automatic 
option
 2018-01-11 13:03:35 +01:00
Jaime van Kessel
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
Jaime van Kessel
9754aa5397 Material & hotend updated callback is enabled for LegacyUM3 again 
CL-541
 2017-12-21 13:16:44 +01:00
Jaime van Kessel
d3b9ac0d45 Also start reworking the USBPrint. 
It's also time for some much needed code cleaning in that bit. The auto-detect is moved to it's own job,
which should make it a whole lot easier to disable it all together.

CL-541
 2017-12-14 17:37:57 +01:00
Jaime van Kessel
80526893c2 Made setAcceptsCommands protected 
CL-541
 2017-12-14 09:36:31 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Jaime van Kessel
ae629e2968 Fixed camera for legacy UM3 printer again 
CL-541
 2017-12-08 14:59:14 +01:00
Jaime van Kessel
9ccd643f64 Repaired the monitor icon not being updated 
CL-541
 2017-12-08 14:36:53 +01:00
Jaime van Kessel
aba8bd89c3 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-06 13:33:20 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
ChrisTerBeke
74eb4958af Fixes for printer output device views - CURA-4568 2017-11-28 14:21:47 +01:00
ChrisTerBeke
cfbb553182 Use new QML element creator for output device view - CURA-4568 2017-11-28 14:16:58 +01:00
Jaime van Kessel
83b13546fb Moved compressing of GCode to one class higher 
CL-541
 2017-11-27 17:12:36 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components 
CL-541
 2017-11-27 15:54:44 +01:00
Jaime van Kessel
f791b53ad8 Enabled monitor items for ClusterOutputDevice again 
CL-541
 2017-11-27 13:54:34 +01:00
Jaime van Kessel
1c2c4d4163 Added property to indicate if output device accepts commands 
Instead of how this was previously done, it's now tied to the auth state.

CL-541
 2017-11-23 17:07:24 +01:00
Jaime van Kessel
8b8d67b3a8 LegacyUM3 now handles warnings & errors again 
CL-541
 2017-11-23 13:37:59 +01:00
Jaime van Kessel
7465a6551a Setup the authentication stuff for LegacyUM3 
CL-541
 2017-11-22 11:59:07 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again 
CL-541
 2017-11-21 15:12:23 +01:00
Jaime van Kessel
b1649f2d38 Added PrintJob handling to ClusterUM3 
CL-541
 2017-11-21 11:01:19 +01:00
Jaime van Kessel
fd548975cc Closing a connection now actually stops the updates 
CL-541
 2017-11-21 10:19:17 +01:00
Jaime van Kessel
03304003af Added connection state property 
Cl-541
 2017-11-20 15:12:11 +01:00
Jaime van Kessel
c1dbdc64ee Added missing () 
CL-541
 2017-11-20 11:34:24 +01:00
Jaime van Kessel
22f2279a76 Moved bunch of code from the old location to the new bits in archtiecture 
CL-541
 2017-11-20 10:59:57 +01:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible 
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
 2017-10-20 15:09:45 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Jaime van Kessel
1d9ac09053 No longer attempt to create monitorView if none was set 2017-08-18 11:09:02 +02:00
Jaime van Kessel
145b6825db Fixes #2284 2017-08-18 09:45:28 +02:00
fieldOfView
92859697c5 Fix error about empty qml url 2017-08-03 10:57:47 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used. 
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
 2017-07-20 13:30:57 +02:00
Jaime van Kessel
216b1a7a14 Added control item to printOutputDevice 
CURA-4057
 2017-07-20 11:39:12 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Jaime van Kessel
5dbee706a7 Printer output device can now have a QML item 
This contributes to CURA-3826. This will allow printer output devices to
add custom UI elements to the monitor tab in the future.
 2017-05-29 13:02:00 +02:00
Jaime van Kessel
356d4f9288 Heated bed timeout time now hides correctly if time ran out 
CURA-3360
 2017-03-06 14:41:33 +01:00
Ghostkeeper
abf092512a
Don't show temperature if print core is removed in UM3 
The empty string as hotend ID is interpreted as there being no hotend, since this is what the UM3 returns in that case.

Contributes to issue CURA-3161.
 2017-02-16 13:23:20 +01:00
Ghostkeeper
d2fa6dbae2
Notify to update remaining time when it drastically changes 
When the time passes normally it doesn't trigger this signal but just go on counting, but when the pre-heat starts or cancels it updates via this signal. This is handy for the future, when we want to update the remaining time from the printer information. However for now it is also nice because we can make the pre-heat timer dependent on this signal so we know when to have it running. This fixes the problem that the pre-heat seems to have been cancelled in the GUI when you switch away the tab, because the timer running is now dependent on the property rather than always false.

Contributes to issue CURA-3161.
 2017-02-16 12:58:39 +01:00
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