112 Commits

Author SHA1 Message Date
Jaime van Kessel
295a4af22b Merge pull request #2380 from fieldOfView/fix_camera_leak
Prevent a possible memory leak while showing a stuck camera stream
2017-09-05 09:19:21 +02:00
Jaime van Kessel
08766ee66f Fix wrong indentation for camera view 2017-09-04 17:36:44 +02:00
fieldOfView
7e60d459b4 Prevent a possible memory leak while showing a stuck camera stream 2017-09-04 15:47:44 +02:00
Jaime van Kessel
a652ddbdd8 Reset lastResponseTime when trying to connect
CURA-3869
2017-09-01 14:54:57 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature
Show target hotend temperatures
2017-08-31 13:46:55 +02:00
Jaime van Kessel
053fdd679d Don't send duplicated materials to printer
CURA-4199
2017-08-30 15:52:31 +02:00
fieldOfView
85b20ab16b Get UM3 target hotend temperatures 2017-08-29 11:05:36 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
2017-08-21 00:57:25 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 15:04:18 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Jaime van Kessel
a8a475a1a7 Only stop the camera if the timer is actually running
CURA-4081
2017-07-24 17:18:04 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Jaime van Kessel
4d0c46508a Fixed incorrect naming of printcores in error messages
CURA-3734
2017-07-20 15:17:46 +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
Ghostkeeper
dbcf50162f
Fix spelling of combined English words
Contributes to issue CURA-3998.
2017-07-18 13:10:17 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Jaime van Kessel
289c9ed8ee Network printing now sees empty state as idle 2017-07-05 11:00:00 +02:00
Ghostkeeper
cd4bffb380
Set author to Ultimaker B.V. instead of Ultimaker
To be consistent with the rest of the plug-ins and with the material files.

Contributes to issue CURA-3857.
2017-06-28 13:50:37 +02:00
Ghostkeeper
2a593e316b
Close camera upon disconnecting instead of relying on Uranium to do that
Uranium shouldn't know about no camera.
2017-06-28 11:51:12 +02:00
Lipu Fei
4ea8cc448a Use semantic versioning for all plugin.json
CURA-3712
2017-06-22 08:57:47 +02:00
Lipu Fei
73f598ff9f Fix code style
CURA-3712
2017-06-22 08:54:04 +02:00
Jaime van Kessel
e3629cec39 Replaced catalog metadata entry with i18n-catalog
CURA-3712 & Cura-3856
2017-06-21 14:24:00 +02:00
Jaime van Kessel
44125d3275 Moved certain meta data entries to seperate file
CURA-3856 & CURA-3712
2017-06-21 11:22:35 +02:00
Jaime van Kessel
4fa9b94e30 Minor code cleanup 2017-06-13 16:28:41 +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
f9f0fa852f Added RunTime exception catching for image_reply
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
2017-05-22 14:48:42 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.

Contributes to issue CURA-3839.
2017-05-19 12:30:17 +02:00
Mark
04611b06af Fix two spelling errors
TRI-1450
2017-05-10 20:14:03 +02:00
Lipu Fei
314fa8b1c8 Fix Enter key trigger for UM3 Add Printer dialog 2017-05-04 15:27:29 +02:00
Lipu Fei
c2dff9fcd9 Accept Enter key on UM3 Add Printer Dialog 2017-05-03 13:58:58 +02:00
daid
50acaaf91f Some minor changes on review. 2017-04-20 09:35:48 +02:00
daid
26a2fb80dc Only update the target bed temperature, without submitting it to the printer. To prevent race conditions. 2017-04-19 15:01:47 +02:00
Jaime van Kessel
d02aa7f6a3 Fixed order of close & disconnect
This would cause the state change caused by close to not be sent to the printer. Fixes CURA-3668
2017-04-10 13:32:37 +02:00
Jaime van Kessel
f5785662f2 Fixed another broken logging 2017-04-10 13:19:05 +02:00
Jaime van Kessel
abe70c3a92 Fixed broken logging 2017-04-10 13:12:14 +02:00
Jack Ha
cebe52b1fe Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-06 14:08:00 +02:00
Jack Ha
88a8ed9752 Merge branch '2.5' 2017-04-06 14:07:50 +02:00
Jack Ha
f04981b08c Fixed wifi missing some lines. CURA-3664 2017-04-06 14:06:38 +02:00
Jaime van Kessel
a4afde39ff Handle connecting & disconnecting a bit more elegant
CURA-3603
2017-04-06 14:03:41 +02:00
Jaime van Kessel
953d59788e Only try to close connection when there is a connection to close
CURA-3603
2017-04-06 13:57:39 +02:00
Lipu Fei
c5bf107be6 Merge branch '2.5' 2017-03-31 12:12:29 +02:00
Lipu Fei
08071c3aa5 Fix batched GCode compression
CURA-3604
2017-03-31 12:11:11 +02:00
Lipu Fei
74e9ee0ab7 Fix batched gcode compression for "print over network"
CURA-3604
2017-03-30 19:00:41 +02:00
Jaime van Kessel
dbfa5873ce Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-30 17:03:01 +02:00
Jaime van Kessel
06fff748e3 Decreased the size of the batches to send, as it froze the interface too much. 2017-03-30 16:59:35 +02:00
Jaime van Kessel
7ae8d96775 Simply reset the authentication when requesting a new one.
Only changing the state caused a whole lot of issues.
2017-03-30 16:47:08 +02:00
Jack Ha
3135dc7d77 Solved MC 2017-03-30 16:20:08 +02:00
Lipu Fei
bfd77f915d Compress gcode lines in batch
CURA-3604
2017-03-30 16:09:17 +02:00
Lipu Fei
c785e84b86 Check len(materialLengths) before using
CURA-3604
2017-03-30 16:09:16 +02:00
Jaime van Kessel
f7bbb243b8 Moved authentication request state change 2017-03-30 11:02:56 +02:00