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

Improved measure tool

Browse source
This commit is contained in:
LarsBrubaker 2021-04-17 22:35:53 -07:00
parent ed0940605b
commit f59b323c61
32 changed files with 277 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

31
MatterControlLib/PartPreviewWindow/View3D/Object3DControlsLayer.cs
View file

@ -205,6 +205,25 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
});
}
private List<Action<Graphics2D>> drawBeforeCallbacks = new List<Action<Graphics2D>>();
public void DrawBeforeGui(Action<Graphics2D> drawFunction)
{
drawBeforeCallbacks.Add(drawFunction);
}
public override void OnDraw(Graphics2D graphics2D)
{
foreach (var draw in drawBeforeCallbacks)
{
draw(graphics2D);
}
drawBeforeCallbacks.Clear();
base.OnDraw(graphics2D);
}
public void AddControls(ControlTypes controls)
{
if (controls.HasFlag(ControlTypes.RotateXYZ))
@ -939,6 +958,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return bCenterInViewSpace.LengthSquared.CompareTo(aCenterInViewSpace.LengthSquared);
}
private HashSet<IObject3D> editorDrawItems = new HashSet<IObject3D>();
private void DrawGlContent(DrawEventArgs e)
{
var gcodeOptions = sceneContext.RendererOptions;
@ -974,6 +994,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var transparentMeshes = new List<Object3DView>();
var selectedItem = scene.SelectedItem;
editorDrawItems.Clear();
editorDrawItems.Add(selectedItem);
foreach (var item in scene.Children)
{
@ -981,6 +1003,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
DrawObject(item, transparentMeshes, e);
}
if (item is IAlwaysEditorDraw editorDraw)
{
editorDrawItems.Add(item);
}
}
if (sceneContext.Printer?.Connection?.serialPort is PrinterEmulator.Emulator emulator)
@ -1059,10 +1086,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
// Draw the editor items in the same scope as the 3D Controls
if (selectedItem != null)
foreach (var item in editorDrawItems)
{
// Invoke existing IEditorDraw when iterating items
if (selectedItem is IEditorDraw editorDraw)
if (item is ISelectedEditorDraw editorDraw)
{
editorDraw.DrawEditor(this, transparentMeshes, e);
}