Commit graph

3753 commits

Author SHA1 Message Date
fieldOfView
f083d41353 Update extrudermodel when material is changed
So the swatch updates, and we can use the materialname for extruder selection later on

CURA-333
2016-06-22 09:55:20 +02:00
fieldOfView
d0626f8c8a Add hypothetical multiextrusion printer to test 2016-06-22 09:55:19 +02:00
fieldOfView
825fcc2020 Fix filtering of variants and materials by definition instead of by machine
CURA-333
2016-06-22 09:55:18 +02:00
fieldOfView
ee7cfe273e 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-22 09:55:18 +02:00
fieldOfView
bd703e65af Fix variant vs nozzle
CURA-333
2016-06-22 09:55:17 +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
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
2016-06-21 14:47:10 +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
Thomas Karl Pietrowski
eb6abdf773 Move f.close() into try:
In case urlopen() fails, e.g. because of a missing internet connection,
f will be indefined.
2016-06-18 14:07:14 +02:00
Thomas Karl Pietrowski
8f450d0d2f Sending serialized global_settings
Containers currently don't have a function to return their content as
JSON or dict
2016-06-18 14:05:32 +02:00
Tim Kuipers
0f92f78916 JSON fix: z hop inheritance functions and default value (CURA-1506) 2016-06-17 17:26:23 +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
611c88c630 JSON fix: lil indent (CURA-1506) 2016-06-17 16:52:04 +02:00
Tim Kuipers
94dcacb27e JSON feat: Z Hop only over printed parts and Z Hop Enable (CURA-1506) 2016-06-17 16:51:37 +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
Jaime van Kessel
96e6477793 Print monitoring tab now has icons indicated if it's paused / connected
CURA-1036
2016-06-17 13:06:33 +02:00
Thomas Karl Pietrowski
cbb8eebf72 Correcting and adding different things to SliceInfo
* Replace regular print() with Logger.logException()
* Adding log message that reporting is turned off
* Rename variable "settings" to "global_container_stack". Should be less
misleading.
2016-06-17 12:52:14 +02:00
Thomas Karl Pietrowski
4ca247cf37 Changing the profile name to something unique.
Imported profiles will be now called "Custom profile (<G-code
filename>)"
2016-06-17 12:41:24 +02:00
Thomas Karl Pietrowski
9511692638 Replace old MachineManager with GlobalContainerStack
Also removing unused variable.
2016-06-17 12:10:34 +02:00
Jaime van Kessel
1232ac7df5 Temperatures are now rounded + displayed with celcius sign
CURA-1036
2016-06-17 12:05:23 +02:00
Jaime van Kessel
1f9acf0b54 Color of progress bar now changes based on jobstate
CURA-1036
2016-06-17 12:01:48 +02:00
Thomas Karl Pietrowski
0275139a50 Merge branch 'master' of https://github.com/Ultimaker/Cura into master-CURA-1615 2016-06-17 11:59:08 +02:00
Jaime van Kessel
ef9ce7ad55 Made time total & time remaining pretty
CURA-1036
2016-06-17 11:55:53 +02:00
Thomas Karl Pietrowski
200529e8c9 Removing setReadOnly(False)
The profile is writable by default.
2016-06-17 11:43:23 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
Thomas Karl Pietrowski
65f2afeebd Use the same id as set when exporting
Nothing special. Doesn't fix anything..
2016-06-17 11:36:39 +02:00
Jaime van Kessel
168246d594 Added progress percentage label
CURA-1036
2016-06-17 11:02:22 +02:00
Thomas Karl Pietrowski
29f7c240c4 CURA-1615: Updating SlicingInfoPlugin
Just bumped the API version to 3 and added a message that is sent to the
log that data was sent to the given URL.
As slicing is broken here, because of "Arcus Error (5, native 32): Could
not send message size" this also needs testing here.
2016-06-16 20:37:32 +02:00
Thomas Karl Pietrowski
42a860535c Updating API to 3 2016-06-16 20:19:03 +02:00
Thomas Karl Pietrowski
9e1b10d1b8 CURA-1615: Updating GCodeProfileReader
I got the plugin most of all working. At least the "successfully"
imported profile XY" dialog appears. But sadly the profile does not
appear in the list of profiles after that. I can only guess something is
blocking here.
Additionally it should be noted that G-Code exported from Cura 2.1.x
does not work here anymore on Cura 2.2.x.
2016-06-16 20:02:21 +02:00
Jaime van Kessel
ec34d92500 Resume, pause & abort are handled correctly
CURA-1036
2016-06-16 17:47:05 +02:00
Jaime van Kessel
74c4774092 Fixed print /resume button
CURA-1036
2016-06-16 17:21:16 +02:00
Jaime van Kessel
8d8b479216 Adding pause / resume buttons for print monitoring
CURA-1036
2016-06-16 15:36:51 +02:00
Jaime van Kessel
640e1a2350 Implemented interface for setting printjobstate
CURA-1038
2016-06-16 15:35:11 +02:00
fieldOfView
68a737129e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 15:09:07 +02:00