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

Merge pull request #3802 from larsbrubaker/master

Browse source 
Added color and material editor in main properties panel
This commit is contained in:
Lars Brubaker 2018-10-08 09:21:10 -07:00 • committed by GitHub
commit 67bf88db7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 406 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -101,6 +101,7 @@ namespace MatterHackers.MatterControl.DesignTools
private static Type[] allowedTypes =
{
typeof(double), typeof(int), typeof(char), typeof(string), typeof(bool),
typeof(Color),
typeof(Vector2), typeof(Vector3),
typeof(DirectionVector), typeof(DirectionAxis),
typeof(ChildrenSelector),
@ -187,7 +188,7 @@ namespace MatterHackers.MatterControl.DesignTools
return row;
}
private static FlowLayoutWidget CreateSettingsRow(string labelText, string toolTipText = null)
public static FlowLayoutWidget CreateSettingsRow(string labelText, string toolTipText = null)
{
var rowContainer = new FlowLayoutWidget(FlowDirection.LeftToRight)
{
@ -299,6 +300,19 @@ namespace MatterHackers.MatterControl.DesignTools
rowContainer = CreateSettingsRow(property, field);
}
else if (propertyValue is Color color)
{
var field = new ColorField(theme, object3D.Color);
field.Initialize(0);
field.ValueChanged += (s, e) =>
{
property.SetValue(field.Color);
object3D?.Invalidate(new InvalidateArgs(context.item, InvalidateType.Properties, undoBuffer));
propertyGridModifier?.UpdateControls(new PublicPropertyChange(context, property.PropertyInfo.Name));
};
rowContainer = CreateSettingsRow(property, field);
}
else if (propertyValue is Vector2 vector2)
{
var field = new Vector2Field();

12
MatterControlLib/PartPreviewWindow/DropButton.cs
View file

@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class DropButton : SimpleButton
{
private bool menuVisible;
public bool MenuVisible { get; private set; }
public DropButton(ThemeConfig theme)
: base(theme)
@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public override Color BackgroundColor
{
get => menuVisible ? theme.SlightShade : base.BackgroundColor;
get => MenuVisible ? theme.SlightShade : base.BackgroundColor;
set => base.BackgroundColor = value;
}
@ -75,14 +75,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public override void OnMouseDown(MouseEventArgs mouseEvent)
{
downWhileOpen = menuVisible;
downWhileOpen = MenuVisible;
base.OnMouseDown(mouseEvent);
}
public override void OnClick(MouseEventArgs mouseEvent)
{
if (!menuVisible
if (!MenuVisible
&& !downWhileOpen)
{
var popupContent = this.PopupContent();
@ -96,12 +96,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (this.Parents<SystemWindow>().FirstOrDefault() is SystemWindow systemWindow)
{
menuVisible = true;
MenuVisible = true;
void popupContent_Closed(object sender, EventArgs e)
{
// Reset menuVisible
menuVisible = false;
MenuVisible = false;
popupContent.Closed -= popupContent_Closed;
}

23
MatterControlLib/PartPreviewWindow/ItemColorButton.cs
View file

@ -41,22 +41,28 @@ 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();
var scaledButtonSize = 14 * GuiWidget.DeviceScale;
Width = 30 * GuiWidget.DeviceScale;
Height = 30 * GuiWidget.DeviceScale;
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
BackgroundColor = this.HoverColor,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit
};
};
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 +73,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
BorderColor = theme.GetBorderColor(75)
};
colorButton.BackgroundColorChanged += (s, e) =>
{
ColorChanged?.Invoke(this, null);
};
this.AddChild(colorButton);
}

21
MatterControlLib/PartPreviewWindow/ItemMaterialButton.cs
View file

@ -34,6 +34,7 @@ using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MeshVisualizer;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
@ -41,25 +42,35 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
private ColorButton materialColorButton;
public ItemMaterialButton(InteractiveScene scene, ThemeConfig theme)
public event EventHandler<int> MaterialChanged;
public ItemMaterialButton(ThemeConfig theme, int initialMaterialIndex)
{
this.ToolTipText = "Material".Localize();
var scaledButtonSize = 14 * GuiWidget.DeviceScale;
Width = 30 * GuiWidget.DeviceScale;
Height = 30 * GuiWidget.DeviceScale;
this.DynamicPopupContent = () =>
{
//return new ColorSwatchSelector(scene, theme, buttonSize: 16, buttonSpacing: new BorderDouble(1, 1, 0, 0), colorNotifier: (newColor) => colorButton.BackgroundColor = newColor)
return new MaterialControls(scene, theme, colorNotifier: (newColor) => materialColorButton.BackgroundColor = newColor)
var materialControl = new MaterialControls(theme, initialMaterialIndex)
{
Padding = theme.DefaultContainerPadding,
BackgroundColor = this.HoverColor,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit
};
materialControl.IndexChanged += (s, e) =>
{
MaterialChanged?.Invoke(this, e);
};
return materialControl;
};
materialColorButton = new ColorButton(scene.SelectedItem?.Color ?? theme.SlightShade)
materialColorButton = new ColorButton(MaterialRendering.Color(initialMaterialIndex, theme.MinimalHighlight))
{
Width = scaledButtonSize,
Height = scaledButtonSize,

48
MatterControlLib/PartPreviewWindow/MaterialControls.cs
View file

@ -41,13 +41,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
private ObservableCollection<GuiWidget> materialButtons = new ObservableCollection<GuiWidget>();
private ThemeConfig theme;
private InteractiveScene scene;
public event EventHandler<int> IndexChanged;
public MaterialControls(InteractiveScene scene, ThemeConfig theme, Action<Color> colorNotifier = null)
public MaterialControls(ThemeConfig theme, int initialMaterialIndex)
: base(FlowDirection.TopToBottom)
{
this.theme = theme;
this.scene = scene;
this.HAnchor = HAnchor.Fit;
this.VAnchor = VAnchor.Fit;
@ -71,12 +70,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
buttonView.AddChild(new ColorButton(MaterialRendering.Color(extruderIndex, theme.MinimalHighlight))
{
Margin = new BorderDouble(right: 5),
Width = scaledButtonSize,
Height = scaledButtonSize,
VAnchor = VAnchor.Center,
DrawGrid = true,
//DoubleBuffer = true
});
buttonView.AddChild(new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
@ -95,7 +92,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
TextColor = theme.Colors.PrimaryTextColor,
Checked = extruderIndex == scene.SelectedItem.MaterialIndex
Checked = extruderIndex == initialMaterialIndex
};
materialButtons.Add(radioButton);
this.AddChild(radioButton);
@ -103,50 +100,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
int localExtruderIndex = extruderIndex;
radioButton.Click += (sender, e) =>
{
var selectedItem = scene.SelectedItem;
if (selectedItem != null)
{
selectedItem.MaterialIndex = localExtruderIndex;
colorNotifier?.Invoke(MaterialRendering.Color(localExtruderIndex, theme.MinimalHighlight));
scene.Invalidate(new InvalidateArgs(null, InvalidateType.Material));
}
IndexChanged?.Invoke(this, localExtruderIndex);
};
}
scene.SelectionChanged += Scene_SelectionChanged;
}
private void Scene_SelectionChanged(object sender, EventArgs e)
{
var selectedItem = scene.SelectedItem;
if (selectedItem != null
&& materialButtons?.Count > 0)
{
bool setSelection = false;
// Set the material selector to have the correct material button selected
for (int i = 0; i < materialButtons.Count; i++)
{
// the first button is 'Default' so we are looking for the button that is i - 1 (0 = material 1 = button 1)
if (selectedItem.MaterialIndex == i - 1)
{
((RadioButton)materialButtons[i]).Checked = true;
setSelection = true;
}
}
if (!setSelection)
{
((RadioButton)materialButtons[0]).Checked = true;
}
}
}
public override void OnClosed(EventArgs e)
{
scene.SelectionChanged -= Scene_SelectionChanged;
base.OnClosed(e);
}

114
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,20 +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,
Height = 30,
};
toolbar.AddChild(itemMaterialButton);
// put in a make permanent button
var icon = AggContext.StaticData.LoadIcon("noun_766157.png", 16, 16, theme.InvertIcons).SetPreMultiply();
var flattenButton = new IconButton(icon, theme)
@ -177,64 +164,13 @@ 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;
overflowButton.Enabled = selectedItem != null;
};
}
/// <summary>
/// Behavior from removed Edit button - keeping around for reuse as an advanced feature in the future
/// </summary>
/// <returns></returns>
private async Task EditChildInIsolatedContext()
{
var bed = new BedConfig(ApplicationController.Instance.Library.PartHistory);
var partPreviewContent = this.Parents<PartPreviewContent>().FirstOrDefault();
partPreviewContent.CreatePartTab(
"New Part",
bed,
theme);
var clonedItem = this.item.Clone();
// Edit in Identity transform
clonedItem.Matrix = Matrix4X4.Identity;
await bed.LoadContent(
new EditContext()
{
ContentStore = new DynamicContentStore((libraryItem, object3D) =>
{
var replacement = object3D.Clone();
this.item.Parent.Children.Modify(list =>
{
list.Remove(item);
// Restore matrix of item being replaced
replacement.Matrix = item.Matrix;
list.Add(replacement);
item = replacement;
});
sceneContext.Scene.SelectedItem = replacement;
}),
SourceItem = new InMemoryLibraryItem(clonedItem),
});
}
public GuiWidget ContentPanel { get; set; }
private JsonPathContext pathResolver = new JsonPathContext();
@ -260,6 +196,54 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
bool allowOperations = true;
// put in a color edit field
var colorField = new ColorField(theme, selectedItem.Color);
colorField.Initialize(0);
colorField.ValueChanged += (s, e) =>
{
if (selectedItem.Color != colorField.Color)
{
undoBuffer.AddAndDo(new ChangeColor(selectedItem, colorField.Color));
}
};
var colorRow = PublicPropertyEditor.CreateSettingsRow("Color".Localize());
colorRow.AddChild(colorField.Content);
colorField.Content.MouseDown += (s, e) =>
{
// make sure the render mode is set to shaded or outline
if (sceneContext.ViewState.RenderType != RenderOpenGl.RenderTypes.Shaded
&& sceneContext.ViewState.RenderType != RenderOpenGl.RenderTypes.Outlines)
{
// make sure the render mode is set to material
sceneContext.ViewState.RenderType = RenderOpenGl.RenderTypes.Outlines;
}
};
editorPanel.AddChild(colorRow);
// put in a material edit field
var materialField = new MaterialIndexField(theme, selectedItem.MaterialIndex);
materialField.Initialize(0);
materialField.ValueChanged += (s, e) =>
{
if (selectedItem.MaterialIndex != materialField.MaterialIndex)
{
undoBuffer.AddAndDo(new ChangeMaterial(selectedItem, materialField.MaterialIndex));
}
};
var materialRow = PublicPropertyEditor.CreateSettingsRow("Material".Localize());
materialRow.AddChild(materialField.Content);
materialField.Content.MouseDown += (s, e) =>
{
if (sceneContext.ViewState.RenderType != RenderOpenGl.RenderTypes.Materials)
{
// make sure the render mode is set to material
sceneContext.ViewState.RenderType = RenderOpenGl.RenderTypes.Materials;
}
}; editorPanel.AddChild(materialRow);
// 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);
});
};

