Commit graph

3318 commits

Author SHA1 Message Date
Jaime van Kessel
35a8e7ca94 Added missing decorator
CURA-1385
2016-06-23 11:41:13 +02:00
Jaime van Kessel
d499d59d97 Restored accidental delete 2016-06-23 11:19:54 +02:00
Jaime van Kessel
cd6092581b Removed extraneous space
CURA-1385
2016-06-23 11:17:28 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard
CURA-1385
2016-06-23 11:12:58 +02:00
Jaime van Kessel
a7deb53acf Added BedLevel as supported action to UMO 2016-06-23 11:12:06 +02:00
Jaime van Kessel
45dca3f878 Refactoring (Renaming variables so they are more clear & update documentation) 2016-06-23 11:09:55 +02:00
Jaime van Kessel
23ca2a3f54 Fixed layout issues
CURA-1385
2016-06-22 15:37:22 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages
CURA-1385
2016-06-22 15:35:44 +02:00
Jaime van Kessel
1912722d31 Fixed requesting size of machine for bedLeveling
CURA-1385
2016-06-22 15:35:23 +02:00
Jaime van Kessel
b62118dc1c Added supported actions to all UM machines
CURA-1385
2016-06-22 15:29:54 +02:00
Jaime van Kessel
4e854700f1 Machine_action plugin objects are now added as list
CURA-1385
2016-06-22 15:24:37 +02:00
Jaime van Kessel
5aab4686ca Layout fixes
CURA-1385
2016-06-22 14:50:05 +02:00
Jaime van Kessel
c297b14e03 Added UMO checkup action
CURA-1385
2016-06-22 14:40:58 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run
CURA-1385
2016-06-22 14:39:41 +02:00
Jaime van Kessel
dcafb7d83a Removed Execute, as it's no longer used
CURA-1385
2016-06-22 13:10:10 +02:00
Jaime van Kessel
e1828a7689 Removed stray debug print
CURA-1385
2016-06-22 12:59:35 +02:00
Jaime van Kessel
4ad7731efd Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-22 12:45:29 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled
CURA-1385
2016-06-22 11:49:35 +02:00
Jaime van Kessel
6f6d70ad0f Added upgradeFirmware as machineAction
CURA-1385
2016-06-21 17:00:26 +02:00
fieldOfView
8a206b74fd Use new-style signalemitter decorator instead of SingalEmitter subclass
CURA-1615
2016-06-21 16:24:07 +02:00
Jaime van Kessel
fb1313ceda BedLevel action now resets once it did all the steps
CURA-1385
2016-06-21 16:23:31 +02:00
Jaime van Kessel
671a6105a2 Setting a action to finished also causes it to be reset
CURA-1385
2016-06-21 16:22:54 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed
CURA-1385
2016-06-21 16:19:44 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible
CURA-1385
2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action
CURA-1385
2016-06-21 13:30:36 +02:00
Ghostkeeper
63edd6f74d
Improve default raft settings
Results from materials testing.
2016-06-21 12:57:33 +02:00
Jaime van Kessel
81602e9ccd Machine action can now create displayItems
CURA-1385
2016-06-21 12:47:34 +02:00
Jaime van Kessel
3342f2a76a Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-20 13:52:11 +02:00
Jaime van Kessel
8af2b076a7 Added plugin for UM machine actions
CURA-1385
2016-06-20 13:51:27 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages
CURA-1385
2016-06-20 13:46:05 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
2016-06-20 12:00:56 +02:00
Jaime van Kessel
83c1ee8082 Required/supported/first run actions are now added to the manager
CURA-1385
2016-06-20 10:52:18 +02:00
Jaime van Kessel
6f7affa2bf Machine actions can now be triggered from QML
CURA-1385
2016-06-17 17:22:49 +02:00
Tim Kuipers
db3d568c76 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-17 16:31:22 +02:00
Jaime van Kessel
af3e4e3a15 Machine actions can now be used as a plugin type for Cura
CURA-1385
2016-06-17 15:45:10 +02:00
Jaime van Kessel
4beec2982e Fixed typo
CURA-1385
2016-06-17 15:23:15 +02:00
Jaime van Kessel
78a0c623ef Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-17 14:59:16 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
fieldOfView
68a737129e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 15:09:07 +02:00
fieldOfView
0893e4b2cc Revert "Fix variant vs nozzle"
This reverts commit cb05f75f6a.
2016-06-16 15:08:45 +02:00
fieldOfView
666b1a0263 Revert "Fix check for has_variants & has_materials"
This reverts commit 7f093be75a.
2016-06-16 15:08:20 +02:00
fieldOfView
a5424fa207 Revert "Fix filtering of variants and materials by definition instead of by machine"
This reverts commit 623b8f276e.
2016-06-16 15:08:05 +02:00
Ghostkeeper
60d6cc07fb
Add Mendel90 by Bo Herrmannsen
Provided via https://github.com/Ultimaker/Cura/issues/808
2016-06-16 13:17:41 +02:00
fieldOfView
f2819cb9b0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 12:47:23 +02:00
fieldOfView
623b8f276e Fix filtering of variants and materials by definition instead of by machine
CURA-333
2016-06-16 12:47:08 +02:00
Ghostkeeper
e308c69c54 Merge pull request #804 from thopiekar/master-eclipse-markers
Adding a marker for a correctly unresolved import on Linux and OSX
2016-06-16 11:07:27 +02:00
fieldOfView
7f093be75a Fix check for has_variants & has_materials
These are defined as bool values instead of strings in UM2+ definitions, so I would expect other machine definitions (including jedi) also use bools.

CURA-333
2016-06-16 10:41:50 +02:00
fieldOfView
631ab9c0a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 10:14:49 +02:00
fieldOfView
cb05f75f6a Fix variant vs nozzle
CURA-333
2016-06-16 10:14:17 +02:00
Simon Edwards
98f9b4f9a0 Minor codestyle/naming fix.
Contributes to CURA-1667 Profile import/export
2016-06-16 09:15:34 +02:00