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

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