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

We are not displaying and collecting all the print history data

Browse source
This commit is contained in:
LarsBrubaker 2020-07-12 12:25:18 -07:00
parent 2aba02a02b
commit 00e283936c
4 changed files with 111 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/DataStorage/Models.cs
View file

@ -349,9 +349,9 @@ namespace MatterHackers.MatterControl.DataStorage
public int PrintTimeSeconds { get; set; }
public bool RatingWasSet { get; set; }
public bool QualityWasSet { get; set; }
public int Rating { get; set; }
public int PrintQuality { get; set; }
public string PrinterName { get; set; }

155
MatterControlLib/History/PrintHistoryListItem.cs
View file

@ -48,6 +48,15 @@ namespace MatterHackers.MatterControl.PrintHistory
{
public class PrintHistoryListItem : ListViewItemBase
{
private string[] qualityNames = new string[]
{
"Failed".Localize(),
"Terrible".Localize(),
"Bad".Localize(),
"Good".Localize(),
"Great".Localize(),
};
public PrintHistoryListItem(ListViewItem listViewItem, int thumbWidth, int thumbHeight, PrintTask printTask, ThemeConfig theme)
: base(listViewItem, thumbWidth, thumbHeight, theme)
{
@ -62,57 +71,35 @@ namespace MatterHackers.MatterControl.PrintHistory
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit
};
TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
{
var indicator = new GuiWidget
indicator = new GuiWidget
{
VAnchor = VAnchor.Stretch,
Width = 15
};
if (printTask.PrintComplete)
{
indicator.BackgroundColor = new Color(38, 147, 51, 180);
}
else
{
indicator.BackgroundColor = new Color(252, 209, 22, 180);
}
SetIndicatorColor();
var middleColumn = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
Padding = new BorderDouble(6, 3)
};
var labelContainer = new FlowLayoutWidget
{
var labelContainer = new FlowLayoutWidget
{
HAnchor = HAnchor.Stretch
};
HAnchor = HAnchor.Stretch
};
string labelName = textInfo.ToTitleCase(printTask.PrintName);
labelName = labelName.Replace('_', ' ');
printInfoWidget = new TextWidget(GetPrintInfo(), pointSize: 15)
{
TextColor = Color.Black,
AutoExpandBoundsToText = true,
};
if (!string.IsNullOrEmpty(printTask.PrinterName))
{
labelName = printTask.PrinterName + ":\n" + labelName;
}
labelContainer.AddChild(printInfoWidget);
string groupNames = GetItemNamesFromMcx(printTask.PrintName);
if (!string.IsNullOrEmpty(groupNames))
{
labelName += "\n" + groupNames;
}
var partLabel = new TextWidget(labelName, pointSize: 15)
{
TextColor = Color.Black
};
labelContainer.AddChild(partLabel);
middleColumn.AddChild(labelContainer);
}
middleColumn.AddChild(labelContainer);
var timeTextColor = new Color(34, 34, 34);
@ -196,6 +183,56 @@ namespace MatterHackers.MatterControl.PrintHistory
this.BackgroundColor = new Color(255, 255, 255, 255);
}
private void SetIndicatorColor()
{
if (printTask.PrintComplete)
{
if (printTask.QualityWasSet && printTask.PrintQuality == 0)
{
indicator.BackgroundColor = new Color(252, 38, 51, 180);
}
else
{
indicator.BackgroundColor = new Color(38, 147, 51, 180);
}
}
else
{
indicator.BackgroundColor = new Color(252, 209, 22, 180);
}
}
private string GetPrintInfo()
{
TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
var labelName = "";
if (!string.IsNullOrEmpty(printTask.PrinterName))
{
labelName = printTask.PrinterName + ":\n" + labelName;
}
labelName += textInfo.ToTitleCase(printTask.PrintName).Replace('_', ' ');
string groupNames = GetItemNamesFromMcx(printTask.PrintName);
if (!string.IsNullOrEmpty(groupNames))
{
labelName += "\n" + groupNames;
}
if (printTask.QualityWasSet)
{
labelName += "\n" + "Print Quality".Localize() + ": " + qualityNames[printTask.PrintQuality];
}
if (!string.IsNullOrWhiteSpace(printTask.Note))
{
labelName += "\n" + printTask.Note;
}
return labelName;
}
protected override void OnClick(MouseEventArgs mouseEvent)
{
if (mouseEvent.Button == MouseButtons.Right)
@ -204,7 +241,7 @@ namespace MatterHackers.MatterControl.PrintHistory
var printTasks = PrintHistoryData.Instance.GetHistoryItems(1000);
var popupMenu = new PopupMenu(theme);
AddRatingsMenu(popupMenu);
AddQualityMenu(popupMenu);
AddNotesMenu(popupMenu, printTasks);
popupMenu.CreateSeparator();
@ -223,7 +260,7 @@ namespace MatterHackers.MatterControl.PrintHistory
private void AddNotesMenu(PopupMenu popupMenu, IEnumerable<PrintTask> printTasks)
{
var addNotest = popupMenu.CreateMenuItem("Add Note...".Localize());
var addNotest = popupMenu.CreateMenuItem(string.IsNullOrEmpty(printTask.Note) ? "Add Note...".Localize() : "Edit Note...".Localize());
addNotest.Enabled = printTasks.Any();
addNotest.Click += (s, e) =>
{
@ -233,24 +270,27 @@ namespace MatterHackers.MatterControl.PrintHistory
"Note".Localize(),
printTask.Note == null ? "" : printTask.Note,
"Enter Note Here".Localize(),
printTask.Note == null ? "Add Note".Localize() : "Update".Localize(),
string.IsNullOrEmpty(printTask.Note) ? "Add Note".Localize() : "Update".Localize(),
(newNote) =>
{
printTask.Note = newNote;
printTask.Commit();
popupMenu.Unfocus();
printInfoWidget.Text = GetPrintInfo();
}));
};
}
private void AddRatingsMenu(PopupMenu popupMenu)
private void AddQualityMenu(PopupMenu popupMenu)
{
var theme = ApplicationController.Instance.MenuTheme;
var content = new FlowLayoutWidget()
{
HAnchor = HAnchor.Fit | HAnchor.Stretch
};
var textWidget = new TextWidget("Rating".Localize() + ":", pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
var textWidget = new TextWidget("Print Quality".Localize() + ":", pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
// Padding = MenuPadding,
VAnchor = VAnchor.Center
@ -260,24 +300,18 @@ namespace MatterHackers.MatterControl.PrintHistory
content.AddChild(new HorizontalSpacer());
var siblings = new List<GuiWidget>();
var toolTips = new string[]
{
"Failed".Localize(),
"Terrible".Localize(),
"Bad".Localize(),
"Good".Localize(),
"Great".Localize(),
};
for (int i = 0; i < toolTips.Length; i++)
for (int i = 0; i < qualityNames.Length; i++)
{
var button = new RadioButton(new TextWidget(i.ToString(), pointSize: theme.DefaultFontSize, textColor: theme.TextColor))
{
Border = new BorderDouble(1, 0, 0, 0),
BorderColor = theme.MinimalShade,
Enabled = printTask.PrintComplete,
Checked = printTask.RatingWasSet && printTask.Rating == i,
ToolTipText = toolTips[i],
Checked = printTask.QualityWasSet && printTask.PrintQuality == i,
ToolTipText = qualityNames[i],
Margin = 0,
Padding = 5,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
};
siblings.Add(button);
@ -293,10 +327,13 @@ namespace MatterHackers.MatterControl.PrintHistory
button.Click += (s, e) =>
{
printTask.Rating = siblings.IndexOf((GuiWidget)s);
printTask.RatingWasSet = true;
printTask.PrintQuality = siblings.IndexOf((GuiWidget)s);
printTask.QualityWasSet = true;
printTask.Commit();
popupMenu.Unfocus();
printInfoWidget.Text = GetPrintInfo();
SetIndicatorColor();
};
}
@ -375,7 +412,7 @@ namespace MatterHackers.MatterControl.PrintHistory
public string Notes { get; set; }
public int Rating { get; set; }
public int PrintQuality { get; set; }
}
private static void ExportToCsv(IEnumerable<PrintTask> printTasks)
@ -396,7 +433,7 @@ namespace MatterHackers.MatterControl.PrintHistory
Start = printTask.PrintStart,
End = printTask.PrintEnd,
Compleated = printTask.PrintComplete,
Rating = printTask.Rating,
PrintQuality = printTask.PrintQuality,
ItemsPrinted = groupNames,
Minutes = printTask.PrintTimeMinutes,
RecoveryCount = printTask.RecoveryCount,
@ -565,6 +602,8 @@ namespace MatterHackers.MatterControl.PrintHistory
private PrintItemWrapper itemToRemove;
private PrintTask printTask;
private GuiWidget indicator;
private TextWidget printInfoWidget;
private void OnConfirmRemove(bool messageBoxResponse)
{

7
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -817,7 +817,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private static void EnableReduceWidth(ChromeTab partTab, ThemeConfig theme)
{
partTab.MinimumSize = new Vector2(80, theme.TabButtonHeight);
var scale = GuiWidget.DeviceScale;
partTab.MinimumSize = new Vector2(80 * scale, theme.TabButtonHeight);
var textWidget = partTab.Descendants<TextWidget>().First();
var tabPill = partTab.Descendants<SimpleTab.TabPill>().First();
@ -839,7 +840,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// the text
var width = textWidget.Width;
// the tab pill
width += tabPill.Margin.Width + tabPill.Padding.Width;
width += (tabPill.Margin.Width + tabPill.Padding.Width) * scale;
if (closeBox != null)
{
// the close box
@ -847,7 +848,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
else
{
width += 32;
width += 32 * scale;
}
partTab.MaximumSize = new Vector2(width, partTab.MaximumSize.Y);

12
MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -357,11 +357,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Validate against active hotends
foreach (var hotendIndex in activeHotends)
{
var hotendBounds = printer.Settings.ToolBounds[hotendIndex];
if (!hotendBounds.Contains(itemBounds))
if (printer?.Settings?.ToolBounds != null
&& hotendIndex < printer.Settings.ToolBounds.Length)
{
// Draw in red outside of the bounds for the hotend
drawColor = Color.Red.WithAlpha(90);
var hotendBounds = printer.Settings.ToolBounds[hotendIndex];
if (!hotendBounds.Contains(itemBounds))
{
// Draw in red outside of the bounds for the hotend
drawColor = Color.Red.WithAlpha(90);
}
}
}
}