Lipu Fei
4f28dec884
Fix typo
2017-12-20 13:19:48 +01:00
Lipu Fei
61dd1c98fd
Fix cases with no per-object settings stack
...
CURA-4705
2017-12-20 13:16:29 +01:00
Lipu Fei
b2ac2e0fc7
Trust the stack values more than the decorator
...
CURA-4705
A SceneNode and its decorators can be deepcopied. However, the data in
some decorators will only be updated when a per-object settings stack
triggers a property changed event. That event cannot copied. So, it can
happen that a deepcopied SceneNode has inconsistent data in some of its
decorators than what's in the per-object settings stack.
2017-12-20 12:26:50 +01:00
Ghostkeeper
8734460aff
Use unique name too if importing multiple legacy profiles
...
Otherwise all of them get the same name and they don't match global/extruder stacks together properly any more.
Contributes to issue CURA-4715.
2017-12-19 17:36:20 +01:00
Ghostkeeper
d9bc561d73
Set the extruder metadata to its ID
...
Not the actual extruder!
Contributes to issue CURA-4715.
2017-12-19 17:28:05 +01:00
Jaime van Kessel
37461a7934
Made sendMaterialProfiles protected
...
CL-541
2017-12-19 17:24:30 +01:00
Ghostkeeper
05e232b498
Move LegacyProfileReader-specific logic into the plug-in itself
...
This had the documentation that it should edit the profiles returned by LegacyProfileReader. Instead, just return correct profiles from the reader...
Contributes to issue CURA-4715.
2017-12-19 17:16:32 +01:00
Ghostkeeper
039c85677a
Also return a global profile
...
Since we always have an extruder now, also for single-extrusion printers, we need to return both a global profile and an extruder profile.
Contributes to issue CURA-4713.
2017-12-19 16:40:03 +01:00
Jaime van Kessel
79add4ffd8
Added typing
...
CL-541
2017-12-19 16:15:48 +01:00
Ghostkeeper
569715492c
Correct ID if importing multiple legacy profiles
...
They have to be made unique.
Contributes to issue CURA-4715.
2017-12-19 16:05:42 +01:00
Jaime van Kessel
b4c83814d9
Clean up unused imports
...
CL-541
2017-12-19 16:03:48 +01:00
Jaime van Kessel
32cbd27b70
Fixed the firmware update for USB print
...
CL-541
2017-12-19 15:59:21 +01:00
Aleksei S
3eef50dfb7
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-19 13:19:19 +01:00
Aleksei S
fd6d3e76a3
Simplified upgrade funtion, typos, check extruder count
...
CURA-4708
2017-12-19 13:17:53 +01:00
ChrisTerBeke
b3758be12e
Fix selecting cura connect printer preference
2017-12-19 11:55:08 +01:00
Jaime van Kessel
a35f665201
Fixed crash if the firmware was in the list, but not found.
...
CL-541
2017-12-19 10:45:38 +01:00
Jaime van Kessel
bc8741ef08
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-19 10:40:32 +01:00
Ghostkeeper
8f66db6565
Remove overzealeous log message
...
This message appears on every machine in every material, which is far too much.
2017-12-18 13:29:10 +01:00
fieldOfView
a65edda6be
Fix merge error
2017-12-18 12:50:46 +01:00
fieldOfView
266be74569
Merge branch 'master' into feature_xmlmaterials_cura_settings
...
# Conflicts:
# plugins/XmlMaterialProfile/XmlMaterialProfile.py
2017-12-18 12:47:57 +01:00
Diego Prado Gesto
4a211c6ac6
CURA-4495 Change property name and add default values
2017-12-18 11:58:34 +01:00
Aleksei S
3a5b96b0e9
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-15 18:14:06 +01:00
Aleksei S
54bc7dd348
Version upgrade for nozzle_size
...
CURA-4708
2017-12-15 18:13:29 +01:00
ChrisTerBeke
421d93baa3
Fix potential crash on missing index in extruder dict
2017-12-15 16:30:38 +01:00
Jaime van Kessel
1ae881caee
USB device is first added and then trying to connect.
...
This is to ensure that USB printers work without autodetect
2017-12-15 16:03:58 +01:00
Jaime van Kessel
bd4797404d
Changed showMonitorStage to setActiveStage
...
CL-541
2017-12-15 15:46:15 +01:00
Jaime van Kessel
35d3690b89
Disable UMO checkup action
2017-12-15 15:19:59 +01:00
Jaime van Kessel
0ac48817b2
Added abort, start & pause
...
USL-541
2017-12-15 15:00:10 +01:00
Jaime van Kessel
6bdce54e1d
Enable progress bar for USB printing
...
CL-541
2017-12-15 14:47:06 +01:00
Jaime van Kessel
a6deddb6ae
Added controller for USB printer
...
CL-541
2017-12-15 14:30:01 +01:00
ChrisTerBeke
57651e837f
Fix setting the right extruder temperatures in start and end gcode
2017-12-15 14:17:18 +01:00
Jaime van Kessel
e2845a224c
No longer start print if it's already started
...
CL-541
2017-12-15 14:01:58 +01:00
Jaime van Kessel
aef54f99db
If a print is completed, it's now also updated in UI
...
CL-541
2017-12-15 13:43:19 +01:00
Jaime van Kessel
d3d9a6e1bb
Starting a print with USB printer now works with reworked printeroutputmodel
...
CL-541
2017-12-15 13:25:35 +01:00
ChrisTerBeke
5d27443dd0
Merge pull request #2970 from Ghostkeeper/layerview_backface_culling
...
Layer view backface culling
2017-12-14 19:51:32 +01:00
Jaime van Kessel
d3b9ac0d45
Also start reworking the USBPrint.
...
It's also time for some much needed code cleaning in that bit. The auto-detect is moved to it's own job,
which should make it a whole lot easier to disable it all together.
CL-541
2017-12-14 17:37:57 +01:00
Jaime van Kessel
24bd32477a
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-14 13:03:02 +01:00
Jaime van Kessel
80526893c2
Made setAcceptsCommands protected
...
CL-541
2017-12-14 09:36:31 +01:00
Ruben D
f69375691f
Reduce vertices per tube by 1
...
Since the tubes are symmetrical, instead of using an extra vertex to flip the winding order, I just mirror all horizontal coordinates so that the triangles flip inside out.
2017-12-13 18:58:05 +01:00
Aleksei S
88af41769e
Check multiple models with non_printing settings
...
CURA-4703
2017-12-13 16:04:01 +01:00
Jack Ha
a44cea7ac6
Update log line
2017-12-13 14:48:25 +01:00
Lipu Fei
6e6dc493f1
Fix material loading for unknown names
2017-12-13 12:27:55 +01:00
Aleksei S
c6c4c5be34
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-13 12:03:06 +01:00
Aleksei S
5c5f08e9ca
Do not slice a model if it is only one on a build plane and has setting from non_printing_mesh
...
CURA-4703
2017-12-13 11:58:59 +01:00
Lipu Fei
7cd3449781
Fix material loading
2017-12-13 11:26:16 +01:00
Lipu Fei
e14d78b32a
Generate more possible machine IDs in XML material profile
2017-12-13 10:16:06 +01:00
Ruben D
e36099a380
Draw backside of travel lines inverted
...
This adds a front-facing primitive towards the back side of every travel line, causing those lines to be visible from both sides regardless of backface culling. This doubles the number of vertices for travel moves, but due to backface culling it comes down to approximately the same performance as the original.
2017-12-13 01:44:05 +01:00
Ruben D
79d7de050e
Enable backface culling for layer view
...
This effectively doubles the rendering performance of layer view.
2017-12-13 01:42:24 +01:00
Ruben D
3666b35ff3
Fix winding order of 3D tubes
...
Adding a copy of the first vertex causes the winding order to reverse.
2017-12-13 01:41:36 +01:00
Jack Ha
e10ba065ca
CURA-4707 better signal to connect solving this issue
2017-12-12 17:06:23 +01:00
