Commit graph

336 commits

Author SHA1 Message Date
Jaime van Kessel
f3384b043d Only variants of active machine are now shown
CURA-1278
2016-05-13 11:26:08 +02:00
Jaime van Kessel
b3e741e90c Added variant selection
CURA-1278
2016-05-13 10:16:58 +02:00
Jaime van Kessel
f5e63f2e71 Changing the material is now possible
CURA-1278
2016-05-12 17:38:43 +02:00
Jaime van Kessel
89c0644e4b Added activeMaterial property
CURA-1278
2016-05-12 17:01:47 +02:00
Jaime van Kessel
44f5559db3 Moved addMachine to machineManager
CURA-1278
2016-05-12 15:18:13 +02:00
Jaime van Kessel
a16acddff1 Removed unused code
CURA-1278
2016-05-12 11:59:23 +02:00
Jaime van Kessel
78e9545ece Machines can now be removed
CURA-1278
2016-05-12 11:46:28 +02:00
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura
CURA-1278
2016-05-12 11:24:09 +02:00
Jaime van Kessel
66a29a2f1c Added name for active machine
CURA-1278
2016-05-11 16:21:09 +02:00
Jaime van Kessel
f91a4f9369 Moved registration of MachineManager model to before QML is read
Else the model is undefined on first run, which caused a number of silly issues.
CURA-1278
2016-05-11 16:13:30 +02:00
Jaime van Kessel
573c1c1a5a Added MachineManagerModel to Cura
CURA-1278
2016-05-11 15:35:41 +02:00
Jaime van Kessel
fa8fbb2560 Added global only to setting type for CuraApplication
CURA-1278
2016-05-10 14:42:53 +02:00
Jaime van Kessel
bdccab4b60 Re-added BuildVolume
CURA-1278
2016-05-10 14:35:45 +02:00
Jaime van Kessel
5fdd0e8156 BuildVolume no longer crashes when width/height/depth is None
CURA-1278
2016-05-10 14:34:07 +02:00
Jaime van Kessel
67b6c5aa29 Re-added platform again
CURA-1278
2016-05-10 13:47:27 +02:00
Jaime van Kessel
170df747b3 Use globalContainer stack instead of activeInstance
CURA-1278
2016-05-10 11:40:36 +02:00
Jaime van Kessel
04f1e8d27c Renames to from activeStack to global stack
CURA-1278
2016-05-10 11:16:35 +02:00
Jaime van Kessel
dbd2c911ce Renamed active containerstack to global containerstac
Cura-1278
2016-05-10 10:34:02 +02:00
Jaime van Kessel
c0c24f1f70 BuildVolume now uses StackContainer
CURA-1278
2016-05-10 09:36:48 +02:00
Arjen Hiemstra
44246c0676 Comment out all things that use settings related things so we can at least start 2016-05-09 12:06:11 +02:00
Jaime van Kessel
4e722d61ce Removed unused code 2016-04-28 15:28:50 +02:00
Ghostkeeper
fe68be4f62 Merge branch 'connection_rework' 2016-04-26 11:51:09 +02:00
Thomas-Karl Pietrowski
37ba88351a Adding marker for the Nvidia workaround 2016-04-19 20:24:56 +02:00
Arjen Hiemstra
c2ac0e8217 Fix resource paths after Uranium API change
Contributes to CURA-1390
2016-04-19 18:11:11 +02:00
Jaime van Kessel
02e02a8f98 Added way to update the head position
CURA-1339
2016-04-19 15:30:34 +02:00
Jaime van Kessel
d33a75906a Progress is now only emitted if it changed
CURA-1339
2016-04-19 12:04:22 +02:00
Jaime van Kessel
a59c113887 Added busy & error state to ConnectionState
CURA-1339
2016-04-18 14:47:51 +02:00
Jaime van Kessel
fb52d39936 Changed enum values to lowerCamelCase
CURA-1339
2016-04-18 14:43:04 +02:00
Jaime van Kessel
96e821cc3d PrinterOutputDevice now uses safer super().__init
CURA-1339
2016-04-18 13:27:36 +02:00
Jaime van Kessel
6ad926b9b8 connect & close are now pure virtual
CURA-1339
2016-04-18 11:38:57 +02:00
Jaime van Kessel
0015d9d027 Documented signals
CURA-1339
2016-04-18 11:37:08 +02:00
Jaime van Kessel
94d3309a35 Removed duplicate bedTemperature declaration
CURA-1339
2016-04-18 11:33:43 +02:00
Jaime van Kessel
c2b1753d25 Updated documentation
CURA-1339
2016-04-14 15:59:10 +02:00
Jaime van Kessel
6f7b80299e Added warning logging
CURA-1339
2016-04-14 15:46:16 +02:00
Jaime van Kessel
fc88844cf8 Added relative move option
CURA-1339
2016-04-14 14:05:36 +02:00
Jaime van Kessel
9e8d61aea2 Added missing pyqtslot decorator
CURA-1339
2016-04-14 13:03:54 +02:00
Jaime van Kessel
ceb8ef86f8 Added home bed & head functions
CURA-1339
2016-04-14 11:00:03 +02:00
Jaime van Kessel
45b3e8fbd6 Hotend temperatures now follow same logic as bed
CURA-1339
2016-04-13 16:56:44 +02:00
Jaime van Kessel
5ff5a957ae Added _setBedTemperature
CURA-1339
2016-04-13 16:08:17 +02:00
Jaime van Kessel
2b9aa1dbb5 PrinterOutput device now uses connection state
This is instead of the multiple booleans that were used in USB printer

CURA-1339
2016-04-13 15:09:25 +02:00
Jaime van Kessel
5830690107 Added setter for progress
CURA-1339
2016-04-13 14:11:18 +02:00
Jaime van Kessel
598c5be976 Temperatures are now stored in the class
CURA-1339
2016-04-13 14:08:10 +02:00
Arjen Hiemstra
9b88f06970 Merge branch '2.1' 2016-04-13 13:53:51 +02:00
Jaime van Kessel
0f097f0f64 Added property for target bed temp
CURA-1339
2016-04-13 13:48:32 +02:00
Jaime van Kessel
f963ad5021 Renamed _setBedTemperature to setTargetBedTemperature
CURA-1339
2016-04-13 13:46:10 +02:00
Jaime van Kessel
623596ca59 Added isConnecting
CURA-1339
2016-04-13 13:45:07 +02:00
Jaime van Kessel
e5adea4ab2 PrinterOutputdevice is now also a QObject
CURA-1339
2016-04-13 13:36:22 +02:00
Jaime van Kessel
70eb042895 More fleshing out of the printerOutputDevice
CURA-1339
2016-04-13 13:31:18 +02:00
Jaime van Kessel
8e853ffecb Added documentation
CURA-1339
2016-04-13 13:19:57 +02:00
Jaime van Kessel
a4314638ab Added delete to printerOutput device to ensure it is properly closed
CURA-1339
2016-04-13 09:57:36 +02:00