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

Improving Package tool

Browse source 
Changing public property editor to be able to dynamically add new properties
This commit is contained in:
Lars Brubaker 2018-04-12 17:23:19 -07:00
parent fd713d5616
commit d6addaa45a
6 changed files with 450 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

12
DesignTools/Operations/Align3D.cs
View file

@ -423,12 +423,12 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public void UpdateControls(PublicPropertyEditor editor) public void UpdateControls(PublicPropertyEditor editor)
{ {
editor.GetEditRow(nameof(XAlignTo)).Visible = Advanced && XAlign != Align.Origin; editor.GetEditRow((this.ID, nameof(XAlignTo))).Visible = Advanced && XAlign != Align.Origin;
editor.GetEditRow(nameof(XOffset)).Visible = Advanced; editor.GetEditRow((this.ID, nameof(XOffset))).Visible = Advanced;
editor.GetEditRow(nameof(YAlignTo)).Visible = Advanced && YAlign != Align.Origin; editor.GetEditRow((this.ID, nameof(YAlignTo))).Visible = Advanced && YAlign != Align.Origin;
editor.GetEditRow(nameof(YOffset)).Visible = Advanced; editor.GetEditRow((this.ID, nameof(YOffset))).Visible = Advanced;
editor.GetEditRow(nameof(ZAlignTo)).Visible = Advanced && ZAlign != Align.Origin; editor.GetEditRow((this.ID, nameof(ZAlignTo))).Visible = Advanced && ZAlign != Align.Origin;
editor.GetEditRow(nameof(ZOffset)).Visible = Advanced; editor.GetEditRow((this.ID, nameof(ZOffset))).Visible = Advanced;
} }
private static bool IsSet(Face variableToCheck, Face faceToCheckFor, Face faceToAssertNot) private static bool IsSet(Face variableToCheck, Face faceToCheckFor, Face faceToAssertNot)

95
DesignTools/Operations/Package3D.cs
View file

