Initial screensaver prototype
- Consolidate title casing mechanism into PrintItemWrapper.GetFriendlyName
This commit is contained in:
John Lewin
parent
8c465e781f
commit
16c2230018
7 changed files with 643 additions and 22 deletions
|
|
@ -69,7 +69,6 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
private TemperatureWidgetBase bedTemperatureWidget;
|
||||
private TemperatureWidgetBase extruderTemperatureWidget;
|
||||
private QueueDataView queueDataView;
|
||||
private TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
|
||||
|
||||
public DesktopPrintStatusRow(QueueDataView queueDataView)
|
||||
{
|
||||
|
|
@ -337,9 +336,7 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
{
|
||||
if (PrinterConnectionAndCommunication.Instance.ActivePrintItem != null)
|
||||
{
|
||||
string labelName = textInfo.ToTitleCase(PrinterConnectionAndCommunication.Instance.ActivePrintItem.Name);
|
||||
labelName = labelName.Replace('_', ' ');
|
||||
this.activePrintName.Text = labelName;
|
||||
this.activePrintName.Text = PrinterConnectionAndCommunication.Instance.ActivePrintItem.GetFriendlyName();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -454,7 +451,6 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
private TemperatureWidgetBase extruderTemperatureWidget;
|
||||
private QueueDataView queueDataView;
|
||||
private Button setupButton;
|
||||
private TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
|
||||
private Stopwatch timeSinceLastDrawTime = new Stopwatch();
|
||||
|
||||
public TouchScreenPrintStatusRow(QueueDataView queueDataView)
|
||||
|
|
@ -770,9 +766,7 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
{
|
||||
if (PrinterConnectionAndCommunication.Instance.ActivePrintItem != null)
|
||||
{
|
||||
string labelName = textInfo.ToTitleCase(PrinterConnectionAndCommunication.Instance.ActivePrintItem.Name);
|
||||
labelName = labelName.Replace('_', ' ');
|
||||
this.activePrintName.Text = labelName;
|
||||
this.activePrintName.Text = PrinterConnectionAndCommunication.Instance.ActivePrintItem.GetFriendlyName();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -224,8 +224,6 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector
|
|||
WidgetTextColor = RGBA_Bytes.Black;
|
||||
WidgetBackgroundColor = RGBA_Bytes.White;
|
||||
|
||||
TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
|
||||
|
||||
SetDisplayAttributes();
|
||||
|
||||
FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
|
|
|
|||
628
CustomWidgets/PrintingWindow.cs
Normal file
628
CustomWidgets/PrintingWindow.cs
Normal file
|
|
@ -0,0 +1,628 @@
|
|||
/*
|
||||
Copyright (c) 2017, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
The views and conclusions contained in the software and documentation are those
|
||||
of the authors and should not be interpreted as representing official policies,
|
||||
either expressed or implied, of the FreeBSD Project.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using MatterHackers.Agg;
|
||||
using MatterHackers.Agg.PlatformAbstract;
|
||||
using MatterHackers.Agg.UI;
|
||||
using MatterHackers.Agg.VertexSource;
|
||||
using MatterHackers.Localizations;
|
||||
using MatterHackers.MatterControl.PrinterCommunication;
|
||||
using MatterHackers.MatterControl.SlicerConfiguration;
|
||||
using MatterHackers.VectorMath;
|
||||
|
||||
namespace MatterHackers.MatterControl.CustomWidgets
|
||||
{
|
||||
public class ProgressDial : GuiWidget
|
||||
{
|
||||
private double completedRatio = 0;
|
||||
public double CompletedRatio
|
||||
{
|
||||
get { return completedRatio; }
|
||||
set
|
||||
{
|
||||
if (completedRatio != value)
|
||||
{
|
||||
completedRatio = Math.Min(value, 1);
|
||||
|
||||
// Flag for redraw
|
||||
this.Invalidate();
|
||||
|
||||
percentCompleteWidget.Text = $"{CompletedRatio * 100:0}%";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private double layerCompletedRatio = 0;
|
||||
public double LayerCompletedRatio
|
||||
{
|
||||
get { return layerCompletedRatio; }
|
||||
set
|
||||
{
|
||||
if (layerCompletedRatio != value)
|
||||
{
|
||||
layerCompletedRatio = value;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string ExtruderTemp { get; internal set; }
|
||||
public string BedTemp { get; internal set; }
|
||||
public string TimeString { get; internal set; }
|
||||
|
||||
private RGBA_Bytes PrimaryAccentColor = ActiveTheme.Instance.PrimaryAccentColor;
|
||||
private RGBA_Bytes PrimaryAccentShade = ActiveTheme.Instance.PrimaryAccentColor.AdjustLightness(0.7).GetAsRGBA_Bytes();
|
||||
private double strokeWidth = 10;
|
||||
private double outerRingStrokeWidth = 7;
|
||||
|
||||
private int layerCount = 0;
|
||||
public int LayerCount
|
||||
{
|
||||
get { return layerCount; }
|
||||
set
|
||||
{
|
||||
if (layerCount != value)
|
||||
{
|
||||
layerCount = value;
|
||||
layerCountWidget.Text = "Layer " + layerCount;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private TextWidget percentCompleteWidget;
|
||||
private TextWidget layerCountWidget;
|
||||
private Stroke borderStroke;
|
||||
private RGBA_Bytes borderColor;
|
||||
private double borderRadius;
|
||||
|
||||
private int padding = 20;
|
||||
private double outerRingRadius = 100;
|
||||
private double innerRingRadius = 90;
|
||||
|
||||
public ProgressDial()
|
||||
{
|
||||
this.Width = 230;
|
||||
this.Height = 230;
|
||||
|
||||
percentCompleteWidget = new TextWidget("", pointSize: 22, textColor: ActiveTheme.Instance.PrimaryTextColor)
|
||||
{
|
||||
AutoExpandBoundsToText = true,
|
||||
VAnchor = VAnchor.ParentCenter,
|
||||
HAnchor = HAnchor.ParentCenter,
|
||||
Margin = new BorderDouble(bottom: 20)
|
||||
};
|
||||
|
||||
layerCountWidget = new TextWidget("", pointSize: 12, textColor: ActiveTheme.Instance.PrimaryTextColor)
|
||||
{
|
||||
AutoExpandBoundsToText = true,
|
||||
VAnchor = VAnchor.ParentCenter,
|
||||
HAnchor = HAnchor.ParentCenter,
|
||||
Margin = new BorderDouble(top: 32)
|
||||
};
|
||||
|
||||
this.AddChild(percentCompleteWidget);
|
||||
this.AddChild(layerCountWidget);
|
||||
|
||||
borderStroke = new Stroke(new Ellipse(
|
||||
Vector2.Zero,
|
||||
borderRadius,
|
||||
borderRadius));
|
||||
|
||||
borderColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
borderColor.Alpha0To1 = 0.3f;
|
||||
}
|
||||
|
||||
public override void OnBoundsChanged(EventArgs e)
|
||||
{
|
||||
borderRadius = this.LocalBounds.Width / 2 - padding;
|
||||
outerRingRadius = borderRadius - (outerRingStrokeWidth / 2) - 6; ;
|
||||
innerRingRadius = outerRingRadius - (outerRingStrokeWidth / 2) - (strokeWidth / 2);
|
||||
|
||||
base.OnBoundsChanged(e);
|
||||
}
|
||||
|
||||
public override void OnDraw(Graphics2D graphics2D)
|
||||
{
|
||||
var bounds = this.LocalBounds;
|
||||
|
||||
// Draw border ring
|
||||
graphics2D.Render(
|
||||
borderStroke.Translate(bounds.Center),
|
||||
borderColor);
|
||||
|
||||
// Draw outer progress ring
|
||||
var ringArc = new Arc(
|
||||
Vector2.Zero,
|
||||
new Vector2(outerRingRadius, outerRingRadius),
|
||||
0,
|
||||
MathHelper.DegreesToRadians(360) * LayerCompletedRatio, // percentCompletedInRadians
|
||||
Arc.Direction.ClockWise);
|
||||
var arcStroke = new Stroke(ringArc);
|
||||
arcStroke.width(outerRingStrokeWidth);
|
||||
graphics2D.Render(
|
||||
arcStroke.Rotate(90, AngleType.Degrees).Translate(bounds.Center),
|
||||
PrimaryAccentShade);
|
||||
|
||||
// Draw inner progress ring
|
||||
ringArc = new Arc(
|
||||
Vector2.Zero,
|
||||
new Vector2(innerRingRadius, innerRingRadius),
|
||||
0,
|
||||
MathHelper.DegreesToRadians(360) * CompletedRatio, // percentCompletedInRadians
|
||||
Arc.Direction.ClockWise);
|
||||
arcStroke = new Stroke(ringArc);
|
||||
arcStroke.width(strokeWidth);
|
||||
graphics2D.Render(
|
||||
arcStroke.Rotate(90, AngleType.Degrees).Translate(bounds.Center),
|
||||
PrimaryAccentColor);
|
||||
|
||||
// Draw child controls
|
||||
base.OnDraw(graphics2D);
|
||||
}
|
||||
}
|
||||
|
||||
public class ZAxisControls : FlowLayoutWidget
|
||||
{
|
||||
private static TextImageButtonFactory buttonFactory = new TextImageButtonFactory()
|
||||
{
|
||||
fontSize = 13,
|
||||
invertImageLocation = false,
|
||||
hoverFillColor = ActiveTheme.Instance.PrimaryAccentColor,
|
||||
//pressedFillColor = ActiveTheme.Instance.PrimaryAccentColor.AdjustLightness(0.8).GetAsRGBA_Bytes()
|
||||
};
|
||||
|
||||
public ZAxisControls() :
|
||||
base(FlowDirection.TopToBottom)
|
||||
{
|
||||
this.AddChild(new TextWidget("Z+", pointSize: 15, textColor: ActiveTheme.Instance.PrimaryTextColor)
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter,
|
||||
Margin = new BorderDouble(bottom: 8)
|
||||
});
|
||||
|
||||
Button button;
|
||||
|
||||
button = CreateButton("1.00 mm");
|
||||
button.HAnchor = HAnchor.ParentCenter;
|
||||
button.Click += (s, e) => MoveZAxis(1.0);
|
||||
this.AddChild(button);
|
||||
|
||||
button = CreateButton("0.10 mm");
|
||||
button.HAnchor = HAnchor.ParentCenter;
|
||||
button.Click += (s, e) => MoveZAxis(0.1);
|
||||
this.AddChild(button);
|
||||
|
||||
button = CreateButton("0.02 mm");
|
||||
button.HAnchor = HAnchor.ParentCenter;
|
||||
button.Click += (s, e) => MoveZAxis(0.02);
|
||||
this.AddChild(button);
|
||||
|
||||
this.AddChild(new HorizontalLine());
|
||||
this.AddChild(new TextWidget("-[CurrentValue]-", pointSize: 15, textColor: ActiveTheme.Instance.PrimaryTextColor)
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter,
|
||||
Margin = new BorderDouble(0, 4)
|
||||
});
|
||||
this.AddChild(new HorizontalLine());
|
||||
|
||||
button = CreateButton("0.02 mm");
|
||||
button.HAnchor = HAnchor.ParentCenter;
|
||||
button.Click += (s, e) => MoveZAxis(-0.02);
|
||||
this.AddChild(button);
|
||||
|
||||
button = CreateButton("0.10 mm");
|
||||
button.HAnchor = HAnchor.ParentCenter;
|
||||
button.Click += (s, e) => MoveZAxis(-0.1);
|
||||
this.AddChild(button);
|
||||
|
||||
button = CreateButton("1.00 mm");
|
||||
button.HAnchor = HAnchor.ParentCenter;
|
||||
button.Click += (s, e) => MoveZAxis(1.0);
|
||||
this.AddChild(button);
|
||||
|
||||
this.AddChild(new TextWidget("Z-", pointSize: 15, textColor: ActiveTheme.Instance.PrimaryTextColor)
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter,
|
||||
Margin = new BorderDouble(top: 9),
|
||||
});
|
||||
|
||||
|
||||
//this.BackgroundColor = new RGBA_Bytes(200, 0, 0, 30);
|
||||
|
||||
this.Margin = new BorderDouble(0);
|
||||
this.Margin = 0;
|
||||
this.Padding = 3;
|
||||
this.VAnchor = VAnchor.FitToChildren | VAnchor.ParentTop;
|
||||
this.HAnchor = HAnchor.FitToChildren;
|
||||
}
|
||||
|
||||
public void MoveZAxis(double moveAmount)
|
||||
{
|
||||
// Move by (moveAmount);
|
||||
}
|
||||
|
||||
private Button CreateButton(string localizedText, bool centerText = true)
|
||||
{
|
||||
var button = buttonFactory.Generate(localizedText, centerText: centerText);
|
||||
button.HAnchor = HAnchor.Max_FitToChildren_ParentWidth;
|
||||
button.VAnchor = VAnchor.FitToChildren;
|
||||
button.Margin = new BorderDouble(0, 1);
|
||||
button.Padding = new BorderDouble(15, 7);
|
||||
button.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class PrintingWindow : SystemWindow
|
||||
{
|
||||
private static PrintingWindow instance;
|
||||
private EventHandler unregisterEvents;
|
||||
private ProgressDial progressDial;
|
||||
|
||||
AverageMillisecondTimer millisecondTimer = new AverageMillisecondTimer();
|
||||
Stopwatch totalDrawTime = new Stopwatch();
|
||||
|
||||
Action onCloseCallback;
|
||||
|
||||
private static TextImageButtonFactory buttonFactory = new TextImageButtonFactory()
|
||||
{
|
||||
fontSize = 15,
|
||||
invertImageLocation = false,
|
||||
};
|
||||
|
||||
private Button CreateButton(string localizedText, bool centerText = true)
|
||||
{
|
||||
var button = buttonFactory.Generate(localizedText, centerText: centerText);
|
||||
button.Cursor = Cursors.Hand;
|
||||
button.Margin = new BorderDouble(40, 10);
|
||||
button.VAnchor = VAnchor.ParentCenter;
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
|
||||
public void MockProgress()
|
||||
{
|
||||
if (progressDial.CompletedRatio >= 1)
|
||||
{
|
||||
progressDial.CompletedRatio = 0;
|
||||
progressDial.LayerCount = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
progressDial.CompletedRatio = Math.Min(progressDial.CompletedRatio + 0.01, 1);
|
||||
}
|
||||
|
||||
if (progressDial.LayerCompletedRatio >= 1)
|
||||
{
|
||||
progressDial.LayerCompletedRatio = 0;
|
||||
progressDial.LayerCount += 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
progressDial.LayerCompletedRatio = Math.Min(progressDial.LayerCompletedRatio + 0.1, 1);
|
||||
}
|
||||
|
||||
UiThread.RunOnIdle(MockProgress, .2);
|
||||
}
|
||||
|
||||
public PrintingWindow(Action onCloseCallback, bool mockMode = false)
|
||||
: base(1024, 600)
|
||||
{
|
||||
this.BackgroundColor = new RGBA_Bytes(35, 40, 49);
|
||||
this.onCloseCallback = onCloseCallback;
|
||||
Title = LocalizedString.Get("Print Monitor");
|
||||
|
||||
var topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom)
|
||||
{
|
||||
VAnchor = VAnchor.ParentBottomTop,
|
||||
HAnchor = HAnchor.ParentLeftRight
|
||||
};
|
||||
this.AddChild(topToBottom);
|
||||
|
||||
var actionBar = new FlowLayoutWidget(FlowDirection.LeftToRight)
|
||||
{
|
||||
VAnchor = VAnchor.ParentTop | VAnchor.FitToChildren,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
BackgroundColor = new RGBA_Bytes(34, 38, 46),
|
||||
//DebugShowBounds = true
|
||||
};
|
||||
topToBottom.AddChild(actionBar);
|
||||
|
||||
var logo = new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "logo.png")));
|
||||
actionBar.AddChild(logo);
|
||||
|
||||
actionBar.AddChild(new HorizontalSpacer());
|
||||
|
||||
var pauseButton = CreateButton("Pause".Localize().ToUpper());
|
||||
var resumeButton = CreateButton("Resume".Localize().ToUpper());
|
||||
|
||||
pauseButton.Click += (s, e) =>
|
||||
{
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
//PrinterConnectionAndCommunication.Instance.RequestPause();
|
||||
pauseButton.Visible = false;
|
||||
resumeButton.Visible = true;
|
||||
});
|
||||
};
|
||||
actionBar.AddChild(pauseButton);
|
||||
|
||||
resumeButton.Visible = false;
|
||||
resumeButton.Click += (s, e) =>
|
||||
{
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
//PrinterConnectionAndCommunication.Instance.Resume();
|
||||
resumeButton.Visible = false;
|
||||
pauseButton.Visible = true;
|
||||
});
|
||||
};
|
||||
actionBar.AddChild(resumeButton);
|
||||
|
||||
actionBar.AddChild(new VerticalLine());
|
||||
|
||||
var cancelButton = CreateButton("Cancel".Localize().ToUpper());
|
||||
//cancelButton.Click += (sender, e) => UiThread.RunOnIdle(CancelButton_Click);
|
||||
actionBar.AddChild(cancelButton);
|
||||
|
||||
actionBar.AddChild(new VerticalLine());
|
||||
|
||||
var advancedButton = CreateButton("Advanced".Localize().ToUpper());
|
||||
actionBar.AddChild(advancedButton);
|
||||
|
||||
var bodyContainer = new GuiWidget()
|
||||
{
|
||||
VAnchor = VAnchor.ParentBottomTop,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Padding = new BorderDouble(50),
|
||||
BackgroundColor = new RGBA_Bytes(35, 40, 49)
|
||||
};
|
||||
topToBottom.AddChild(bodyContainer);
|
||||
|
||||
var bodyRow = new FlowLayoutWidget(FlowDirection.LeftToRight)
|
||||
{
|
||||
VAnchor = VAnchor.FitToChildren | VAnchor.ParentCenter,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
//BackgroundColor = new RGBA_Bytes(125, 255, 46, 20),
|
||||
};
|
||||
bodyContainer.AddChild(bodyRow);
|
||||
|
||||
var partThumbnail = new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "part_thumbnail.png")))
|
||||
{
|
||||
Margin = new BorderDouble(50, 0)
|
||||
};
|
||||
bodyRow.AddChild(partThumbnail);
|
||||
|
||||
bodyRow.AddChild(new VerticalLine());
|
||||
|
||||
var progressContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
|
||||
{
|
||||
Margin = new BorderDouble(50, 0),
|
||||
VAnchor = VAnchor.ParentTop | VAnchor.FitToChildren,
|
||||
//BackgroundColor = new RGBA_Bytes(125, 255, 46, 20),
|
||||
};
|
||||
bodyRow.AddChild(progressContainer);
|
||||
|
||||
progressDial = new ProgressDial()
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter,
|
||||
Height = 200
|
||||
};
|
||||
progressContainer.AddChild(progressDial);
|
||||
|
||||
var time = new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "time.png")))
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter
|
||||
};
|
||||
progressContainer.AddChild(time);
|
||||
|
||||
var printer= new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "printer.png")))
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter
|
||||
};
|
||||
|
||||
progressContainer.AddChild(printer);
|
||||
|
||||
var partName = new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "PartName.png")))
|
||||
{
|
||||
HAnchor = HAnchor.ParentCenter
|
||||
};
|
||||
progressContainer.AddChild(partName);
|
||||
|
||||
bodyRow.AddChild(new VerticalLine());
|
||||
|
||||
var zControls = new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "z_controls.png")))
|
||||
{
|
||||
Margin = new BorderDouble(50, 0)
|
||||
};
|
||||
|
||||
//bodyRow.AddChild(zControls);
|
||||
|
||||
bodyRow.AddChild(new ZAxisControls()
|
||||
{
|
||||
Margin = new BorderDouble(50, 0),
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
});
|
||||
|
||||
var footerBar = new FlowLayoutWidget (FlowDirection.LeftToRight)
|
||||
{
|
||||
VAnchor = VAnchor.ParentBottom | VAnchor.FitToChildren,
|
||||
HAnchor = HAnchor.ParentCenter | HAnchor.FitToChildren,
|
||||
BackgroundColor = new RGBA_Bytes(35, 40, 49)
|
||||
};
|
||||
topToBottom.AddChild (footerBar);
|
||||
|
||||
int extruderCount = 3;
|
||||
|
||||
if (extruderCount == 1)
|
||||
{
|
||||
footerBar.AddChild(new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "Extruder.png"))));
|
||||
}
|
||||
else
|
||||
{
|
||||
var columnA = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
footerBar.AddChild(columnA);
|
||||
|
||||
var columnB = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
footerBar.AddChild(columnB);
|
||||
|
||||
for (var i = 0; i < extruderCount; i++)
|
||||
{
|
||||
if (i % 2 == 0)
|
||||
{
|
||||
columnA.AddChild(new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "Extruder.png"))));
|
||||
}
|
||||
else
|
||||
{
|
||||
columnB.AddChild(new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("Screensaver", "Extruder.png"))));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
AnchorAll();
|
||||
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
if (mockMode)
|
||||
{
|
||||
MockProgress();
|
||||
}
|
||||
else
|
||||
{
|
||||
CheckOnPrinter();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void CheckOnPrinter()
|
||||
{
|
||||
//if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
|
||||
{
|
||||
GetProgressInfo();
|
||||
UiThread.RunOnIdle(CheckOnPrinter, 1);
|
||||
}
|
||||
/*
|
||||
else
|
||||
{
|
||||
UiThread.RunOnIdle(Close);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
private void GetProgressInfo()
|
||||
{
|
||||
string timeString = "";
|
||||
int secondsPrinted = PrinterConnectionAndCommunication.Instance.SecondsPrinted;
|
||||
int hoursPrinted = (int)(secondsPrinted / (60 * 60));
|
||||
int minutesPrinted = (int)(secondsPrinted / 60 - hoursPrinted * 60);
|
||||
secondsPrinted = secondsPrinted % 60;
|
||||
|
||||
if (hoursPrinted > 0)
|
||||
{
|
||||
timeString = string.Format("{0}:{1:00}:{2:00}",
|
||||
hoursPrinted,
|
||||
minutesPrinted,
|
||||
secondsPrinted);
|
||||
}
|
||||
else
|
||||
{
|
||||
timeString = string.Format("{0}:{1:00}",
|
||||
minutesPrinted,
|
||||
secondsPrinted);
|
||||
}
|
||||
|
||||
progressDial.TimeString = timeString;
|
||||
|
||||
//progressDial.SomeText = "{0}: {1} {2}: {3:.0}% {4}".FormatWith(timeTextString, timeString, progressString, PrinterConnectionAndCommunication.Instance.PercentComplete, completeString);
|
||||
|
||||
bool hasHeatedBed = ActiveSliceSettings.Instance.GetValue<bool>("has_heated_bed");
|
||||
|
||||
progressDial.ExtruderTemp = "Extruder: {0:0.0}° | {1}°".FormatWith(PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0), PrinterConnectionAndCommunication.Instance.GetTargetExtruderTemperature(0));
|
||||
progressDial.BedTemp = !hasHeatedBed ? "" : "Bed: {0:0.0}° | {1}°".FormatWith(PrinterConnectionAndCommunication.Instance.ActualBedTemperature, PrinterConnectionAndCommunication.Instance.TargetBedTemperature);
|
||||
|
||||
progressDial.LayerCount = PrinterConnectionAndCommunication.Instance.CurrentlyPrintingLayer;
|
||||
progressDial.LayerCompletedRatio = PrinterConnectionAndCommunication.Instance.RatioIntoCurrentLayer;
|
||||
progressDial.CompletedRatio = PrinterConnectionAndCommunication.Instance.PercentComplete / 100;
|
||||
}
|
||||
|
||||
public override void OnDraw(Graphics2D graphics2D)
|
||||
{
|
||||
//totalDrawTime.Restart();
|
||||
base.OnDraw(graphics2D);
|
||||
|
||||
//Vector2 center = new Vector2(Width/2, Height/2);
|
||||
//RectangleDouble thermometerRect = new RectangleDouble(center.x - Width/6, center.y - Height/32, center.x + Width/6, center.y + Height/32);
|
||||
//thermometerRect.Offset(0, -Height/4);
|
||||
//graphics2D.Rectangle(thermometerRect, ActiveTheme.Instance.PrimaryAccentColor);
|
||||
//RectangleDouble thermometerFill = new RectangleDouble(thermometerRect.Left, thermometerRect.Bottom, thermometerRect.Left + thermometerRect.Width * PrinterConnectionAndCommunication.Instance.PercentComplete / 100, thermometerRect.Top);
|
||||
//graphics2D.FillRectangle(thermometerFill, ActiveTheme.Instance.PrimaryAccentColor);
|
||||
|
||||
//totalDrawTime.Stop();
|
||||
|
||||
//millisecondTimer.Update((int)totalDrawTime.ElapsedMilliseconds);
|
||||
|
||||
//millisecondTimer.Draw(graphics2D, this.Width * 3 / 4 - 15, this.Height - 120);
|
||||
}
|
||||
|
||||
public static bool IsShowing
|
||||
{
|
||||
get
|
||||
{
|
||||
if (instance != null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static void Show(Action onCloseCallback)
|
||||
{
|
||||
if (instance == null)
|
||||
{
|
||||
instance = new PrintingWindow(onCloseCallback);
|
||||
instance.ShowAsSystemWindow();
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnClosed(EventArgs e)
|
||||
{
|
||||
instance = null;
|
||||
base.OnClosed(e);
|
||||
onCloseCallback();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -186,8 +186,6 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
WidgetTextColor = RGBA_Bytes.Black;
|
||||
WidgetBackgroundColor = RGBA_Bytes.White;
|
||||
|
||||
TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
|
||||
|
||||
SetDisplayAttributes();
|
||||
|
||||
FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
|
|
|
|||
|
|
@ -168,6 +168,7 @@
|
|||
<Compile Include="CustomWidgets\LibrarySelector\LibrarySelectorRowItemCollection.cs" />
|
||||
<Compile Include="CustomWidgets\LibrarySelector\LibrarySelectorWidget.cs" />
|
||||
<Compile Include="CustomWidgets\PopOutTextTab.cs" />
|
||||
<Compile Include="CustomWidgets\PrintingWindow.cs" />
|
||||
<Compile Include="CustomWidgets\SlideWidget.cs" />
|
||||
<Compile Include="CustomWidgets\SolidSlider.cs" />
|
||||
<Compile Include="CustomWidgets\ThumbnailTracer.cs" />
|
||||
|
|
|
|||
|
|
@ -56,6 +56,16 @@ using System.Threading.Tasks;
|
|||
|
||||
namespace MatterHackers.MatterControl.PrinterCommunication
|
||||
{
|
||||
public static class ExtensionMethods
|
||||
{
|
||||
private static TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
|
||||
|
||||
public static string GetFriendlyName(this PrintItemWrapper printItemWrapper)
|
||||
{
|
||||
return textInfo.ToTitleCase(printItemWrapper.Name.Replace('_', ' '));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This is the class that communicates with a RepRap printer over the serial port.
|
||||
/// It handles opening and closing the serial port and does quite a bit of gcode parsing.
|
||||
|
|
|
|||
|
|
@ -199,8 +199,6 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
WidgetTextColor = RGBA_Bytes.Black;
|
||||
WidgetBackgroundColor = RGBA_Bytes.White;
|
||||
|
||||
TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
|
||||
|
||||
SetDisplayAttributes();
|
||||
|
||||
FlowLayoutWidget topToBottomLayout = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
|
|
@ -237,17 +235,11 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
middleColumn.Padding = new BorderDouble(8);
|
||||
middleColumn.Margin = new BorderDouble(10, 0);
|
||||
{
|
||||
string labelName = textInfo.ToTitleCase(PrintItemWrapper.Name);
|
||||
labelName = labelName.Replace('_', ' ');
|
||||
partLabel = new TextWidget(labelName, pointSize: 14);
|
||||
partLabel = new TextWidget(PrintItemWrapper.GetFriendlyName(), pointSize: 14);
|
||||
partLabel.TextColor = WidgetTextColor;
|
||||
partLabel.MinimumSize = new Vector2(1, 16);
|
||||
|
||||
string partStatusLabelTxt = "Status".Localize().ToUpper();
|
||||
string partStatusLabelTxtTest = "Queued to Print".Localize();
|
||||
string partStatusLabelTxtFull = "{0}: {1}".FormatWith(partStatusLabelTxt, partStatusLabelTxtTest);
|
||||
|
||||
partStatus = new TextWidget(partStatusLabelTxtFull, pointSize: 10);
|
||||
partStatus = new TextWidget($"{"Status".Localize().ToUpper()}: {"Queued to Print".Localize()}", pointSize: 10);
|
||||
partStatus.AutoExpandBoundsToText = true;
|
||||
partStatus.TextColor = WidgetTextColor;
|
||||
partStatus.MinimumSize = new Vector2(50, 12);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue