Commit graph

23379 commits

Author SHA1 Message Date
fieldOfView
f3c1f947d4 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-07-01 15:07:28 +02:00
fieldOfView
ea3a039bdd Automatically show the Print Monitor when starting a print
CURA-1036
2016-07-01 15:07:17 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print
CURA-1036
2016-07-01 15:06:49 +02:00
fieldOfView
6800991fa1 Fix USBPrinterOutputDevice to work with the Print Monitor
CURA-1036
2016-07-01 14:32:40 +02:00
fieldOfView
c9b2a1d938 Properly prevent warning when no printer is connected.
CURA-1036
2016-07-01 11:51:46 +02:00
Jaime van Kessel
b06e61727c ZOffset decorator is now correctly copied
CURA-1504
2016-07-01 11:39:47 +02:00
Jaime van Kessel
095dbaaa8d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 11:04:54 +02:00
Jaime van Kessel
91bfd2de27 Force focus instead of requesting it.
Fixes CURA-1778
2016-07-01 11:04:23 +02:00
fieldOfView
1466cb961d Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-01 10:12:30 +02:00
fieldOfView
fea534509e Fix two "critical errors" on startup
CuraMachineManager.isGlobalStackValid would return None on startup, which qml does not like.

CURA-1585
2016-07-01 10:12:11 +02:00
Jaime van Kessel
8b46dd197f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 09:52:52 +02:00
Jaime van Kessel
aaae2aa3d5 Minor check machine action GUI improvements
CURA-1385
2016-07-01 09:51:54 +02:00
Tim Kuipers
c8e61a3267 JSON feat: cubic isometric infill (CURA-1723) 2016-07-01 00:56:48 +02:00
Tim Kuipers
bcffa3f09a JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723)
just putting this commit under that issue so that it will be reviewed...
2016-07-01 00:39:04 +02:00
fieldOfView
58ae1e923c Prevent warning when no printer is connected.
CURA-1036
2016-06-30 19:13:46 +02:00
fieldOfView
a7939c6f3d Fix empty material/quality profiles when switching variants
CURA-1278
2016-06-30 18:53:50 +02:00
Arjen Hiemstra
eb48a4e768 Set the new metadata when editing a material
Contributes to CURA-342
2016-06-30 17:32:43 +02:00
Arjen Hiemstra
ded4c89cb5 Ensure metadata changes are propagated to the related containers
Now we properly serialize the new metadata

Contributes to CURA-342
2016-06-30 17:32:10 +02:00
Arjen Hiemstra
92d3bea229 Add a setContainerMetaDataEntry to ContainerManager
So that we can set metadata from QML

Contributes to CURA-342
2016-06-30 17:31:19 +02:00
Arjen Hiemstra
8badb061da Check for definition_id, not variant name
Since the dict is supposed to be per definition

Contributes to CURA-342
2016-06-30 15:08:00 +02:00
Arjen Hiemstra
343280103f Fix GUID of materials
Contributes to CURA-342
2016-06-30 15:07:17 +02:00
Jaime van Kessel
462bc4aef5 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-06-30 14:57:27 +02:00
Jaime van Kessel
bfc7a7e3c9 Multipart data objects used for posting new materials are now deleted upon completion
CURA-344
2016-06-30 14:56:36 +02:00
Jaime van Kessel
ca79e398c8 All known materials are now send upon connection
Due to garbage collection issues, the (multi) part requests are now cached.
CURA-334
2016-06-30 14:25:54 +02:00
daid
f08b25b7ea Update generic_pla.xml.fdm_material
EM-601
2016-06-30 13:06:28 +02:00
daid
53d71e302e Update generic_cpe.xml.fdm_material
EM-601
2016-06-30 13:05:47 +02:00
daid
da726dd3e7 Update generic_abs.xml.fdm_material
EM-601
2016-06-30 13:05:23 +02:00
fieldOfView
dc2384c92d Disable monitor buttons when there is no job running
CURA-1036
2016-06-30 11:15:32 +02:00
fieldOfView
43a3ea853a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-30 11:03:17 +02:00
fieldOfView
3ea4983a23 Move message stack "above" the viewport overlay
CURA-1036
2016-06-30 11:02:15 +02:00
fieldOfView
7ec605579e Introduce printing/busy status and make monitor i18n-aware
CURA-1036
2016-06-30 10:20:19 +02:00
fieldOfView
7d962e97c4 Change monitor progress to percentages
CURA-1036
2016-06-30 10:18:10 +02:00
fieldOfView
f2187e4f6a Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-06-30 09:54:28 +02:00
fieldOfView
79ee928883 Change progress to percentages
CURA-1036
2016-06-30 09:54:08 +02:00
Jaime van Kessel
a4117bd3be Display data is reset upon job completion 2016-06-30 09:52:48 +02:00
Jaime van Kessel
b9f73a8eef Hiding messages is now only done when there are messages
CURA-49
2016-06-30 09:35:57 +02:00
Simon Edwards
551dc7d757 Fixes for the problem where duplicated objects were broken, missing hull 'shadows' or would fly off the build plate.
Contributes to CURA-1504 Improve performance/simplicity by using Convex Hulls in Scene Graph
2016-06-30 09:35:41 +02:00
Arjen Hiemstra
26f7ba0a74 Fix up XmlMaterialProfile::serialize so we can properly serialize duplicated materials
We now use GUID to look up all containers belonging to a material. In
addition, we handle the multiple containers better

Contributes to CURA-342
2016-06-30 01:57:58 +02:00
Arjen Hiemstra
ee0160075e Override InstanceContainer::duplicate in XmlMAterialProfile
So that we can set a new GUID for the material on duplicate

Contributes to CURA-342
2016-06-30 01:55:53 +02:00
Arjen Hiemstra
419326132f Use ContainerPropertyProvider to provide properties for the materials page
Contributes to CURA-342
2016-06-30 01:54:58 +02:00
Arjen Hiemstra
3798a6e26a Update MaterialsPage with the new way of handling buttons
Contributes to CURA-342
2016-06-30 01:54:25 +02:00
Arjen Hiemstra
cd8bc3b60d Introduce a ContainerManager class to handle container actions like duplicate
Because MachineManager is getting rather large

Contributes to CURA-342
2016-06-30 01:53:48 +02:00
Tim Kuipers
4885238103 JSON feat: machine_min_cool_heat_time_window (CURA-1783) 2016-06-29 14:53:13 +02:00
Tim Kuipers
911f80f237 JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting 2016-06-29 14:52:39 +02:00
Jaime van Kessel
12dcc43bac Added messages upon succesfull & not sucessfull pairing
CURA-49
2016-06-29 13:45:29 +02:00
Jaime van Kessel
57ea4f0dc8 Updated auth timeout to 5 min 2016-06-29 13:33:31 +02:00
Jaime van Kessel
58c3f5dc89 Closing the networkprinteroutput device now hides all it's messages
CURA-49
2016-06-29 13:31:42 +02:00
Jaime van Kessel
5597f6dcf2 Authentication is now saved with machine-instance
CURA-49
2016-06-29 13:19:05 +02:00
Jaime van Kessel
ebda94b7dc Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-06-29 12:12:29 +02:00
Jaime van Kessel
368d4e9ea2 Updated documentation
CURA-49
2016-06-29 12:12:12 +02:00