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

Moving the performance window into agg ui

Browse source
This commit is contained in:
larsbrubaker 2014-02-05 17:47:13 -08:00
parent f41f136f19
commit 1d5c3b23dc
4 changed files with 8 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

70
CustomWidgets/PerformanceFeedbackWindow.cs
View file

@ -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);
}
}
}

1
MatterControl.csproj
View file

@ -74,7 +74,6 @@
<Compile Include="ActionBar\PrintStatusRow.cs" />
<Compile Include="CustomWidgets\ExportQueueItemWindow.cs" />
<Compile Include="CustomWidgets\ExportToFolderFeedbackWindow.cs" />
<Compile Include="CustomWidgets\PerformanceFeedbackWindow.cs" />
<Compile Include="FieldValidation.cs" />
<Compile Include="PartPreviewWindow\CreateDiscreteMeshes.cs" />
<Compile Include="CustomWidgets\EditableNumberDisplay.cs" />

5
MatterControlApplication.cs
View file

@ -264,6 +264,11 @@ namespace MatterHackers.MatterControl
#if false
if (timingWindow == null)
{
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();
}
{

13
SliceConfiguration/SliceSettingsWidget.cs
View file

@ -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
{