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

276 Commits

Author SHA1 Message Date
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:02:57 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
 2018-10-29 13:25:23 +01:00
fieldOfView
0c1b3931db Revert "WIP: Add custom CameraView for UM camera feed" 
This reverts commit b00ea4719a268ec4b000375343bbc4082783b435.
 2018-10-29 11:18:55 +01:00
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
736bf040a8 Fix typing and typos 2018-10-29 11:18:54 +01:00
fieldOfView
484b1e5ec6 Remove CameraImageProvider and NetworkCamera 2018-10-29 11:18:53 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
fieldOfView
890ddc015e Add Cura.NetworkMJPGImage widget 2018-10-29 11:17:41 +01:00
fieldOfView
517428a308 Fix typing error in NetworkedPrinterOutputDevice.post 
Strictly speaking the QNetworkManager.post() method takes a QByteArray instead of Python bytes, but according to the PyQt documentation, PyQt handles that conversion transparently:
http://pyqt.sourceforge.net/Docs/PyQt5/gotchas.html#python-strings-qt-strings-and-unicode
 2018-10-28 11:27:08 +01:00
Lipu Fei
9d07409cce WIP: Use CameraView for UM camera feeds 
CURA-5821

The original implementation that refreshes a QImage seems to cause
memory overflow on MacOSX and Windows. This is a different
implementation. It doesn't cause memory overflow, but it does consume a
lot of CPU power.
 2018-10-24 16:00:22 +02:00
Lipu Fei
b00ea4719a WIP: Add custom CameraView for UM camera feed 
CURA-5821
 2018-10-24 15:44:19 +02:00
Ian Paschal
be5c1c8596
Merge pull request #4436 from Ultimaker/clean_print_job_info_block 
CL-897, CL-1051, CL-1111 Cura 3.6 Monitor Tab
 2018-10-24 12:29:46 +02:00
Lipu Fei
537108032e Fix typing in PrinterOutputModel 
CURA-5812
 2018-10-19 09:58:06 +02:00
Ghostkeeper
b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
 2018-10-15 16:52:22 +02:00
Ghostkeeper
99fc372b32
Update printer information when switching global container stacks 
This was just evaluated once during the creating of a USB connection. But you can switch out the printer without breaking/making a USB connection, so in that case we have to update it here.

Contributes to issue CURA-5749.
 2018-10-12 14:55:13 +02:00
Ghostkeeper
f7bef851db
Remove code duplication for recreate network timer 2018-10-12 11:09:46 +02:00
fieldOfView
a36deea651 Move updateFirmware to PrinterOutputDevice... 
along with codestyle and typing fixes
 2018-10-09 16:26:45 +02:00
fieldOfView
28dc32adab Fix typing in GenericOutputController 2018-10-04 11:47:51 +02:00
fieldOfView
718ac0a307 Create firmware update progress window from QML 2018-10-03 09:17:51 +02:00
Ian Paschal
9caeddf824 Merge branch 'master' of https://github.com/Ultimaker/Cura into clean_print_job_info_block 2018-10-03 09:08:26 +02:00
fieldOfView
3908781f6f Fix this sh*t 
Sorry, I kind of dropped the ball before.
 2018-10-02 17:08:39 +02:00
fieldOfView
91ee691c80 Merge branch 'master' into feature_firmware_updater 2018-10-02 15:10:44 +02:00
Ian Paschal
82cddf07ad Move ConfigurationChangeModel to plugin 
Contributes to CL-897
 2018-10-01 17:12:05 +02:00
fieldOfView
9af71f2888 Fix incorrect typing and issues caused by typing 2018-09-28 13:40:39 +02:00
fieldOfView
a573a598b0 Add typing and appease MYPY 2018-09-28 12:40:44 +02:00
Ghostkeeper
4a4b096052
Only send uppercase g-code via custom commands 
Because most printers don't understand anything other than uppercase.

Fixes #4178.
 2018-09-28 11:53:28 +02:00
fieldOfView
7c23a4e187 Merge branch 'master' into feature_firmware_updater 2018-09-28 11:32:28 +02:00
Jaime van Kessel
c15f8aa693 Move printer type checking to where it belongs; inside the UM3 plugin. 2018-09-27 15:54:23 +02:00
Jaime van Kessel
889035ebfa Fixed typo 2018-09-27 15:42:12 +02:00
Jaime van Kessel
d7901907af Fix typing 2018-09-27 15:37:08 +02:00
Ian Paschal
0e44a78251 Set non-NOTIFY properties to constants 2018-09-20 15:33:10 +02:00
Simon Edwards
9d53a31ec1 Add a missing file 
CL-897
 2018-09-20 10:28:41 +02:00
Simon Edwards
b7673a7438 Show Cura Connect alerts in the monitor tab 
CL-897
 2018-09-19 16:53:18 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed." 
This reverts commit dd778f0450219cbc2f7309eeb08bc20065bd51af.
 2018-09-04 13:42:24 +02:00
Jaime van Kessel
dd778f0450 Add enabled state to printer, so that it can be displayed. 
This ensures that if a printer is set to "Not available", that the interface can correctly show it

CL-896
 2018-09-04 13:27:17 +02:00
Jaime van Kessel
2e5b11af9d Fixed codestyle issue 
Switching between codestyles is hard :(
 2018-09-03 10:05:20 +02:00
Jaime van Kessel
fb1033ad99 Add the compatible machine families property to printerOutputModel 
This is used by the cluster to indicate by which families of printers the job can be displayed

CL-894
 2018-09-03 10:03:11 +02:00
fieldOfView
4a5451576d Update copyright 2018-09-02 18:07:30 +02:00
fieldOfView
43b4ca3044 Fix code-style 2018-09-02 18:02:33 +02:00
fieldOfView
9739dbd5f6 Fix missing import 2018-09-02 17:18:04 +02:00
fieldOfView
77f99ecf20 Moved FirmwareUpdater to cura.PrinterOutput 2018-08-24 15:48:11 +02:00
fieldOfView
4bea1410b8 Allow printer output devices to set their ability to update firmware 2018-08-22 14:37:48 +02:00
fieldOfView
c1d7ca7bff Merge branch 'master' into feature_firmware_updater 2018-08-22 12:16:25 +02:00
Jaime van Kessel
6a08b63f21 Ensure that extruder configurations are correctly sorted 
CL-894
 2018-08-21 13:32:22 +02:00
Jaime van Kessel
eb7d42a7f8 Added delete button to cluster queue 
CL-894
 2018-08-17 10:49:44 +02:00
Jaime van Kessel
db1d90ed9b Added delete function 
This is needed at a later stage to delete print jobs from queue by the cluster

CL-894
 2018-08-17 10:38:46 +02:00
Jaime van Kessel
c968e54750 Moved duplicated code to own function 
CL-894
 2018-08-17 10:38:23 +02:00
Jaime van Kessel
d4aaa73928 Codestyle fixes 
CL-894
 2018-08-17 10:34:14 +02:00
Jaime van Kessel
94b9782110 Added preview image to print cluster monitor 
CL-894
 2018-08-14 14:54:27 +02:00