61
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -199,33 +199,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (!buttonIsBeingClicked)
{
double displayTime = 2;
double pulseTime = .5;
double totalSeconds = 0;
Color backgroundColor = activeButton.BackgroundColor;
Color hightlightColor = theme.Colors.PrimaryAccentColor.AdjustContrast(theme.Colors.PrimaryTextColor, 6).ToColor();
// Show a highlight on the button as the user did not click it
Animation flashBackground = null;
flashBackground = new Animation()
{
DrawTarget = activeButton,
FramesPerSecond = 10,
Update = (s1, updateEvent) =>
{
totalSeconds += updateEvent.SecondsPassed;
if (totalSeconds < displayTime)
{
double blend = AttentionGetter.GetFadeInOutPulseRatio(totalSeconds, pulseTime);
activeButton.BackgroundColor = new Color(hightlightColor, (int)(blend * 255));
}
else
{
activeButton.BackgroundColor = backgroundColor;
flashBackground.Stop();
}
}
};
flashBackground.Start();
activeButton.FlashBackground(theme.Colors.PrimaryAccentColor.AdjustContrast(theme.Colors.PrimaryTextColor, 6).ToColor());
}
}
};
@ -460,4 +434,37 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
});
}
}
public static class WidgetAnimationExtensions
{
public static void FlashBackground(this GuiWidget widget, Color hightlightColor)
{
double displayTime = 2;
double pulseTime = .5;
double totalSeconds = 0;
Color backgroundColor = widget.BackgroundColor;
// Show a highlight on the button as the user did not click it
Animation flashBackground = null;
flashBackground = new Animation()
{
DrawTarget = widget,
FramesPerSecond = 10,
Update = (s1, updateEvent) =>
{
totalSeconds += updateEvent.SecondsPassed;
if (totalSeconds < displayTime)
{
double blend = AttentionGetter.GetFadeInOutPulseRatio(totalSeconds, pulseTime);
widget.BackgroundColor = new Color(hightlightColor, (int)(blend * 255));
}
else
{
widget.BackgroundColor = backgroundColor;
flashBackground.Stop();
}
}
};
flashBackground.Start();
}
}
}

