From 616f2f4dc1a0b39246d72ac79403a7e8692dbb7c Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Sun, 23 Nov 2014 08:13:51 -0800 Subject: [PATCH] Put in an option to set the extruder to use for the raft. --- PartPreviewWindow/View3D/View3DWidget.cs | 2 +- .../SlicerMapping/EngineMappingMatterSlice.cs | 2 ++ StaticData/PrinterSettings/config.ini | 1 + StaticData/SliceSettings/Layouts.txt | 1 + StaticData/SliceSettings/Properties.json | 7 +++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index d8118c5af..8cae9c781 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -263,7 +263,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow GL.MatrixMode(MatrixMode.Modelview); GL.PushMatrix(); - GL.Translate(new Vector3(centerTop.x, centerTop.y, centerTop.z + 5*scalling)); + GL.Translate(new Vector3(centerTop.x, centerTop.y, centerTop.z + 20*scalling)); GL.Scale(scalling, scalling, scalling); RenderMeshToGl.Render(upArrow, RGBA_Bytes.Black, RenderTypes.Shaded); diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index ff1ddc385..8641a75c1 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -236,6 +236,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration //supportExtruder=1 new ValuePlusConstant("supportExtruder", "support_material_extruder", -1), + new ValuePlusConstant("raftExtruder", "raft_extruder", -1), + //supportLineSpacing=2 new MapItem("supportLineSpacing", "support_material_spacing"), diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index dea5cdb64..698905474 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -82,6 +82,7 @@ perimeters = 3 post_process = print_center = 100,100 raft_air_gap = .2 +raft_extruder = 0 raft_extra_distance_around_part = 5 raft_fan_speed_percent = 100 raft_layers = 0 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index cdd18003e..09c420d99 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -122,6 +122,7 @@ Advanced raft_air_gap raft_layers raft_fan_speed_percent + raft_extruder Brim brim_width Support Material diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 183f29c4b..b4b5b1dec 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -855,6 +855,13 @@ "DataEditType": "INT", "ExtraSettings": "" }, + { + "SlicerConfigName": "raft_extruder", + "PresentationName": "Raft Extruder", + "HelpText": "The index of the extruder to use for the raft. Setting this to 0 will use the support extruder index.", + "DataEditType": "INT", + "ExtraSettings": "" + }, { "SlicerConfigName": "support_material_extrusion_width", "PresentationName": "Support Material",