nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed for canceling the add button in 3d view

Browse source 
Made 3d gcode color match theme
Updated robo build to have the -1 offset for the probe (565)
This commit is contained in:
larsbrubaker 2014-05-28 11:13:21 -07:00
parent 61d40457b4
commit 0b9ab80129
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/View3DTransfromPart.cs
View file

@ -668,7 +668,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void LoadAndAddPartsToPlate(string[] filesToLoad)
{
if (Meshes.Count > 0 && filesToLoad.Length > 0)
if (Meshes.Count > 0 && filesToLoad != null && filesToLoad.Length > 0)
{
string loadingPartLabel = LocalizedString.Get("Loading Parts");
string loadingPartLabelFull = "{0}:".FormatWith(loadingPartLabel);

1
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -235,6 +235,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
renderType |= RenderType.Retractions;
}
GCodeRenderer.ExtrusionColor = ActiveTheme.Instance.PrimaryAccentColor;
gcodeViewWidget.gCodeRenderer.Render3D(0, Math.Min(gcodeViewWidget.ActiveLayerIndex + 1, gcodeViewWidget.LoadedGCode.NumChangesInZ), gcodeViewWidget.TotalTransform, 1, renderType,
gcodeViewWidget.FeatureToStartOnRatio0To1, gcodeViewWidget.FeatureToEndOnRatio0To1);
}

2
StaticData/PrinterSettings/RoBo 3D/R1/config.ini
View file

@ -106,7 +106,7 @@ solid_infill_extrusion_width = 0
solid_infill_speed = 60
spiral_vase = 0
standby_temperature_delta = -5
start_gcode = G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\nM109 S[temperature] ; set the extruder temp and wait\nM565 Z0 ; Set the probe offset\nG29 ; probe bed\n
start_gcode = G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\nM109 S[temperature] ; set the extruder temp and wait\nM565 Z-1 ; Set the probe offset\nG29 ; probe bed\n
start_perimeters_at_concave_points = 0
start_perimeters_at_non_overhang = 0
support_material = 1