ChrisTerBeke
67d6b6ab6f
Merge branch '3.1'
2017-11-27 17:36:41 +01:00
ChrisTerBeke
0e2f60f18b
Fix toggling UM2 upgrades on extruder 0 - CURA-4626
2017-11-27 17:35:57 +01:00
ChrisTerBeke
a072af5585
Merge branch '3.1'
2017-11-27 17:17:02 +01:00
Jaime van Kessel
83b13546fb
Moved compressing of GCode to one class higher
...
CL-541
2017-11-27 17:12:36 +01:00
Diego Prado Gesto
cab2e14728
CURA-4552 Add flavors to GCodeReader. The preRead looks for the flavor
...
in the GCode and then the right flavor handler is responsible for
reading the code. At this moment just the Griffin and RepRap flavors are
taken into account.
2017-11-27 16:56:26 +01:00
Jaime van Kessel
c6f2e167e2
Renamed some missed properties
...
CL-541
2017-11-27 16:02:55 +01:00
Jaime van Kessel
6f495f2d8b
Cluster monitor now uses material name
...
This matches better with what Cura does.
CL-541
2017-11-27 16:00:57 +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
Lipu Fei
33a06e13a9
Remove legacy if check in project loading
...
CURA-4617
2017-11-27 14:27:11 +01:00
Ghostkeeper
54a12d14c4
Add string representation for debugging
...
My IDE shows the str(inst) representation of an object when indicating what value is in there. This makes it easier to find stuff. It'll also make debug prints more clear than the default <XmlMaterialProfile.XmlMaterialProfile.XmlMaterialProfile object at 0x12345678> stuff of Python.
Contributes to issue CURA-4243.
2017-11-27 14:19:30 +01:00
Lipu Fei
49cac860a8
Fix project loading
...
CURA-4617
2017-11-27 14:17:13 +01:00
Jaime van Kessel
7d9af8e345
Added Opencontrol panel functions
...
CL-541
2017-11-27 14:13:30 +01:00
Jaime van Kessel
cdfdaec492
ClusterUM3 now uses local material data as first source
...
CL-541
2017-11-27 14:03:53 +01:00
Ghostkeeper
17a25f98a4
Merge branch '3.1'
2017-11-27 13:58:52 +01:00
Jaime van Kessel
f791b53ad8
Enabled monitor items for ClusterOutputDevice again
...
CL-541
2017-11-27 13:54:34 +01:00
Jaime van Kessel
083eee2e9d
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-11-27 13:43:39 +01:00
Jaime van Kessel
0613b1e4b7
Creating components is now done with the prefab function
...
CURA-4568
2017-11-27 13:00:49 +01:00
Lipu Fei
828fff5ee5
Fix quality check in project loading
...
CURA-4617
2017-11-27 12:04:21 +01:00
Lipu Fei
46c6c6aa9b
Fix quality profile in project loading
...
CURA-4617
2017-11-27 11:19:40 +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
Ghostkeeper
a2b0c4535c
Only load metadata of machines for derived profiles
...
We only need the metadata of these machines (now that the ID is in the metadata). We won't need all of those machines because some of them are not added.
Contributes to issue CURA-4243.
2017-11-27 10:55:51 +01:00
Lipu Fei
4a4f01f9eb
Fix resetting not supported profiles for project loading
...
CURA-4617
2017-11-27 10:52:29 +01:00
Ghostkeeper
9571181178
Fix ID of derived materials
...
Because the ID is now in the metadata it would get overwritten by this deep copy. We need to set it again.
Contributes to issue CURA-4243.
2017-11-27 10:37:54 +01:00
Jaime van Kessel
00eeb835ac
ManualPrinterControl uses correct functions again
...
CL-541
2017-11-27 10:22:30 +01:00
ChrisTerBeke
8082c092e5
Fix setting extruder definition in user changes container
2017-11-27 09:54:10 +01:00
Ghostkeeper
aa52b9682e
Fix adding name when loading complete material file
...
Also, don't use setName since that only operates on the base file and sends out unnecessary signals.
Contributes to issue CURA-4243.
2017-11-27 09:10:55 +01:00
fieldOfView
bc9d31ccbc
Allow postprocessing before sending data to the printer
...
Fixes https://github.com/Ultimaker/Cura/issues/2855
Also see 91e8ac6868
2017-11-26 21:44:09 +01:00
Diego Prado Gesto
fa00a17c78
Make UI changes in the Simulation View for adapting the color gradient
...
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Ghostkeeper
ebe766a7c8
Set definition by their ID
...
The new function for setting the definition just adds the ID to the metadata.
Contributes to issue CURA-4243.
2017-11-24 16:45:09 +01:00
Diego Prado Gesto
d0c1569da6
Merge branch 'fieldOfView-feature_simulation_ux_tweaks'
2017-11-24 15:48:39 +01:00
Ghostkeeper
147cbdf592
Clarify translations of 'unknown'
...
For some languages, the gender matters.
Contributes to issue CURA-4601.
2017-11-24 13:16:14 +01:00
Diego Prado Gesto
1ea9379913
CURA-4609 Fix qml rectangle background in feedrate color scheme.
2017-11-24 13:02:11 +01:00
Jaime van Kessel
57de028608
re-implemented abort & pause for legacy um3
...
CL-541
2017-11-24 11:26:30 +01:00
Diego Prado Gesto
bf1ecba641
Add the layer thickness back to the color options in Simulation View
2017-11-24 10:54:20 +01:00
Diego Prado Gesto
c8c2129b7e
CURA-4552 Minor changes
2017-11-24 10:51:34 +01:00
ChrisTerBeke
46a575b84f
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165
Merge branch '3.1'
2017-11-24 10:31:22 +01:00
Jaime van Kessel
219e285b20
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-11-24 09:23:21 +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
4597bb09ed
Added (short) description & priority to legacy output device.
...
CL-541
2017-11-23 17:08:22 +01:00
Jaime van Kessel
1c2c4d4163
Added property to indicate if output device accepts commands
...
Instead of how this was previously done, it's now tied to the auth state.
CL-541
2017-11-23 17:07:24 +01:00
Diego Prado Gesto
7bb82cf56f
CURA-4605 Fix render issues when importing a GCode that has empty
...
layers. Also fix gaps between raft and the model.
2017-11-23 16:47:34 +01:00
Lipu Fei
6b3e130349
Fix edge cases with ultimaker2 and whatever other machines that may get affected
...
CURA-4617
2017-11-23 16:28:36 +01:00
Jaime van Kessel
d0c7352be6
Added missing authentication_succeeded_message attribute to constructor
...
CL-541
2017-11-23 16:16:57 +01:00
Ghostkeeper
1e07325d8f
Remove unused getIdsFromFile
...
Since we now return all metadata at once from every file, we don't need this any more. We need to side-load the metadata anyway.
Contributes to issue CURA-4243.
2017-11-23 16:11:02 +01:00
Diego Prado Gesto
f0dca021d8
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
2017-11-23 15:42:02 +01:00
Diego Prado Gesto
2c6b2b869e
CURA-4605 Fix render issues when there are empty layers.
...
Fix layer gap when raft is enabled.
2017-11-23 15:39:22 +01:00
Lipu Fei
ef37f0d8c7
Fix project loading to reset quality if it doesn't exist
...
CURA-4617
2017-11-23 15:35:33 +01:00
Ghostkeeper
3ee2e0488f
Only load metadata when finding hotends belonging to material
...
We only need to have the hotend metadata.
Contributes to issue CURA-4243.
2017-11-23 15:31:22 +01:00