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

Put in some more performance monitoring.

Browse source
This commit is contained in:
Lars Brubaker 2015-10-29 11:31:09 -07:00
parent 29201ec0d6
commit b10b4ec3c6
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ApplicationView/MainApplicationWidget.cs
View file

@ -317,14 +317,17 @@ namespace MatterHackers.MatterControl
{
if (globalInstance == null)
{
globalInstance = new ApplicationController();
if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
using (new PerformanceTimer("Startup", "AppController Instance"))
{
globalInstance.MainView = new CompactApplicationView();
}
else
{
globalInstance.MainView = new ResponsiveApplicationView();
globalInstance = new ApplicationController();
if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
{
globalInstance.MainView = new CompactApplicationView();
}
else
{
globalInstance.MainView = new ResponsiveApplicationView();
}
}
}
return globalInstance;

10
MatterControlApplication.cs
View file

@ -297,10 +297,10 @@ namespace MatterHackers.MatterControl
TextWidget.GlobalPointSizeScaleRatio = 1.3;
}
using (new PerformanceTimer("Startup", "MainView"))
{
this.AddChild(ApplicationController.Instance.MainView);
}
using (new PerformanceTimer("Startup", "MainView"))
{
this.AddChild(ApplicationController.Instance.MainView);
}
this.MinimumSize = minSize;
this.Padding = new BorderDouble(0); //To be re-enabled once native borders are turned off
@ -544,7 +544,7 @@ namespace MatterHackers.MatterControl
{
totalDrawTime.Restart();
GuiWidget.DrawCount = 0;
using (new PerformanceTimer("Draw Timer", "Total"))
using (new PerformanceTimer("Draw Timer", "MC Draw"))
{
base.OnDraw(graphics2D);
}

3
StaticData/Translations/Master.txt
View file

@ -3844,3 +3844,6 @@ Translated:Solid Infill works best when set tu LINES.
English:Location: 'Settings & Controls' -> 'Settings' -> 'General' -> 'Infill Type'
Translated:Location: 'Settings & Controls' -> 'Settings' -> 'General' -> 'Infill Type'
English:Show normal text above the braille
Translated:Show normal text above the braille