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

Showing the time to the end of the print

Browse source 
Made the ratio complete be based on time
This commit is contained in:
LarsBrubaker 2019-05-12 21:00:37 -07:00 • committed by Lars Brubaker
parent fd4756708b
commit 002570d381
5 changed files with 95 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MatterControl.Printing/GCode/GCodeMemoryFile.cs
View file

@ -449,9 +449,10 @@ namespace MatterControl.Printing
public override double PercentComplete(int instructionIndex)
{
if (gCodeCommandQueue.Count > 0)
if (gCodeCommandQueue.Count > 0
&& instructionIndex < gCodeCommandQueue.Count)
{
return Math.Min(99.9, (double)instructionIndex / (double)gCodeCommandQueue.Count * 100);
return Math.Min(99.9, (gCodeCommandQueue[0].SecondsToEndFromHere - gCodeCommandQueue[instructionIndex].SecondsToEndFromHere) / gCodeCommandQueue[0].SecondsToEndFromHere * 100);
}
return 100;
@ -490,11 +491,14 @@ namespace MatterControl.Printing
endIndex = lastPrintLine;
}
int deltaFromStart = Math.Max(0, instructionIndex - startIndex);
var length = endIndex - startIndex;
if (length > 0)
if (instructionIndex < gCodeCommandQueue.Count)
{
return deltaFromStart / (double)length;
var deltaFromStart = Math.Max(0, gCodeCommandQueue[startIndex].SecondsToEndFromHere - gCodeCommandQueue[instructionIndex].SecondsToEndFromHere);
var length = gCodeCommandQueue[startIndex].SecondsToEndFromHere - gCodeCommandQueue[endIndex].SecondsToEndFromHere;
if (length > 0)
{
return deltaFromStart / length;
}
}
}

94
MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
View file

