3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-05 17:01:50 +02:00
commit 5293f3abcb
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/LayerPolygon.py
View file

@ -14,6 +14,7 @@ class LayerPolygon:
SupportInfillType = 7 SupportInfillType = 7
MoveCombingType = 8 MoveCombingType = 8
MoveRetractionType = 9 MoveRetractionType = 9
SupportInterfaceType = 10
__jump_map = numpy.logical_or( numpy.arange(10) == NoneType, numpy.arange(10) >= MoveCombingType ) __jump_map = numpy.logical_or( numpy.arange(10) == NoneType, numpy.arange(10) >= MoveCombingType )
@ -178,10 +179,11 @@ class LayerPolygon:
SkinType: Color(1.0, 1.0, 0.0, 1.0), SkinType: Color(1.0, 1.0, 0.0, 1.0),
SupportType: Color(0.0, 1.0, 1.0, 1.0), SupportType: Color(0.0, 1.0, 1.0, 1.0),
SkirtType: Color(0.0, 1.0, 1.0, 1.0), SkirtType: Color(0.0, 1.0, 1.0, 1.0),
InfillType: Color(1.0, 0.74, 0.0, 1.0), InfillType: Color(1.0, 0.75, 0.0, 1.0),
SupportInfillType: Color(0.0, 1.0, 1.0, 1.0), SupportInfillType: Color(0.0, 1.0, 1.0, 1.0),
MoveCombingType: Color(0.0, 0.0, 1.0, 1.0), MoveCombingType: Color(0.0, 0.0, 1.0, 1.0),
MoveRetractionType: Color(0.5, 0.5, 1.0, 1.0), MoveRetractionType: Color(0.5, 0.5, 1.0, 1.0),
SupportInterfaceType: Color(0.25, 0.75, 1.0, 1.0),
} }
# Should be generated in better way, not hardcoded. # Should be generated in better way, not hardcoded.
@ -192,8 +194,9 @@ class LayerPolygon:
[1.0, 1.0, 0.0, 1.0], [1.0, 1.0, 0.0, 1.0],
[0.0, 1.0, 1.0, 1.0], [0.0, 1.0, 1.0, 1.0],
[0.0, 1.0, 1.0, 1.0], [0.0, 1.0, 1.0, 1.0],
[1.0, 0.74, 0.0, 1.0], [1.0, 0.75, 0.0, 1.0],
[0.0, 1.0, 1.0, 1.0], [0.0, 1.0, 1.0, 1.0],
[0.0, 0.0, 1.0, 1.0], [0.0, 0.0, 1.0, 1.0],
[0.5, 0.5, 1.0, 1.0] [0.5, 0.5, 1.0, 1.0],
[0.25, 0.75, 1.0, 1.0]
]) ])

1
plugins/CuraEngineBackend/Cura.proto
View file

@ -56,6 +56,7 @@ message Polygon {
SupportInfillType = 7; SupportInfillType = 7;
MoveCombingType = 8; MoveCombingType = 8;
MoveRetractionType = 9; MoveRetractionType = 9;
SupportInterfaceType = 10;
} }
Type type = 1; // Type of move Type type = 1; // Type of move
bytes points = 2; // The points of the polygon, or two points if only a line segment (Currently only line segments are used) bytes points = 2; // The points of the polygon, or two points if only a line segment (Currently only line segments are used)

2
resources/definitions/fdmprinter.def.json
View file

@ -3519,7 +3519,7 @@
}, },
"experimental": "experimental":
{ {
"label": "Experimental Modes", "label": "Experimental",
"type": "category", "type": "category",
"icon": "category_experimental", "icon": "category_experimental",
"description": "experimental!", "description": "experimental!",