diff --git a/CustomWidgets/PerformanceFeedbackWindow.cs b/CustomWidgets/PerformanceFeedbackWindow.cs deleted file mode 100644 index 5c2716d1e..000000000 --- a/CustomWidgets/PerformanceFeedbackWindow.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; - -using MatterHackers.Agg; -using MatterHackers.Agg.Font; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.ImageProcessing; -using MatterHackers.Agg.OpenGlGui; -using MatterHackers.Agg.UI; -using MatterHackers.Agg.VertexSource; -using MatterHackers.MarchingSquares; -using MatterHackers.MatterControl; -using MatterHackers.MatterControl.DataStorage; -using MatterHackers.MatterControl.PartPreviewWindow; -using MatterHackers.MatterControl.PrintLibrary; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MeshVisualizer; -using MatterHackers.PolygonMesh; -using MatterHackers.PolygonMesh.Csg; -using MatterHackers.PolygonMesh.Processors; -using MatterHackers.RayTracer; -using MatterHackers.RayTracer.Traceable; -using MatterHackers.RenderOpenGl; -using MatterHackers.VectorMath; - -namespace MatterHackers.Agg.UI -{ - public class PerformanceFeedbackWindow : SystemWindow - { - string timingString; - StyledTypeFace boldFont; - - public PerformanceFeedbackWindow() - : base(700, 480) - { - BackgroundColor = RGBA_Bytes.White; - ShowAsSystemWindow(); - - string staticDataPath = ApplicationDataStorage.Instance.ApplicationStaticDataPath; - string fontPath = Path.Combine(staticDataPath, "Fonts", "LiberationMono.svg"); - TypeFace boldTypeFace = TypeFace.LoadSVG(fontPath); - boldFont = new StyledTypeFace(boldTypeFace, 12); - } - - public override void OnDraw(Graphics2D graphics2D) - { - TypeFacePrinter stringPrinter = new TypeFacePrinter(timingString, boldFont, new Vector2(0, Height - 16)); - stringPrinter.DrawFromHintedCache = true; - - stringPrinter.Render(graphics2D, RGBA_Bytes.Black); - - base.OnDraw(graphics2D); - } - - void SetDisplay(string timingString) - { - this.timingString = timingString; - Invalidate(); - } - - public void ShowResults(double totalTimeTracked) - { - string timingString = ExecutionTimer.Instance.GetResults(totalTimeTracked); - SetDisplay(timingString); - } - } -} diff --git a/MatterControl.csproj b/MatterControl.csproj index 7c9e76cd0..28b51b87e 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -74,7 +74,6 @@ - diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index feb37650d..c4e2cd308 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -264,7 +264,12 @@ namespace MatterHackers.MatterControl #if false if (timingWindow == null) { - timingWindow = new PerformanceFeedbackWindow(); + string staticDataPath = ApplicationDataStorage.Instance.ApplicationStaticDataPath; + string fontPath = Path.Combine(staticDataPath, "Fonts", "LiberationMono.svg"); + TypeFace boldTypeFace = TypeFace.LoadSVG(fontPath); + typeFaceToUse = new StyledTypeFace(boldTypeFace, 12); + + timingWindow = new PerformanceFeedbackWindow(); } { if (totalDrawTime.Elapsed.TotalSeconds > .05) diff --git a/SliceConfiguration/SliceSettingsWidget.cs b/SliceConfiguration/SliceSettingsWidget.cs index 76547eb49..dd5c45bfd 100644 --- a/SliceConfiguration/SliceSettingsWidget.cs +++ b/SliceConfiguration/SliceSettingsWidget.cs @@ -1,19 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; - -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Serialization; -using Newtonsoft.Json.Utilities; - using MatterHackers.Agg; -using MatterHackers.Agg.UI; -using MatterHackers.VectorMath; using MatterHackers.Agg.Font; +using MatterHackers.Agg.UI; using MatterHackers.Localizations; +using MatterHackers.VectorMath; namespace MatterHackers.MatterControl {