@ -44,15 +44,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class PrinterTabPage : PartTabPage
{
internal GCode2DWidget gcode2DWidget;
private GCode2DWidget gcode2DWidget;
private View3DConfig gcodeOptions;
private DoubleSolidSlider layerRenderRatioSlider;
private readonly DoubleSolidSlider layerRenderRatioSlider;
private GCodePanel gcodePanel;
internal VerticalResizeContainer gcodeContainer;
internal PrinterActionsBar printerActionsBar;
private VerticalResizeContainer gcodeContainer;
public PrinterActionsBar PrinterActionsBar { get; set; }
private DockingTabControl sideBar;
private SliceSettingsWidget sliceSettingsWidget;
@ -72,6 +74,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
gcode2DWidget.TransformState = GCode2DWidget.ETransformState.Move;
}
break;
case ViewControls3DButtons.Scale:
@ -79,6 +82,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
gcode2DWidget.TransformState = GCode2DWidget.ETransformState.Scale;
}
break;
}
};
@ -103,7 +107,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
LayerScrollbar.SolidSlider.View.TrackColor = opaqueTrackColor;
view3DWidget.InteractionLayer.AddChild(LayerScrollbar);
layerRenderRatioSlider = new DoubleSolidSlider(new Vector2(), SliceLayerSelector.SliderWidth, theme);
layerRenderRatioSlider = new DoubleSolidSlider(default(Vector2), SliceLayerSelector.SliderWidth, theme);
layerRenderRatioSlider.FirstValue = 0;
layerRenderRatioSlider.FirstValueChanged += (s, e) =>
{
@ -135,12 +139,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SetSliderSizes();
};
printerActionsBar = new PrinterActionsBar(printer, this, theme);
theme.ApplyBottomBorder(printerActionsBar);
printerActionsBar.modelViewButton.Enabled = sceneContext.EditableScene;
PrinterActionsBar = new PrinterActionsBar(printer, this, theme);
theme.ApplyBottomBorder(PrinterActionsBar);
PrinterActionsBar.modelViewButton.Enabled = sceneContext.EditableScene;
// Must come after we have an instance of View3DWidget an its undo buffer
topToBottom.AddChild(printerActionsBar, 0);
topToBottom.AddChild(PrinterActionsBar, 0);
var trackball = view3DWidget.InteractionLayer.Children<TrackballTumbleWidget>().FirstOrDefault();
@ -194,7 +198,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
view3DContainer.AddChild(new RunningTasksWidget(theme, printer)
{
MinimumSize = new Vector2(100, 0),
Margin = new BorderDouble(top: printerActionsBar.Height + 1, left: favoritesBar.LocalBounds.Width + favoritesBar.DeviceMarginAndBorder.Width + 1),
Margin = new BorderDouble(top: PrinterActionsBar.Height + 1, left: favoritesBar.LocalBounds.Width + favoritesBar.DeviceMarginAndBorder.Width + 1),
VAnchor = VAnchor.Top | VAnchor.Fit,
HAnchor = HAnchor.Left | HAnchor.Fit,
});
@ -202,7 +206,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Create and append new widget
gcode2DWidget = new GCode2DWidget(printer, theme)
{
Visible = (printer.ViewState.ViewMode == PartViewMode.Layers2D)
Visible = printer.ViewState.ViewMode == PartViewMode.Layers2D
};
view3DWidget.InteractionLayer.AddChild(gcode2DWidget, position + 1);
@ -213,12 +217,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.LayerScrollbar.Margin = LayerScrollbar.Margin.Clone(top: tumbleCubeControl.Height + tumbleCubeControl.Margin.Height + 4);
// On load, switch to gcode view if previously editing gcode file. Listeners would normally do this but workspace loads before this UI widget
if (this?.printerActionsBar?.modelViewButton is GuiWidget button)
if (this?.PrinterActionsBar?.modelViewButton is GuiWidget button)
{
button.Enabled = sceneContext.EditableScene;
if (sceneContext.ContentType == "gcode"
&& this?.printerActionsBar?.layers3DButton is GuiWidget gcodeButton)
&& this?.PrinterActionsBar?.layers3DButton is GuiWidget gcodeButton)
{
gcodeButton.InvokeClick();
}
@ -269,7 +273,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
string pauseCaption = "Printer Paused".Localize();
private readonly string pauseCaption = "Printer Paused".Localize();
private void ResumePrint(bool clickedOk)
{
@ -326,7 +330,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
400,
"Resume".Localize(),
"OK".Localize(),
ApplicationController.Instance.Theme, false);
ApplicationController.Instance.Theme,
false);
messageBox.AddPageAction(unloadFilamentButton);
@ -687,14 +692,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (doSlicing)
{
var errors = printer.ValidateSettings();
if(errors.Any(err => err.ErrorLevel == ValidationErrorLevel.Error))
if (errors.Any(err => err.ErrorLevel == ValidationErrorLevel.Error))
{
doSlicing = false;
ApplicationController.Instance.ShowValidationErrors("Slicing Error".Localize(), errors);
}
}
if(doSlicing)
if (doSlicing)
{
activelySlicing = true;
if (bottomRow.Name == null)
@ -791,26 +796,48 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Center
});
var timeWidget = new TextWidget("", pointSize: 22, textColor: theme.TextColor)
var timeStack = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
Margin = new BorderDouble(10, 0, 0, 0),
Padding = new BorderDouble(5, 0, 0, 0),
VAnchor = VAnchor.Center | VAnchor.Fit
};
timeContainer.AddChild(timeStack);
var timePrinted = new TextWidget("", pointSize: 16, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(10, 0, 0, 0),
VAnchor = VAnchor.Center,
HAnchor = HAnchor.Center,
};
timeContainer.AddChild(timeWidget);
timeStack.AddChild(timePrinted);
var runningInterval = UiThread.SetInterval(
() =>
var timeToEnd = new TextWidget("", pointSize: 9, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
HAnchor = HAnchor.Center,
};
timeStack.AddChild(timeToEnd);
var runningInterval = UiThread.SetInterval(() =>
{
int secondsPrinted = printer.Connection.SecondsPrinted;
int hoursPrinted = (int)(secondsPrinted / (60 * 60));
int minutesPrinted = (secondsPrinted / 60 - hoursPrinted * 60);
int totalSecondsPrinted = printer.Connection.SecondsPrinted;
secondsPrinted = secondsPrinted % 60;
int hoursPrinted = totalSecondsPrinted / (60 * 60);
int minutesPrinted = totalSecondsPrinted / 60 - hoursPrinted * 60;
var secondsPrinted = totalSecondsPrinted % 60;
// TODO: Consider if the consistency of a common time format would look and feel better than changing formats based on elapsed duration
timeWidget.Text = (hoursPrinted <= 0) ? $"{minutesPrinted}:{secondsPrinted:00}" : $"{hoursPrinted}:{minutesPrinted:00}:{secondsPrinted:00}";
timePrinted.Text = GetFormatedTime(hoursPrinted, minutesPrinted, secondsPrinted);
int totalSecondsToEnd = printer.Connection.SecondsToEnd;
int hoursToEnd = totalSecondsToEnd / (60 * 60);
int minutesToEnd = totalSecondsToEnd / 60 - hoursToEnd * 60;
var secondsToEnd = totalSecondsToEnd % 60;
timeToEnd.Text = GetFormatedTime(hoursToEnd, minutesToEnd, secondsToEnd);
progressDial.LayerIndex = printer.Connection.CurrentlyPrintingLayer;
progressDial.LayerCompletedRatio = printer.Connection.RatioIntoCurrentLayer;
@ -829,11 +856,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
break;
}
}, 1);
bodyRow.Closed += (s, e) => UiThread.ClearInterval(runningInterval);
bodyRow.Visible = false;
return bodyRow;
}
private static string GetFormatedTime(int hoursPrinted, int minutesPrinted, int secondsPrinted)
{
if (hoursPrinted == 0 && minutesPrinted == 0 && secondsPrinted == 0)
{
return "";
}
return (hoursPrinted <= 0) ? $"{minutesPrinted}:{secondsPrinted:00}" : $"{hoursPrinted}:{minutesPrinted:00}:{secondsPrinted:00}";
}
}
}

