Diego Prado Gesto
2915199367
Avoid printer connection when the status is 'error' - CURA-3868
2017-10-11 15:55:30 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0'
2017-10-10 14:36:38 +02:00
Lipu Fei
57b1cb3bc8
Refactor camera request fix
...
CURA-4376
- Simplify the exception handling
- Use isFinished() to check the state of the network request
2017-10-10 10:54:35 +02:00
ChrisTerBeke
641b3c21f7
fix merge conflicts
2017-10-10 09:21:31 +02:00
A.Sasin
d1bee922ab
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
2017-10-10 09:17:56 +02:00
A.Sasin
99d9961297
Cura crashed because of RuntimeError after switching between monitor and prepare view
...
CURA-4376
2017-10-10 09:16:35 +02:00
ChrisTerBeke
f8a1187a8c
Re-sending after cancelling print job now really works - CURA-4398
2017-10-09 16:14:02 +02:00
ChrisTerBeke
cbd0bcd1b5
Manually trigger upload finished callback after request finished - CURA-4398
2017-10-09 14:49:18 +02:00
Lipu Fei
f10397acf9
Always set finish flag when finalizing post_reply
...
CURA-4398
2017-10-09 12:38:18 +02:00
ChrisTerBeke
6c51034e5f
Fix sending another file after aborting an upload - CURA-4398
2017-10-09 11:31:32 +02:00
Ghostkeeper
bc419370d0
Merge branch '3.0'
2017-10-06 16:02:13 +02:00
Lipu Fei
e9462b17c8
Add try-excepts for signal disconnections
2017-10-06 12:04:16 +02:00
Ghostkeeper
7e00914e38
Merge branch '3.0'
2017-10-06 10:00:19 +02:00
Lipu Fei
39fc03c550
Revert "Replace new message string with a logging line"
...
This reverts commit e052c3ba83f1e90777375f51e2612ec1df17fc55.
CURA-4398
2017-10-06 09:57:45 +02:00
Lipu Fei
e052c3ba83
Replace new message string with a logging line
...
CURA-4398
2017-10-06 09:50:03 +02:00
Diego Prado Gesto
c9e8f7c743
Block sending several files now works even if there is a mismatching - CURA-4398
2017-10-05 18:16:53 +02:00
Lipu Fei
185c350a19
Merge remote-tracking branch 'upstream/3.0'
2017-10-05 15:49:18 +02:00
Lipu Fei
18e636f928
Cleanup post_reply cleanup code
...
CURA-4398
- Create 2 separate try-except blocks for disconnect()s
- Remove duplicated post_reply cleanup code by creating a function to do
so
2017-10-05 15:02:30 +02:00
ChrisTerBeke
cd59048475
Disconnect upload finished signals, move already uploading check down, CURA-4398
2017-10-05 13:11:45 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
...
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.
Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
...
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.
Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
Jaime van Kessel
512a942f75
Added a tickle to zipping state of messages
2017-10-04 16:09:53 +02:00
ChrisTerBeke
b62c19206f
Merge branch 'fix_garbled_fonts_macos' into 3.0
2017-10-04 14:09:59 +02:00
ChrisTerBeke
3328184fbc
CURA-4398 block print over network when another upload is already in progress
2017-10-04 11:06:20 +02:00
Ghostkeeper
1d7792861d
Merge branch '3.0'
...
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
2017-10-02 17:40:24 +02:00
Ghostkeeper
6fc62fd2b3
Don't try to disconnect after aborting
...
Because if the signal is not connected then we'd get a segfault in this case.
Contributes to issue CURA-4376.
2017-10-02 17:34:57 +02:00
Ghostkeeper
1aa6d2876c
Revert "Use self._camera_active to detect whether we should show the camera"
...
This reverts commit bd0b38f6885d0dabb24aa078ade2eed6425ff5ce.
2017-10-02 17:34:57 +02:00
Ghostkeeper
bd0b38f688
Use self._camera_active to detect whether we should show the camera
...
Because the camera timer is whether we should request the camera.
Contributes to issue CURA-4376.
2017-10-02 16:55:19 +02:00
Ghostkeeper
894c3fc0da
Emit authenticationStateChanged when setting auth to NotAuthenticated
...
So that the interface may display this as well.
Contributes to issue CURA-4376.
2017-10-02 16:43:09 +02:00
Ghostkeeper
b7090feadb
Don't stop camera if it wasn't running
...
Otherwise you get a segfault in the .abort() function down below.
Contributes to issue CURA-4376.
2017-10-02 16:43:09 +02:00
daid
7f6de3aed5
CL-462, time sync to the printer if a printer has no valid system datetime. As any datetime is better then no datetime at all.
2017-09-29 12:41:24 +02:00
Mark
9a193ad5c5
Changing AGPLv3 to LGPLv3
2017-09-28 13:00:43 +02:00
Ghostkeeper
d8c1546be3
Revert making the camera image black while it doesn't react
...
This was giving segfaults sometimes on my computer. I suspect it's because the camera image could have been written to by both this Python code and by the camera itself, giving it a sort of data race or maybe that the image was discarded by the camera while it's being written to by Python. In any case, this should make it more stable.
Contributes to issue CURA-4376.
2017-09-27 14:20:20 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
...
CURA-4376
2017-09-27 10:29:48 +02:00
Jaime van Kessel
826773ae42
Added a lot more logging to debug the not-authenticated issue
2017-09-26 11:20:14 +02:00
alekseisasin
204019702d
Added Title for messages
...
CURA-4203
2017-09-13 13:58:08 +02:00
Jaime van Kessel
81b6675518
Improved logging for network output
2017-09-06 11:15:40 +02:00
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
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
Jaime van Kessel
289c9ed8ee
Network printing now sees empty state as idle
2017-07-05 11:00:00 +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