@ -1,33 +1,73 @@
using System; /*
using System.ComponentModel; Copyright (c) 2018, Lars Brubaker
using System.Linq; All rights reserved.
using System.Threading;
using MatterHackers.Agg.Font; 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 MatterHackers.Agg.UI; using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D; using MatterHackers.DataConverters3D;
using MatterHackers.VectorMath; using Newtonsoft.Json;
using MatterHackers.PolygonMesh; using System.Collections.Generic;
using System.Linq;
using System.Reflection;
namespace MatterHackers.MatterControl.DesignTools.Operations namespace MatterHackers.MatterControl.DesignTools.Operations
{ {
public class Package3D : Object3D, IRebuildable public class Package3D : Object3D, IRebuildable
{ {
public string NameToWrite { get; set; }
public Package3D() public Package3D()
{ {
}
[JsonIgnore]
private SubProperties _subProperties = new SubProperties();
[JsonIgnore]
public SubProperties LiftedProperties
{
get
{
_subProperties.Items.Clear();
foreach (var child in this.Descendants<TextObject3D>())
{
PropertyInfo propertyToEdit = child.GetType().GetProperties().First();
_subProperties.Items.Add(new EditableProperty(propertyToEdit, child));
}
return _subProperties;
}
set
{
// only here so it will show up in PublicPropertyEditor
}
} }
public static Package3D Create(IObject3D itemToPackage) public static Package3D Create(IObject3D itemToPackage)
{ {
Package3D package = new Package3D(); Package3D package = new Package3D();
var text = itemToPackage.Descendants<TextObject3D>().FirstOrDefault();
if (text != null)
{
package.NameToWrite = text.NameToWrite;
}
package.Children.Add(itemToPackage); package.Children.Add(itemToPackage);
return package; return package;
@ -35,26 +75,21 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public void Rebuild(UndoBuffer undoBuffer) public void Rebuild(UndoBuffer undoBuffer)
{ {
var text = this.Descendants<TextObject3D>().FirstOrDefault(); foreach (var child in this.Descendants<TextObject3D>())
if (text != null)
{ {
text.NameToWrite = this.NameToWrite; child.Rebuild(null);
text.Rebuild(null);
}
var fit = this.Descendants<FitToBounds3D>().FirstOrDefault(); foreach (var parent in child.Parents<IObject3D>())
if (fit != null) {
{ if (parent is IRebuildable rebuildable
fit.Rebuild(null); && parent != this)
} {
rebuildable.Rebuild(null);
var align = this.Descendants<Align3D>().FirstOrDefault(); }
if (align != null) }
{
align.Rebuild(null);
} }
return; return;
} }
} }
} }

720
DesignTools/PublicPropertyEditor.cs
View file

@ -46,6 +46,45 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools namespace MatterHackers.MatterControl.DesignTools
{ {
public class EditableProperty
{
public IObject3D Item { get; private set; }
public PropertyInfo PropertyInfo { get; private set; }
public EditableProperty(PropertyInfo p, IObject3D item)
{
this.Item = item;
this.PropertyInfo = p;
}
private string GetDescription(PropertyInfo prop)
{
var nameAttribute = prop.GetCustomAttributes(true).OfType<DescriptionAttribute>().FirstOrDefault();
return nameAttribute?.Description ?? null;
}
public static string GetDisplayName(PropertyInfo prop)
{
var nameAttribute = prop.GetCustomAttributes(true).OfType<DisplayNameAttribute>().FirstOrDefault();
return nameAttribute?.DisplayName ?? prop.Name.SplitCamelCase();
}
public object Value => PropertyInfo.GetGetMethod().Invoke(Item, null);
public string DisplayName => GetDisplayName(PropertyInfo);
public string Description => GetDescription(PropertyInfo);
public Type ptype => PropertyInfo.PropertyType;
}
public class SubProperties
{
public List<EditableProperty> Items = new List<EditableProperty>();
public virtual IEnumerable<EditableProperty> GetProperties()
{
foreach (var item in Items)
{
yield return item;
}
}
}
public class PublicPropertyEditor : IObject3DEditor public class PublicPropertyEditor : IObject3DEditor
{ {
@ -57,14 +96,14 @@ namespace MatterHackers.MatterControl.DesignTools
public IEnumerable<Type> SupportedTypes() => new Type[] { typeof(IRebuildable) }; public IEnumerable<Type> SupportedTypes() => new Type[] { typeof(IRebuildable) };
private Dictionary<string, GuiWidget> editRows = new Dictionary<string, GuiWidget>(); private Dictionary<(string id, string propertyName), GuiWidget> editRows = new Dictionary<(string id, string propertyName), GuiWidget>();
private static Type[] allowedTypes = private static Type[] allowedTypes =
{ {
typeof(double), typeof(int), typeof(char), typeof(string), typeof(bool), typeof(double), typeof(int), typeof(char), typeof(string), typeof(bool),
typeof(Vector2), typeof(Vector3), typeof(Vector2), typeof(Vector3),
typeof(DirectionVector), typeof(DirectionAxis), typeof(DirectionVector), typeof(DirectionAxis),
typeof(ImageObject3D) typeof(ImageObject3D), typeof(SubProperties)
}; };
private static Type IObject3DType = typeof(IObject3D); private static Type IObject3DType = typeof(IObject3D);
@ -98,10 +137,10 @@ namespace MatterHackers.MatterControl.DesignTools
return mainContainer; return mainContainer;
} }
public GuiWidget GetEditRow(string propertyName) public GuiWidget GetEditRow((string id, string propertyName) key)
{ {
GuiWidget value; GuiWidget value;
if (editRows.TryGetValue(propertyName, out value)) if (editRows.TryGetValue(key, out value))
{ {
return value; return value;
} }
@ -130,35 +169,7 @@ namespace MatterHackers.MatterControl.DesignTools
return rowContainer; return rowContainer;
} }
public static string GetDisplayName(PropertyInfo prop) public static IEnumerable<EditableProperty> GetEditablePropreties(IObject3D item)
{
var nameAttribute = prop.GetCustomAttributes(true).OfType<DisplayNameAttribute>().FirstOrDefault();
return nameAttribute?.DisplayName ?? prop.Name.SplitCamelCase();
}
public class EditableProperty
{
public Object Item { get; private set; }
public PropertyInfo PropertyInfo { get; private set; }
public EditableProperty(PropertyInfo p, object item)
{
this.Item = item;
this.PropertyInfo = p;
}
private string GetDescription(PropertyInfo prop)
{
var nameAttribute = prop.GetCustomAttributes(true).OfType<DescriptionAttribute>().FirstOrDefault();
return nameAttribute?.Description ?? null;
}
public object Value => PropertyInfo.GetGetMethod().Invoke(Item, null);
public string DisplayName => GetDisplayName(PropertyInfo);
public string Description => GetDescription(PropertyInfo);
public Type ptype => PropertyInfo.PropertyType;
}
public static IEnumerable<EditableProperty> GetEditablePropreties(Object item)
{ {
return item.GetType().GetProperties(OwnedPropertiesOnly) return item.GetType().GetProperties(OwnedPropertiesOnly)
.Where(pi => (allowedTypes.Contains(pi.PropertyType) || pi.PropertyType.IsEnum) .Where(pi => (allowedTypes.Contains(pi.PropertyType) || pi.PropertyType.IsEnum)
@ -182,308 +193,7 @@ namespace MatterHackers.MatterControl.DesignTools
foreach (var property in editableProperties) foreach (var property in editableProperties)
{ {
GuiWidget rowContainer = null; AddPropertyEditor(this, view3DWidget, editControlsContainer, theme, undoBuffer, rebuildable, propertyGridModifier, property, editRows);
// create a double editor
if (property.Value is double doubleValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new DoubleField();
field.Initialize(0);
field.DoubleValue = doubleValue;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { field.DoubleValue });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
else if (property.Value is Vector2 vector2)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new Vector2Field();
field.Initialize(0);
field.Vector2 = vector2;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { field.Vector2 });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
else if (property.Value is Vector3 vector3)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new Vector3Field();
field.Initialize(0);
field.Vector3 = vector3;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { field.Vector3 });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
else if (property.Value is DirectionVector directionVector)
{
bool simpleEdit = true;
if (simpleEdit)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var dropDownList = new DropDownList("Name".Localize(), theme.Colors.PrimaryTextColor, Direction.Down, pointSize: theme.DefaultFontSize)
{
BorderColor = theme.GetBorderColor(75)
};
var orderedItems = new string[] { "Right", "Back", "Up" };
foreach (var orderItem in orderedItems)
{
MenuItem newItem = dropDownList.AddItem(orderItem);
var localOredrItem = orderItem;
newItem.Selected += (sender, e) =>
{
switch (dropDownList.SelectedValue)
{
case "Right":
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { new DirectionVector() { Normal = Vector3.UnitX } });
break;
case "Back":
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { new DirectionVector() { Normal = Vector3.UnitY } });
break;
case "Up":
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { new DirectionVector() { Normal = Vector3.UnitZ } });
break;
}
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
}
dropDownList.SelectedLabel = "Right";
rowContainer.AddChild(dropDownList);
editControlsContainer.AddChild(rowContainer);
}
else // edit the vector
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new Vector3Field();
field.Initialize(0);
field.Vector3 = directionVector.Normal;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { new DirectionVector() { Normal = field.Vector3 } });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
}
else if (property.Value is DirectionAxis directionAxis)
{
bool simpleAxis = true;
if (simpleAxis)
{
// the direction axis
// the distance from the center of the part
// create a double editor
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new DoubleField();
field.Initialize(0);
field.DoubleValue = directionAxis.Origin.X - item.Children.First().GetAxisAlignedBoundingBox().Center.X;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[]
{
new DirectionAxis()
{
Normal = Vector3.UnitZ, Origin = item.Children.First().GetAxisAlignedBoundingBox().Center + new Vector3(field.DoubleValue, 0, 0)
}
});
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
// update tihs when changed
EventHandler updateData = (object s, EventArgs e) =>
{
field.DoubleValue = ((DirectionAxis)property.PropertyInfo.GetGetMethod().Invoke(this.item, null)).Origin.X - item.Children.First().GetAxisAlignedBoundingBox().Center.X;
};
item.Invalidated += updateData;
editControlsContainer.Closed += (s, e) =>
{
item.Invalidated -= updateData;
};
}
else
{
// add in the position
FlowLayoutWidget originRowContainer = CreateSettingsRow(property.DisplayName.Localize());
var originField = new Vector3Field();
originField.Initialize(0);
originField.Vector3 = directionAxis.Origin;
var normalField = new Vector3Field();
normalField.Initialize(0);
normalField.Vector3 = directionAxis.Normal;
originField.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { new DirectionAxis() { Origin = originField.Vector3, Normal = normalField.Vector3 } });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
originRowContainer.AddChild(originField.Content);
editControlsContainer.AddChild(originRowContainer);
// add in the direction
FlowLayoutWidget directionRowContainer = CreateSettingsRow(property.DisplayName.Localize());
normalField.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { new DirectionAxis() { Origin = originField.Vector3, Normal = normalField.Vector3 } });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
directionRowContainer.AddChild(normalField.Content);
editControlsContainer.AddChild(directionRowContainer);
// update tihs when changed
EventHandler updateData = (object s, EventArgs e) =>
{
originField.Vector3 = ((DirectionAxis)property.PropertyInfo.GetGetMethod().Invoke(this.item, null)).Origin;
};
item.Invalidated += updateData;
editControlsContainer.Closed += (s, e) =>
{
item.Invalidated -= updateData;
};
}
}
// create a int editor
else if (property.Value is int intValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new IntField();
field.Initialize(0);
field.IntValue = intValue;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { field.IntValue });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
// create a bool editor
else if (property.Value is bool boolValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize(), property.Description.Localize());
var field = new ToggleboxField(theme);
field.Initialize(0);
field.Checked = boolValue;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { field.Checked });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
// create a string editor
else if (property.Value is string stringValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var textEditWidget = new MHTextEditWidget(stringValue, pixelWidth: 150 * GuiWidget.DeviceScale)
{
SelectAllOnFocus = true,
VAnchor = VAnchor.Center
};
textEditWidget.ActualTextEditWidget.EditComplete += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { textEditWidget.Text });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(textEditWidget);
editControlsContainer.AddChild(rowContainer);
}
// create a char editor
else if (property.Value is char charValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var textEditWidget = new MHTextEditWidget(charValue.ToString(), pixelWidth: 150 * GuiWidget.DeviceScale)
{
SelectAllOnFocus = true,
VAnchor = VAnchor.Center
};
textEditWidget.ActualTextEditWidget.EditComplete += (s, e) =>
{
if (textEditWidget.Text.Length < 1)
{
textEditWidget.Text = "a";
}
if (textEditWidget.Text.Length > 1)
{
textEditWidget.Text = textEditWidget.Text.Substring(0, 1);
}
property.PropertyInfo.GetSetMethod().Invoke(this.item, new Object[] { textEditWidget.Text[0] });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this);
};
rowContainer.AddChild(textEditWidget);
editControlsContainer.AddChild(rowContainer);
}
// create an enum editor
else if (property.ptype.IsEnum)
{
rowContainer = CreateEnumEditor(rebuildable,
property.PropertyInfo, property.ptype, property.Value, property.DisplayName,
theme, undoBuffer);
editControlsContainer.AddChild(rowContainer);
}
// Use known IObject3D editors
else if (property.Value is IObject3D object3D
&& ApplicationController.Instance.GetEditorsForType(property.ptype)?.FirstOrDefault() is IObject3DEditor editor)
{
rowContainer = editor.Create( object3D, view3DWidget, theme);
editControlsContainer.AddChild(rowContainer);
}
// remember the row name and widget
editRows.Add(property.PropertyInfo.Name, rowContainer);
} }
var hideUpdate = item.GetType().GetCustomAttributes(typeof(HideUpdateButtonAttribute), true).FirstOrDefault() as HideUpdateButtonAttribute; var hideUpdate = item.GetType().GetCustomAttributes(typeof(HideUpdateButtonAttribute), true).FirstOrDefault() as HideUpdateButtonAttribute;
@ -498,10 +208,330 @@ namespace MatterHackers.MatterControl.DesignTools
}; };
editControlsContainer.AddChild(updateButton); editControlsContainer.AddChild(updateButton);
} }
// make sure the ui is set right to start // make sure the ui is set right to start
propertyGridModifier?.UpdateControls(this); propertyGridModifier?.UpdateControls(this);
} }
private static void AddPropertyEditor(PublicPropertyEditor publicPropertyEditor,
View3DWidget view3DWidget, FlowLayoutWidget editControlsContainer, ThemeConfig theme,
UndoBuffer undoBuffer, IRebuildable rebuildable, IPropertyGridModifier propertyGridModifier,
EditableProperty property, Dictionary<(string id, string propertyName), GuiWidget> editRows)
{
GuiWidget rowContainer = null;
// create a double editor
if (property.Value is double doubleValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new DoubleField();
field.Initialize(0);
field.DoubleValue = doubleValue;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { field.DoubleValue });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
else if (property.Value is SubProperties subProperties)
{
foreach(var subProperty in subProperties.GetProperties())
{
AddPropertyEditor(publicPropertyEditor, view3DWidget, editControlsContainer, theme, undoBuffer,
rebuildable, propertyGridModifier, subProperty, editRows);
}
// don't add a row, they were added for the individual properties
return;
}
else if (property.Value is Vector2 vector2)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new Vector2Field();
field.Initialize(0);
field.Vector2 = vector2;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { field.Vector2 });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
else if (property.Value is Vector3 vector3)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new Vector3Field();
field.Initialize(0);
field.Vector3 = vector3;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { field.Vector3 });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
else if (property.Value is DirectionVector directionVector)
{
bool simpleEdit = true;
if (simpleEdit)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var dropDownList = new DropDownList("Name".Localize(), theme.Colors.PrimaryTextColor, Direction.Down, pointSize: theme.DefaultFontSize)
{
BorderColor = theme.GetBorderColor(75)
};
var orderedItems = new string[] { "Right", "Back", "Up" };
foreach (var orderItem in orderedItems)
{
MenuItem newItem = dropDownList.AddItem(orderItem);
var localOredrItem = orderItem;
newItem.Selected += (sender, e) =>
{
switch (dropDownList.SelectedValue)
{
case "Right":
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { new DirectionVector() { Normal = Vector3.UnitX } });
break;
case "Back":
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { new DirectionVector() { Normal = Vector3.UnitY } });
break;
case "Up":
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { new DirectionVector() { Normal = Vector3.UnitZ } });
break;
}
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
}
dropDownList.SelectedLabel = "Right";
rowContainer.AddChild(dropDownList);
editControlsContainer.AddChild(rowContainer);
}
else // edit the vector
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new Vector3Field();
field.Initialize(0);
field.Vector3 = directionVector.Normal;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { new DirectionVector() { Normal = field.Vector3 } });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
}
else if (property.Value is DirectionAxis directionAxis)
{
bool simpleAxis = true;
if (simpleAxis)
{
// the direction axis
// the distance from the center of the part
// create a double editor
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new DoubleField();
field.Initialize(0);
field.DoubleValue = directionAxis.Origin.X - property.Item.Children.First().GetAxisAlignedBoundingBox().Center.X;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[]
{
new DirectionAxis()
{
Normal = Vector3.UnitZ, Origin = property.Item.Children.First().GetAxisAlignedBoundingBox().Center + new Vector3(field.DoubleValue, 0, 0)
}
});
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
// update tihs when changed
EventHandler updateData = (object s, EventArgs e) =>
{
field.DoubleValue = ((DirectionAxis)property.PropertyInfo.GetGetMethod().Invoke(property.Item, null)).Origin.X - property.Item.Children.First().GetAxisAlignedBoundingBox().Center.X;
};
property.Item.Invalidated += updateData;
editControlsContainer.Closed += (s, e) =>
{
property.Item.Invalidated -= updateData;
};
}
else
{
// add in the position
FlowLayoutWidget originRowContainer = CreateSettingsRow(property.DisplayName.Localize());
var originField = new Vector3Field();
originField.Initialize(0);
originField.Vector3 = directionAxis.Origin;
var normalField = new Vector3Field();
normalField.Initialize(0);
normalField.Vector3 = directionAxis.Normal;
originField.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { new DirectionAxis() { Origin = originField.Vector3, Normal = normalField.Vector3 } });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
originRowContainer.AddChild(originField.Content);
editControlsContainer.AddChild(originRowContainer);
// add in the direction
FlowLayoutWidget directionRowContainer = CreateSettingsRow(property.DisplayName.Localize());
normalField.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { new DirectionAxis() { Origin = originField.Vector3, Normal = normalField.Vector3 } });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
directionRowContainer.AddChild(normalField.Content);
editControlsContainer.AddChild(directionRowContainer);
// update tihs when changed
EventHandler updateData = (object s, EventArgs e) =>
{
originField.Vector3 = ((DirectionAxis)property.PropertyInfo.GetGetMethod().Invoke(property.Item, null)).Origin;
};
property.Item.Invalidated += updateData;
editControlsContainer.Closed += (s, e) =>
{
property.Item.Invalidated -= updateData;
};
}
}
// create a int editor
else if (property.Value is int intValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var field = new IntField();
field.Initialize(0);
field.IntValue = intValue;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { field.IntValue });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
// create a bool editor
else if (property.Value is bool boolValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize(), property.Description.Localize());
var field = new ToggleboxField(theme.Colors.PrimaryTextColor);
field.Initialize(0);
field.Checked = boolValue;
field.ValueChanged += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { field.Checked });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(field.Content);
editControlsContainer.AddChild(rowContainer);
}
// create a string editor
else if (property.Value is string stringValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var textEditWidget = new MHTextEditWidget(stringValue, pixelWidth: 150 * GuiWidget.DeviceScale)
{
SelectAllOnFocus = true,
VAnchor = VAnchor.Center
};
textEditWidget.ActualTextEditWidget.EditComplete += (s, e) =>
{
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { textEditWidget.Text });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(textEditWidget);
editControlsContainer.AddChild(rowContainer);
}
// create a char editor
else if (property.Value is char charValue)
{
rowContainer = CreateSettingsRow(property.DisplayName.Localize());
var textEditWidget = new MHTextEditWidget(charValue.ToString(), pixelWidth: 150 * GuiWidget.DeviceScale)
{
SelectAllOnFocus = true,
VAnchor = VAnchor.Center
};
textEditWidget.ActualTextEditWidget.EditComplete += (s, e) =>
{
if (textEditWidget.Text.Length < 1)
{
textEditWidget.Text = "a";
}
if (textEditWidget.Text.Length > 1)
{
textEditWidget.Text = textEditWidget.Text.Substring(0, 1);
}
property.PropertyInfo.GetSetMethod().Invoke(property.Item, new Object[] { textEditWidget.Text[0] });
rebuildable?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(publicPropertyEditor);
};
rowContainer.AddChild(textEditWidget);
editControlsContainer.AddChild(rowContainer);
}
// create an enum editor
else if (property.ptype.IsEnum)
{
rowContainer = CreateEnumEditor(publicPropertyEditor, rebuildable,
property, property.ptype, property.Value, property.DisplayName,
theme, undoBuffer);
editControlsContainer.AddChild(rowContainer);
}
// Use known IObject3D editors
else if (property.Value is IObject3D object3D
&& ApplicationController.Instance.GetEditorsForType(property.ptype)?.FirstOrDefault() is IObject3DEditor editor)
{
rowContainer = editor.Create(object3D, view3DWidget, theme);
editControlsContainer.AddChild(rowContainer);
}
// remember the row name and widget
editRows.Add((property.Item.ID, property.PropertyInfo.Name), rowContainer);
}
private void AddUnlockLinkIfRequired(FlowLayoutWidget editControlsContainer, ThemeConfig theme) private void AddUnlockLinkIfRequired(FlowLayoutWidget editControlsContainer, ThemeConfig theme)
{ {
var unlockLink = item.GetType().GetCustomAttributes(typeof(UnlockLinkAttribute), true).FirstOrDefault() as UnlockLinkAttribute; var unlockLink = item.GetType().GetCustomAttributes(typeof(UnlockLinkAttribute), true).FirstOrDefault() as UnlockLinkAttribute;
@ -541,8 +571,8 @@ namespace MatterHackers.MatterControl.DesignTools
} }
} }
private GuiWidget CreateEnumEditor(IRebuildable item, private static GuiWidget CreateEnumEditor(PublicPropertyEditor publicPropertyEditor, IRebuildable item,
PropertyInfo propertyInfo, Type propertyType, object value, string displayName, EditableProperty property, Type propertyType, object value, string displayName,
ThemeConfig theme, ThemeConfig theme,
UndoBuffer undoBuffer) UndoBuffer undoBuffer)
{ {
@ -560,7 +590,7 @@ namespace MatterHackers.MatterControl.DesignTools
FlowLayoutWidget rowContainer = CreateSettingsRow(displayName); FlowLayoutWidget rowContainer = CreateSettingsRow(displayName);
var iconsAttribute = propertyInfo.GetCustomAttributes(true).OfType<IconsAttribute>().FirstOrDefault(); var iconsAttribute = property.PropertyInfo.GetCustomAttributes(true).OfType<IconsAttribute>().FirstOrDefault();
if (iconsAttribute != null) if (iconsAttribute != null)
{ {
int index = 0; int index = 0;
@ -599,11 +629,11 @@ namespace MatterHackers.MatterControl.DesignTools
{ {
if (radioButton.Checked) if (radioButton.Checked)
{ {
propertyInfo.GetSetMethod().Invoke( property.PropertyInfo.GetSetMethod().Invoke(
this.item, property.Item,
new Object[] { Enum.Parse(propertyType, localItem.Key) }); new Object[] { Enum.Parse(propertyType, localItem.Key) });
item?.Rebuild(undoBuffer); item?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this); propertyGridModifier?.UpdateControls(publicPropertyEditor);
if (localIndex != 0 if (localIndex != 0
|| !iconsAttribute.Item0IsNone) || !iconsAttribute.Item0IsNone)
{ {
@ -626,7 +656,7 @@ namespace MatterHackers.MatterControl.DesignTools
BorderColor = theme.GetBorderColor(75) BorderColor = theme.GetBorderColor(75)
}; };
var sortableAttribute = propertyInfo.GetCustomAttributes(true).OfType<SortableAttribute>().FirstOrDefault(); var sortableAttribute = property.PropertyInfo.GetCustomAttributes(true).OfType<SortableAttribute>().FirstOrDefault();
var orderedItems = sortableAttribute != null ? enumItems.OrderBy(n => n.Value) : enumItems; var orderedItems = sortableAttribute != null ? enumItems.OrderBy(n => n.Value) : enumItems;
foreach (var orderItem in orderedItems) foreach (var orderItem in orderedItems)
@ -636,11 +666,11 @@ namespace MatterHackers.MatterControl.DesignTools
var localOrderedItem = orderItem; var localOrderedItem = orderItem;
newItem.Selected += (sender, e) => newItem.Selected += (sender, e) =>
{ {
propertyInfo.GetSetMethod().Invoke( property.PropertyInfo.GetSetMethod().Invoke(
this.item, property.Item,
new Object[] { Enum.Parse(propertyType, localOrderedItem.Key) }); new Object[] { Enum.Parse(propertyType, localOrderedItem.Key) });
item?.Rebuild(undoBuffer); item?.Rebuild(undoBuffer);
propertyGridModifier?.UpdateControls(this); propertyGridModifier?.UpdateControls(publicPropertyEditor);
}; };
} }

4
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -290,7 +290,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
Type = propertyType, Type = propertyType,
Value = item.GetValue(selectedItem, null) as IObject3D, Value = item.GetValue(selectedItem, null) as IObject3D,
DisplayName = PublicPropertyEditor.GetDisplayName(item) DisplayName = EditableProperty.GetDisplayName(item)
}; };
// Shown known editors for any matching properties // Shown known editors for any matching properties
@ -311,7 +311,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
Type = item.PropertyType, Type = item.PropertyType,
Value = item.GetValue(selectedItem, null) as IObject3D, Value = item.GetValue(selectedItem, null) as IObject3D,
DisplayName = PublicPropertyEditor.GetDisplayName(item) DisplayName = EditableProperty.GetDisplayName(item)
}; };
// Shown known editors for any matching properties // Shown known editors for any matching properties

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 5d49759ebee1bcb93be08c4319de4155382b5ed2 Subproject commit 8a12f59f45d02dfc21a62329d1e15a48e13956d1

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit bcf6f08b3a27e3aeedf6229cb5a5cc0c9ddb4ae7 Subproject commit b80c97dafebed4d6566bce4e29897b417d2d9558