Commit graph

3065 commits

Author SHA1 Message Date
ChrisTerBeke
08322d0a5e Move all decorators in the scene subfolder 2018-01-03 15:09:19 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Ghostkeeper
1aebe32ba6
Fix winding order of left endpoint triangles
Otherwise the left side is invisible due to backface culling.
2018-01-02 16:16:52 +01:00
Lipu Fei
b246a102ed Fix MachineSettings dialog
CURA-4708

- Move material diameter and nozzle size to extruder tabs
- Fix value bindings
2018-01-02 12:40:43 +01:00
Lipu Fei
16dfc094eb Fix version upgrade 30 to 31
CURA-4708

A merge mistake. No need to be there.
2018-01-02 10:47:21 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks 2018-01-02 10:41:44 +01:00
Ghostkeeper
719bd5a707
Fix slicing non-printable meshes that fall outside of build volume
Non-printable meshes don't care whether they are in the build volume or not.

Contributes to issue CURA-4734.
2017-12-29 18:08:58 +01:00
Ghostkeeper
4b9ddc186a
Code style: Space after binary operator
Contributes to issue CURA-4672.
2017-12-28 14:28:12 +01:00
Aleksei S
d0a3575c0c Don't print the model if it is outside of the buildplate
CURA-4734
2017-12-22 14:48:45 +01:00
Lipu Fei
2cffb1759f Revert "Version upgrade for nozzle_size"
This reverts commit 54bc7dd348.

CURA-4708
2017-12-22 13:30:06 +01:00
Lipu Fei
26a136f7c5 Revert "Simplified upgrade funtion, typos, check extruder count"
This reverts commit fd6d3e76a3.

CURA-4708
2017-12-22 13:29:55 +01:00
ChrisTerBeke
b29047abd3 Small fixes for disable user data triggering preferences window 2017-12-22 11:38:56 +01:00
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
Jack Ha
2c831ceb05 For this version, send all build plates. No print view when multiple build plates. CURA-4525 2017-12-21 15:47:40 +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
Jack Ha
c05e6b43ff Fixed platform physics. CURA-4525 2017-12-21 13:11:32 +01:00
Lipu Fei
eaa27114c6 Fix ID changing in project loading 2017-12-21 12:43:50 +01:00
Jack Ha
a47107448e Moved objects menu to lower left and made it collapsible. CURA-4525 2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +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