3036 Commits

Author SHA1 Message Date
Aleksei S
c3954c40ac Merge branch 'master' of github.com:Ultimaker/cura 2017-12-21 16:25:54 +01:00
Aleksei S
447c6e7e23 Added Disable link style
CURA-4630
2017-12-21 16:25:13 +01:00
Lipu Fei
df1d3bf569 Add fix and doc for Mac OpenGL crash
CURA-4726
2017-12-21 15:43:35 +01:00
alekseisasin
84a24a582c
Merge pull request #2865 from Ultimaker/feature_decline_slice_info
Add button to disable sending anonymous information
2017-12-21 15:30:49 +01:00
Lipu Fei
eaa27114c6 Fix ID changing in project loading 2017-12-21 12:43:50 +01:00
alekseisasin
d7146a90f5
Merge branch 'master' into feature_decline_slice_info 2017-12-21 10:24:35 +01:00
Lipu Fei
107f6aff78 Fix SolidView to use isNonPrintingMesh decorator call
CURA-4705
2017-12-20 16:48:57 +01:00
Lipu Fei
ae86a838e0 Update extruder count model in MachineSettings dialog
CURA-4722
2017-12-20 16:23:39 +01:00
Lipu Fei
6d06d18407 Fix Extruder tabs in MachineSettings dialog
CURA-4722

The extruder field views should be bound to the actual extruder, not the
active extruder.
2017-12-20 13:58:02 +01:00
Lipu Fei
49ee2a543e Fix code style 2017-12-20 13:57:48 +01:00
Lipu Fei
196bffd3ad Only try to get a new unique name when it already exists
CURA-4704
2017-12-20 13:20:24 +01:00
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
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
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
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
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
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
ChrisTerBeke
57651e837f Fix setting the right extruder temperatures in start and end gcode 2017-12-15 14:17:18 +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
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
Jack Ha
a85bea4bae CURA-4707 fix extruder setting not triggering reslice 2017-12-12 16:37:21 +01:00
Diego Prado Gesto
d70bd0ebc9 CURA-4649 Blocking printers that have localhost IP address. 2017-12-12 13:45:35 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server' 2017-12-11 15:51:17 +01:00
Lipu Fei
c6cdc1d1db Container cfg files need to be parsed without interpolation
CURA-4701
2017-12-11 14:35:27 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
ChrisTerBeke
baea9eb1e0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-12-08 14:56:18 +01:00
ChrisTerBeke
c4d7a33c31 Monitor view component loader should have width and height from parent 2017-12-08 14:56:03 +01:00
Ghostkeeper
e621ace3e4
Remove unnecessarily setting definition
This definition is included in the metadata of container 2.

Contributes to issue CURA-4243.
2017-12-08 12:42:19 +01:00
Lipu Fei
b4e7216f5b Always show extruder tabs in Machine Settings dialog
CURA-4693
2017-12-08 11:08:24 +01:00