86
MatterControlLib/PartPreviewWindow/View3D/UndoCommands/ChangeMaterial.cs Normal file
View file

@ -0,0 +1,86 @@
/*
Copyright (c) 2017, Lars Brubaker, John Lewin
All rights reserved.
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 System.Collections.Generic;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ChangeMaterial : IUndoRedoCommand
{
List<PrintOutputTypes> itemsPrintOutputType = new List<PrintOutputTypes>();
List<int> itemsMaterialIndex = new List<int>();
List<IObject3D> itemsToChange = new List<IObject3D>();
int materialIndex;
public ChangeMaterial(IObject3D selectedItem, int materialIndex)
{
this.materialIndex = materialIndex;
if (selectedItem is SelectionGroupObject3D)
{
SetData(selectedItem.Children.ToList());
}
else
{
SetData(new List<IObject3D> { selectedItem });
}
}
void SetData(List<IObject3D> itemsToChange)
{
foreach (var item in itemsToChange)
{
this.itemsToChange.Add(item);
this.itemsMaterialIndex.Add(item.MaterialIndex);
this.itemsPrintOutputType.Add(item.OutputType);
}
}
void IUndoRedoCommand.Do()
{
foreach(var item in this.itemsToChange)
{
item.OutputType = PrintOutputTypes.Solid;
item.MaterialIndex = materialIndex;
}
}
void IUndoRedoCommand.Undo()
{
for(int i=0; i< this.itemsToChange.Count; i++)
{
itemsToChange[i].OutputType = itemsPrintOutputType[i];
itemsToChange[i].MaterialIndex = itemsMaterialIndex[i];
}
}
}
}

4
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -55,8 +55,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public readonly int EditButtonHeight = 44;
private bool hasDrawn = false;
private Color[] SelectionColors = new Color[] { new Color(131, 4, 66), new Color(227, 31, 61), new Color(255, 148, 1), new Color(247, 224, 23), new Color(143, 212, 1) };
private Stopwatch timeSinceLastSpin = new Stopwatch();
private Stopwatch timeSinceReported = new Stopwatch();
@ -673,8 +671,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
hasDrawn = true;
base.OnDraw(graphics2D);
if (selectedItem != null)

4
MatterControlLib/PartPreviewWindow/ViewStyleButton.cs
View file

@ -76,6 +76,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (e.Data == UserSettingsKey.defaultRenderSetting)
{
iconButton.SetIcon(viewIcons[sceneContext.ViewState.RenderType]);
if (!this.MenuVisible)
{
iconButton.FlashBackground(theme.Colors.PrimaryAccentColor.AdjustContrast(theme.Colors.PrimaryTextColor, 6).ToColor());
}
}
}

84
MatterControlLib/SlicerConfiguration/UIFields/ColorField.cs Normal file
View file

@ -0,0 +1,84 @@
/*
Copyright (c) 2017, Lars Brubaker, John Lewin
All rights reserved.
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;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class ColorField : UIField
{
private ItemColorButton colorWidget;
private ThemeConfig theme;
private Color initialColor;
public ColorField(ThemeConfig theme, Color initialColor)
{
this.theme = theme;
this.initialColor = initialColor;
}
public Color Color
{
get
{
return new Color(colorWidget.Color);
}
set
{
colorWidget.Color = value;
}
}
public override void Initialize(int tabIndex)
{
var container = new FlowLayoutWidget();
colorWidget = new ItemColorButton(theme, initialColor);
colorWidget.ColorChanged += (s, e) =>
{
base.OnValueChanged(new FieldChangedEventArgs(true));
};
container.AddChild(colorWidget);
this.Content = container;
}
protected override void OnValueChanged(FieldChangedEventArgs fieldChangedEventArgs)
{
colorWidget.Color = new Color(this.Value);
base.OnValueChanged(fieldChangedEventArgs);
}
}
}

72
MatterControlLib/SlicerConfiguration/UIFields/MaterialIndexField.cs Normal file
View file

@ -0,0 +1,72 @@
/*
Copyright (c) 2017, Lars Brubaker, John Lewin
All rights reserved.
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;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.PartPreviewWindow;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class MaterialIndexField : UIField
{
private ItemMaterialButton materialWidget;
private ThemeConfig theme;
public MaterialIndexField(ThemeConfig theme, int materialIndex)
{
this.theme = theme;
this.MaterialIndex = materialIndex;
}
public int MaterialIndex { get; set; }
public override void Initialize(int tabIndex)
{
var container = new FlowLayoutWidget();
materialWidget = new ItemMaterialButton(theme, MaterialIndex);
materialWidget.MaterialChanged += (s, e) =>
{
MaterialIndex = e;
base.OnValueChanged(new FieldChangedEventArgs(true));
};
container.AddChild(materialWidget);
this.Content = container;
}
protected override void OnValueChanged(FieldChangedEventArgs fieldChangedEventArgs)
{
materialWidget.Color = new Color(this.Value);
base.OnValueChanged(fieldChangedEventArgs);
}
}
}

12
Tests/MatterControl.Tests/MatterControl/SliceSettingsFieldTests.cs
View file

@ -288,6 +288,18 @@ namespace MatterControl.Tests.MatterControl
Assert.Fail();
}
[Test, Ignore("Not Implemented")]
public void MaterialIndexFieldTest()
{
Assert.Fail();
}
[Test, Ignore("Not Implemented")]
public void ColorFieldTest()
{
Assert.Fail();
}
[Test, Ignore("Not Implemented")]
public void ChildrenSelectorListFieldTest()
{