Commit graph

3427 commits

Author SHA1 Message Date
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
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Jaime van Kessel
f03a978781 Sending & compressing g-codes re-added to LegacyUM3
CL-541
2017-11-23 14:19:54 +01:00
Jack Ha
5703f954d4 CURA-4552 fix support for relative extrusion 2017-11-23 14:13:18 +01:00
Lipu Fei
033cc4fbc7 Fix quality update in project loading
CURA-4613
2017-11-23 14:12:41 +01:00
Jaime van Kessel
8b8d67b3a8 LegacyUM3 now handles warnings & errors again
CL-541
2017-11-23 13:37:59 +01:00
Lipu Fei
1db448d7d8 Use the correct quality container for global stacks loaded from project files
CURA-4613
2017-11-23 13:04:06 +01:00
Lipu Fei
3148027fbe Fix version upgrade for quality_changes
CURA-4613

Explained in the code comments.
2017-11-23 12:43:14 +01:00
Lipu Fei
18c7a5acf3 Pass optional file_name for deserialization
CURA-4613

Some upgrades depend on the file_name, so the file_name is needed in
this case.
2017-11-23 11:28:16 +01:00
Jack Ha
f09f73a586 Merge branch '3.1' 2017-11-23 10:49:42 +01:00
Mark
aee838c8c1 Merge branch '3.1' 2017-11-23 10:38:48 +01:00
Jaime van Kessel
96d5c7152b Added sending material profiles to LegacyUM3
CL-541
2017-11-23 10:31:39 +01:00
Diego Prado Gesto
b97ed4c211 CURA-4609 Minor improvements in Simulation View:
Increase simulation speed.
Hide Layer Thickness option in color scheme.
Hide nozzle when switching layers.
Set the handles in front of the view.
Name changed back to "Layer View"
2017-11-23 09:59:34 +01:00
Ghostkeeper
105d7a5615
Return newly added single extruder
The workspace reader needs to use it to get the correct material.

Contributes to issue CURA-4604.
2017-11-22 17:12:53 +01:00
Ghostkeeper
dfe29fa482
Merge branch '3.1' 2017-11-22 12:41:57 +01:00
Lipu Fei
9fab4070a6 Fix quality_changes upgrade from 2.7 to 3.1 2017-11-22 12:11:18 +01:00
Jaime van Kessel
7465a6551a Setup the authentication stuff for LegacyUM3
CL-541
2017-11-22 11:59:07 +01:00
Diego Prado Gesto
10ec02840e Merge branch 'feature_simulation_ux_tweaks' of https://github.com/fieldOfView/Cura into fieldOfView-feature_simulation_ux_tweaks 2017-11-22 09:55:57 +01:00
Diego Prado Gesto
72954e758c CURA-4593 Workaround to fix the rendering glitches when the last layer has no data 2017-11-21 17:15:07 +01:00
fieldOfView
863b40b900 Merge branch 'master' into feature_simulation_ux_tweaks
# Conflicts:
#	plugins/SimulationView/SimulationView.qml
2017-11-21 16:49:41 +01:00
ChrisTerBeke
0625d22e04 Fix update script for single extrusion quality changes - CURA-4482 2017-11-21 16:43:05 +01:00
Jaime van Kessel
d8b12be5e4 LegacyUM3 now correctly gets material set
CL-541
2017-11-21 16:26:17 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again
CL-541
2017-11-21 15:12:23 +01:00
Jaime van Kessel
9cfe9769d3 Printers now automatically try to connect again
CL-541
2017-11-21 14:47:55 +01:00
Jaime van Kessel
3f1167a7d2 Results in printer discovery are sorted again
CL-541
2017-11-21 14:39:03 +01:00
Jaime van Kessel
a8e71cf50c NetworkManager is now created on demand and re-created after a certain timeout.
CL-541
2017-11-21 14:35:17 +01:00
Diego Prado Gesto
d415c5fcbb CURA-4526 Add transparency to the nozzle so the user can see the lines
and layers through the nozzle.
2017-11-21 13:42:46 +01:00
Diego Prado Gesto
f216e2df24 Merge branch '3.1_with_simulation_view' into 3.1 2017-11-21 13:31:18 +01:00
Diego Prado Gesto
abe9ba3795 CURA-4526 Stop simulation when changing preferences.
Hide nozzle node when in compatibility mode.
2017-11-21 13:23:47 +01:00
Ghostkeeper
def7b6994d
Store correct ID in metadata after deserialising
Contributes to issue CURA-4243.
2017-11-21 12:50:10 +01:00