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

Working on more enum display options

Browse source 
Improving image converter display
This commit is contained in:
LarsBrubaker 2020-05-10 19:17:48 -07:00
parent ae6caba71b
commit 18581597c7
9 changed files with 169 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

123
MatterControlLib/SlicerConfiguration/UIFields/IconEnumField.cs → MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs
View file

@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
@ -39,16 +40,16 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class IconEnumField : UIField
public class EnumDisplayField : UIField
{
private EditableProperty property;
private IconsAttribute iconsAttribute;
private ThemeConfig theme;
private readonly EditableProperty property;
private readonly EnumDisplayAttribute enumDisplayAttibute;
private readonly ThemeConfig theme;
public IconEnumField(EditableProperty property, IconsAttribute iconsAttribute, ThemeConfig theme)
public EnumDisplayField(EditableProperty property, EnumDisplayAttribute iconsAttribute, ThemeConfig theme)
{
this.property = property;
this.iconsAttribute = iconsAttribute;
this.enumDisplayAttibute = iconsAttribute;
this.theme = theme;
}
@ -58,32 +59,114 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public override void Initialize(int tabIndex)
{
// Enum keyed on name to friendly name
var enumItems = Enum.GetNames(property.PropertyType).Select(enumName =>
{
return new
{
Key = enumName,
Value = enumName.Replace('_', ' ')
};
});
var enumItems = Enum.GetNames(property.PropertyType).Select(enumName => (enumName, enumName.Replace('_', ' ')));
switch (enumDisplayAttibute.Mode)
{
case EnumDisplayAttribute.PresentationMode.IconRow:
AddIconRow(enumItems);
break;
case EnumDisplayAttribute.PresentationMode.Tabs:
AddTabs(enumItems);
break;
case EnumDisplayAttribute.PresentationMode.Buttons:
AddButtons(enumItems);
break;
default:
throw new NotImplementedException();
}
}
private void AddTabs(IEnumerable<(string Key, string Value)> enumItems)
{
var menuRow = new FlowLayoutWidget();
int index = 0;
foreach (var enumItem in enumItems)
{
var localIndex = index;
var radioButton = new RadioTextButton(enumItem.Value, theme);
// set it if checked
if (enumItem.Value == this.InitialValue)
{
radioButton.Checked = true;
}
menuRow.AddChild(radioButton);
var localItem = enumItem;
radioButton.CheckedStateChanged += (s, e) =>
{
if (radioButton.Checked)
{
this.SetValue(localItem.Key, true);
}
};
index++;
}
this.Content = menuRow;
}
private void AddButtons(IEnumerable<(string Key, string Value)> enumItems)
{
var menuRow = new FlowLayoutWidget();
int index = 0;
foreach (var enumItem in enumItems)
{
var localIndex = index;
var radioButton = new RadioTextButton(enumItem.Value, theme);
// set it if checked
if (enumItem.Value == this.InitialValue)
{
radioButton.Checked = true;
}
menuRow.AddChild(radioButton);
var localItem = enumItem;
radioButton.CheckedStateChanged += (s, e) =>
{
if (radioButton.Checked)
{
this.SetValue(localItem.Key, true);
}
};
index++;
}
this.Content = menuRow;
}
private void AddIconRow(IEnumerable<(string Key, string Value)> enumItems)
{
var iconsRow = new FlowLayoutWidget();
int index = 0;
var radioButtonSize = new Vector2(iconsAttribute.Width, iconsAttribute.Height);
var radioButtonSize = new Vector2(enumDisplayAttibute.IconWidth, enumDisplayAttibute.IconHeight);
foreach (var enumItem in enumItems)
{
var localIndex = index;
ImageBuffer iconImage = null;
var iconPath = iconsAttribute.IconPaths[localIndex];
var iconPath = enumDisplayAttibute.IconPaths[localIndex];
if (!string.IsNullOrWhiteSpace(iconPath))
{
if (iconsAttribute.Width > 0)
if (enumDisplayAttibute.IconWidth > 0)
{
// If the attribute allows invert, use the theme.InvertIcons state
bool invertIcons = iconsAttribute.InvertIcons ? theme.InvertIcons : false;
bool invertIcons = enumDisplayAttibute.InvertIcons ? theme.InvertIcons : false;
iconImage = AggContext.StaticData.LoadIcon(iconPath, iconsAttribute.Width, iconsAttribute.Height, invertIcons);
iconImage = AggContext.StaticData.LoadIcon(iconPath, enumDisplayAttibute.IconWidth, enumDisplayAttibute.IconHeight, invertIcons);
}
else
{
@ -114,7 +197,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
};
}
else if(iconsAttribute.Width > 0)
else if (enumDisplayAttibute.IconWidth > 0)
{
// hold the space of the empty icon
iconsRow.AddChild(new GuiWidget(radioButtonSize.X, radioButtonSize.Y));