6
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -638,17 +638,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return;
}
if (printerTabPage?.printerActionsBar?.sliceButton is GuiWidget sliceButton)
if (printerTabPage?.PrinterActionsBar?.sliceButton is GuiWidget sliceButton)
{
sliceButton.Enabled = sceneContext.EditableScene;
}
if (printerTabPage?.printerActionsBar?.modelViewButton is GuiWidget button)
if (printerTabPage?.PrinterActionsBar?.modelViewButton is GuiWidget button)
{
button.Enabled = sceneContext.EditableScene;
if (sceneContext.ContentType == "gcode"
&& printerTabPage?.printerActionsBar?.layers3DButton is GuiWidget gcodeButton)
&& printerTabPage?.PrinterActionsBar?.layers3DButton is GuiWidget gcodeButton)
{
gcodeButton.InvokeClick();
}

16
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -830,7 +830,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication
{
get
{
if (gCodeFileSwitcher?.GCodeFile == null)
if (gCodeFileSwitcher?.GCodeFile == null
|| !(gCodeFileSwitcher?.GCodeFile is GCodeMemoryFile))
{
return 0;
}
@ -839,6 +840,19 @@ namespace MatterHackers.MatterControl.PrinterCommunication
}
}
public int SecondsToEnd
{
get
{
if (gCodeFileSwitcher?.GCodeFile == null)
{
return 0;
}
return (int)gCodeFileSwitcher.GCodeFile.Instruction(gCodeFileSwitcher.LineIndex).SecondsToEndFromHere;
}
}
public int SecondsPrinted
{
get

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 2dda67fe8affa8aeaa31e952f7b89a8719553c85
Subproject commit f1bfbd6dbe1232528a55251dc82723034bf478fa