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

Merge pull request #5056 from larsbrubaker/main

Browse source 
protect against null
This commit is contained in:
Lars Brubaker 2021-05-05 17:31:57 -07:00 • committed by GitHub
commit 1e6df1da1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleDiameterControl.cs
View file

@ -200,12 +200,12 @@ namespace MatterHackers.Plugins.EditorTools
//Object3DControlContext.World.RenderPlane(hitPlane.Plane, Color.Red, true, 50, 3); //Object3DControlContext.World.RenderPlane(hitPlane.Plane, Color.Red, true, 50, 3);
//Object3DControlContext.World.RenderPlane(initialHitPosition, hitPlane.Plane.Normal, Color.Red, true, 50, 3); //Object3DControlContext.World.RenderPlane(initialHitPosition, hitPlane.Plane.Normal, Color.Red, true, 50, 3);
} }
}
if (shouldDrawScaleControls if (shouldDrawScaleControls
&& (MouseIsOver || MouseDownOnControl)) && (MouseIsOver || MouseDownOnControl))
{ {
DrawMeasureLines(e); DrawMeasureLines(e);
}
} }
base.Draw(e); base.Draw(e);

10
MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleMatrixCornerControl.cs
View file

@ -191,12 +191,12 @@ namespace MatterHackers.Plugins.EditorTools
Vector3 endPosition = GetCornerPosition(selectedItem, (quadrantIndex + 1) % 4); Vector3 endPosition = GetCornerPosition(selectedItem, (quadrantIndex + 1) % 4);
Object3DControlContext.World.Render3DLine(startPosition, endPosition, theme.TextColor.WithAlpha(e.Alpha0to255), e.ZBuffered, GuiWidget.DeviceScale); Object3DControlContext.World.Render3DLine(startPosition, endPosition, theme.TextColor.WithAlpha(e.Alpha0to255), e.ZBuffered, GuiWidget.DeviceScale);
} }
}
if (MouseIsOver || MouseDownOnControl) if (MouseIsOver || MouseDownOnControl)
{ {
DrawMeasureLines(e, quadrantIndex); DrawMeasureLines(e, quadrantIndex);
DrawMeasureLines(e, quadrantIndex + 1); DrawMeasureLines(e, quadrantIndex + 1);
}
} }
base.Draw(e); base.Draw(e);

22
MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleWidthDepthCornerControl.cs
View file

@ -181,19 +181,19 @@ namespace MatterHackers.Plugins.EditorTools
//Object3DControlContext.World.RenderPlane(hitPlane.Plane, Color.Red, true, 30, 3); //Object3DControlContext.World.RenderPlane(hitPlane.Plane, Color.Red, true, 30, 3);
//Object3DControlContext.World.RenderPlane(initialHitPosition, hitPlane.Plane.Normal, Color.Red, true, 30, 3); //Object3DControlContext.World.RenderPlane(initialHitPosition, hitPlane.Plane.Normal, Color.Red, true, 30, 3);
} }
}
if (e != null && selectedItem != null) if (e != null)
{ {
Vector3 startPosition = ObjectSpace.GetCornerPosition(selectedItem, quadrantIndex); Vector3 startPosition = ObjectSpace.GetCornerPosition(selectedItem, quadrantIndex);
Vector3 endPosition = ObjectSpace.GetCornerPosition(selectedItem, (quadrantIndex + 1) % 4); Vector3 endPosition = ObjectSpace.GetCornerPosition(selectedItem, (quadrantIndex + 1) % 4);
Object3DControlContext.World.Render3DLine(startPosition, endPosition, theme.TextColor.WithAlpha(e.Alpha0to255), e.ZBuffered, GuiWidget.DeviceScale); Object3DControlContext.World.Render3DLine(startPosition, endPosition, theme.TextColor.WithAlpha(e.Alpha0to255), e.ZBuffered, GuiWidget.DeviceScale);
} }
if (MouseIsOver || MouseDownOnControl) if (MouseIsOver || MouseDownOnControl)
{ {
DrawMeasureLines(e, quadrantIndex); DrawMeasureLines(e, quadrantIndex);
DrawMeasureLines(e, quadrantIndex + 1); DrawMeasureLines(e, quadrantIndex + 1);
}
} }
base.Draw(e); base.Draw(e);

8
MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleWidthDepthEdgeControl.cs
View file

@ -187,11 +187,11 @@ namespace MatterHackers.Plugins.EditorTools
//Object3DControlContext.World.RenderPlane(hitPlane.Plane, Color.Red, true, 50, 3); //Object3DControlContext.World.RenderPlane(hitPlane.Plane, Color.Red, true, 50, 3);
//Object3DControlContext.World.RenderPlane(initialHitPosition, hitPlane.Plane.Normal, Color.Red, true, 50, 3); //Object3DControlContext.World.RenderPlane(initialHitPosition, hitPlane.Plane.Normal, Color.Red, true, 50, 3);
} }
}
if (MouseIsOver || MouseDownOnControl) if (MouseIsOver || MouseDownOnControl)
{ {
DrawMeasureLines(e); DrawMeasureLines(e);
}
} }
base.Draw(e); base.Draw(e);