GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,339 Commits 289 Branches 260 Tags
Commit Graph

55 Commits

Author SHA1 Message Date
fieldOfView
736bf040a8 Fix typing and typos 2018-10-29 11:18:54 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01: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
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
fieldOfView
7c23a4e187 Merge branch 'master' into feature_firmware_updater 2018-09-28 11:32:28 +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
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
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
74f8c82c5e Removed commented out code 2018-08-09 16:38:30 +02:00
Jaime van Kessel
86be07b095 Refactored the config models so they they function are more stand alone units. 
The seperation of concern got a bit mixed up, as the printer output model was connecting the signals that the config model needed to function together.
With these changes it's now also possible to use the config model as a part of a printjob, since printjobs can also have a configuration
 2018-08-09 16:22:35 +02:00
Jaime van Kessel
5c860d9592 Fixed typo 2018-08-09 11:11:41 +02:00
fieldOfView
688a5083d2 Add canUpdateFirmware property to printer output devices 2018-08-08 15:53:26 +02:00
Diego Prado Gesto
51462b20c3 CURA-5330 Add typing to PrinterOutputModel constructor 2018-06-08 15:56:20 +02:00
ChrisTerBeke
d4d9a58d04 Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes 2018-03-15 16:51:25 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
 2018-03-15 11:21:37 +01:00
Lipu Fei
4cc2d882d3 Fix merge conflicts 
CURA-4879
 2018-03-14 10:53:10 +01:00
Diego Prado Gesto
dfb903fb81 CURA-4870 Wait until the configuration has all the mandatory data before 
add it to the list of unique configurations.
Remove some connections to signals and reuse already defined listeners.
 2018-03-13 13:14:29 +01:00
Diego Prado Gesto
54882402ad CURA-4870 Change the name of the signal to be more related with the 
context.
 2018-03-13 09:41:26 +01:00
Diego Prado Gesto
39a7f5a53d CURA-4870 Update the configuration also when the type or the buildplate 
changed signal is emitted.
 2018-03-12 16:37:35 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output 
model so it can be used to show the buildplate name in the configuration
list.
 2018-03-07 13:57:13 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to 
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
 2018-03-06 16:08:50 +01:00
Diego Prado Gesto
13e18c9d54 Merge branch 'master' into feature_sync_button 2018-03-06 10:24:11 +01:00
Ghostkeeper
3e8f29d380
Allow floating point values for moving print head 
The X, Y, Z coordinates and speed don't necessarily have to be full millimetres or millimetres per minute.

Fixes #3271.
 2018-03-06 09:37:47 +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
3aa3729635 CURA-4870 Add printer type selector that show the unique name list of 
all the types of printers in a group.
 2018-02-28 13:36:39 +01:00
ChrisTerBeke
01b8bd60bd
Add type hinting 2018-01-25 22:47:02 +01:00
ChrisTerBeke
80b589344f
Add custom command methods to output device and controller 2018-01-25 22:40:30 +01:00
fieldOfView
bc5b5ac283 Implement preheating hotends for USB printing 2018-01-11 15:27:38 +01:00
fieldOfView
fb9d841c90 Add per-extruder preheat controls 
These are lifted from the bed preheat controls and are not functional at the moment
 2018-01-10 21:41:59 +01:00
Jaime van Kessel
eb27695d52 If a reserved job is moved to a printer that can do it, it' s correclty removed from the old printer 
CL-541
 2017-12-22 12:04:02 +01:00
Jaime van Kessel
1719a7b2fe Fixed preheating for Legacy UM3 
CL-541
 2017-12-08 17:16:59 +01:00
Jaime van Kessel
77e3965fc7 Added videostream to cluster again 
CL-541
 2017-12-06 14:59:20 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components 
CL-541
 2017-11-27 15:54:44 +01:00
Jaime van Kessel
52a137a68c Ensured that sidebar has the right properties to show again 
CL-541
 2017-11-27 14:42:45 +01:00
Jaime van Kessel
f570ba046b Added rudimentary jogging controls for UM3 
This needs a bit more love; The machine is a bit stupid when it comes to
moving outside of build area.

CL-541
 2017-11-27 11:02:56 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3 
CL-541
 2017-11-24 11:26:30 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing 
CL-541
 2017-11-24 09:22:50 +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
f987e6d977 Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller. 
It's actually up to the controller to say something about this, so this location makes more sense

CL-541
 2017-11-21 16:59:17 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file 
CL-541
 2017-11-21 16:52:37 +01:00
Jaime van Kessel
34e808d585 PrinterOutputModel now has different extruders if it has more than one. 
It used to just fill the list with references to the first one created.
CL-541
 2017-11-21 16:36:51 +01:00
Jaime van Kessel
b1649f2d38 Added PrintJob handling to ClusterUM3 
CL-541
 2017-11-21 11:01:19 +01:00
Jaime van Kessel
a9f52c2ad6 Added data handling for Connect devices 
CL-541
 2017-11-20 17:00:02 +01:00
Jaime van Kessel
1167fa0a89 Added data handling for legacy printer 
CL-541
 2017-11-20 16:03:54 +01:00