GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,846 Commits 295 Branches 268 Tags
Commit Graph

346 Commits

Author SHA1 Message Date
Diego Prado Gesto
0b6841e5d9 Revert "Use the capitalized version of the buildplate name" 
This reverts commit 11d8831d7a9a15e3e916d5d9762bfe1f755042e5.

Contributes to CURA-6021.
 2018-12-12 09:20:35 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Diego Prado Gesto
11d8831d7a Use the capitalized version of the buildplate name 2018-12-10 15:40:18 +01:00
Daniel Schiavini
4f82a2759a STAR-322: Improving configuration models interface 2018-12-07 12:04:02 +01:00
ChrisTerBeke
57efca1376
Fix a possible division by zero error 2018-12-05 19:31:58 +01:00
ChrisTerBeke
467d347008
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 
* ui_rework_4_0:
  Ensure that reset always correctly gets set to basic
  Remove semi-colon
  Simplify preview icon logic
  Always return a string for preview icon
  Update USBPrinting version to 1.0.1
  Fix module importing in USBPrinting
  When toggling auto-slice, force a re-slice
  Fix multi-argument i18n string
  Improve printer status handling
  Make "finishes at" single translatable string
  Improve exposed progress prop
  Simplify logic slightly
  Handle idle, unavailable, and unreachable states
  Improve printer status and progress bar
  Improve date rendering
  Add some typings
  Move isActive and timeRemaining logic from QML to Python
 2018-12-04 21:30:24 +01:00
Daniel Schiavini
9046b39b43 STAR-322: Creating a Cloud API client to handle the interaction 2018-12-04 16:14:08 +01:00
Ian Paschal
0363c1257c Improve exposed progress prop 
Contributes to CL-1153
 2018-12-04 10:18:09 +01:00
ChrisTerBeke
12b3f0088d Add content type to file upload 2018-12-04 10:07:43 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring 2018-12-03 22:12:18 +01:00
Daniel Schiavini
fc26ccd6fa STAR-332: Some improvements to get the job in connect 2018-12-03 14:41:36 +01:00
Ian Paschal
3d80e28174 Add some typings 
Contributes to CL-1153
 2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python 
Contributes to CL-1153
 2018-12-03 12:15:25 +01:00
Daniel Schiavini
8066074a2f STAR-332: Fixing warnings 2018-12-03 11:02:49 +01:00
ChrisTerBeke
a9fedb4f66 Restore NetworkedPrinterOutputDevice for now 2018-11-26 15:05:53 +01:00
ChrisTerBeke
014b1d6e4e test 2018-11-26 13:45:37 +01:00
ChrisTerBeke
2fc5061c41 Fix some PR comments, cleanup imports 2018-11-23 14:11:43 +01:00
ChrisTerBeke
c7bb6931f4
Refactor networked output device 
All networking related stuff is moved to a separate class called NetworkClient for reusability.
As example it is now also used in the WIP CloudOutputDeviceManager to clean up network calling there.
 2018-11-20 23:44:28 +01:00
ChrisTerBeke
228325eb89
Add CloudOutputDeviceManager, test implementation 2018-11-19 21:59:57 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +01:00
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