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

Added a line for the color editing of all parts

Browse source 
Added a color editor to Public Property editor
This commit is contained in:
LarsBrubaker 2018-10-06 15:09:01 -07:00
parent 60045410ce
commit 229931039b
5 changed files with 144 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MatterControlLib/PartPreviewWindow/ItemColorButton.cs
View file

@ -41,13 +41,18 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
private ColorButton colorButton;
public ItemColorButton(InteractiveScene scene, ThemeConfig theme)
public event EventHandler ColorChanged;
public ItemColorButton(ThemeConfig theme, Color selectedColor)
{
this.ToolTipText = "Color".Localize();
HAnchor = HAnchor.Fit;
VAnchor = VAnchor.Fit;
this.DynamicPopupContent = () =>
{
return new ColorSwatchSelector(scene, theme, buttonSize: 16, buttonSpacing: new BorderDouble(1, 1, 0, 0), colorNotifier: (newColor) => colorButton.BackgroundColor = newColor)
return new ColorSwatchSelector(theme, buttonSize: 16, buttonSpacing: new BorderDouble(1, 1, 0, 0), colorNotifier: (newColor) => colorButton.BackgroundColor = newColor)
{
Padding = theme.DefaultContainerPadding,
BackgroundColor = this.HoverColor
@ -56,7 +61,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var scaledButtonSize = 14 * GuiWidget.DeviceScale;
colorButton = new ColorButton(scene.SelectedItem?.Color ?? theme.SlightShade)
colorButton = new ColorButton(selectedColor == Color.Transparent ? theme.SlightShade : selectedColor)
{
Width = scaledButtonSize,
Height = scaledButtonSize,
@ -67,6 +72,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
BorderColor = theme.GetBorderColor(75)
};
colorButton.BackgroundColorChanged += (s, e) =>
{
ColorChanged?.Invoke(this, null);
};
this.AddChild(colorButton);
}

26
MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -42,6 +42,7 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DesignTools;
using MatterHackers.MatterControl.Library;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.MeshVisualizer;
using MatterHackers.VectorMath;
using static JsonPath.JsonPathContext.ReflectionValueSystem;
@ -79,13 +80,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var scene = sceneContext.Scene;
var itemColorButton = new ItemColorButton(scene, theme)
{
Width = 30,
Height = 30,
};
toolbar.AddChild(itemColorButton);
var itemMaterialButton = new ItemMaterialButton(scene, theme)
{
Width = 30,
@ -179,11 +173,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var selectedItem = scene.SelectedItem;
if (selectedItem != null)
{
itemColorButton.Color = (selectedItem.Color == Color.Transparent) ? theme.MinimalHighlight : selectedItem.Color;
itemMaterialButton.Color = MaterialRendering.Color(selectedItem.MaterialIndex, theme.MinimalHighlight);
}
itemColorButton.Enabled = selectedItem != null;
itemMaterialButton.Enabled = selectedItem != null;
flattenButton.Enabled = selectedItem?.CanFlatten == true;
removeButton.Enabled = selectedItem != null;
@ -260,6 +252,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
bool allowOperations = true;
// put in a color edit field
var field = new ColorField(theme, selectedItem.Color);
field.Initialize(0);
field.ValueChanged += (s, e) =>
{
if (selectedItem.Color != field.Color)
{
undoBuffer.AddAndDo(new ChangeColor(selectedItem, field.Color));
}
};
var row = PublicPropertyEditor.CreateSettingsRow("Color".Localize());
row.AddChild(field.Content);
editorPanel.AddChild(row);
// put in the normal editor
if (selectedItem is ComponentObject3D componentObject
&& componentObject.Finalized)
{

17
MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs
View file

@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ColorSwatchSelector : FlowLayoutWidget
{
public ColorSwatchSelector(InteractiveScene scene, ThemeConfig theme, BorderDouble buttonSpacing, int buttonSize = 32, Action<Color> colorNotifier = null)
public ColorSwatchSelector(ThemeConfig theme, BorderDouble buttonSpacing, int buttonSize = 32, Action<Color> colorNotifier = null)
: base(FlowDirection.TopToBottom)
{
var scaledButtonSize = buttonSize * GuiWidget.DeviceScale;
@ -61,11 +61,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
for (int colorIndex = 0; colorIndex < colorCount; colorIndex++)
{
var color = ColorF.FromHSL(colorIndex / (double)colorCount, 1, lightness[rowIndex]).ToColor();
colorRow.AddChild(MakeColorButton(scene, color, scaledButtonSize, buttonSpacing, colorChanged));
colorRow.AddChild(MakeColorButton(color, scaledButtonSize, buttonSpacing, colorChanged));
}
// put in white and black buttons
colorRow.AddChild(MakeColorButton(scene, grayLevel[rowIndex], scaledButtonSize, buttonSpacing, colorChanged));
colorRow.AddChild(MakeColorButton(grayLevel[rowIndex], scaledButtonSize, buttonSpacing, colorChanged));
switch(rowIndex)
{
@ -79,26 +79,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
resetButton.Click += (s, e) =>
{
scene.UndoBuffer.AddAndDo(new ChangeColor(scene.SelectedItem, Color.Transparent));
// The colorChanged action displays the given color - use .MinimalHighlight rather than no color
colorChanged(theme.MinimalHighlight);
colorChanged(Color.Transparent);
};
colorRow.AddChild(resetButton);
break;
case 1:
colorRow.AddChild(MakeColorButton(scene, new Color("#555"), scaledButtonSize, buttonSpacing, colorChanged));
colorRow.AddChild(MakeColorButton(new Color("#555"), scaledButtonSize, buttonSpacing, colorChanged));
break;
case 2:
colorRow.AddChild(MakeColorButton(scene, new Color("#222"), scaledButtonSize, buttonSpacing, colorChanged));
colorRow.AddChild(MakeColorButton(new Color("#222"), scaledButtonSize, buttonSpacing, colorChanged));
break;
}
}
}
private GuiWidget MakeColorButton(InteractiveScene scene, Color color, double buttonSize, BorderDouble buttonSpacing, Action<Color> colorChanged)
private GuiWidget MakeColorButton(Color color, double buttonSize, BorderDouble buttonSpacing, Action<Color> colorChanged)
{
var button = new ColorButton(color)
{
@ -111,7 +109,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
UiThread.RunOnIdle(() =>
{
scene.UndoBuffer.AddAndDo(new ChangeColor(scene.SelectedItem, button.BackgroundColor));
colorChanged(button.BackgroundColor);
});
};