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

Merge pull request #3394 from larsbrubaker/design_tools

Browse source 
Design tools
This commit is contained in:
Lars Brubaker 2018-06-08 12:18:07 -07:00 • committed by GitHub
commit 42c99d1c7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 55 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DesignTools/Operations/Align3D.cs
View file

@ -328,9 +328,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
DesignTools/Operations/ArrayLinear3D.cs
View file

@ -59,9 +59,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
DesignTools/Operations/ArrayRadial3D.cs
View file

@ -73,9 +73,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
DesignTools/Operations/CurveObject3D.cs
View file

@ -180,9 +180,9 @@ namespace MatterHackers.MatterControl.DesignTools
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
DesignTools/Operations/FitToBounds3D.cs
View file

@ -119,9 +119,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

2
DesignTools/Operations/Image/ImageToPath.cs
View file

@ -222,7 +222,7 @@ namespace MatterHackers.MatterControl.DesignTools
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if (invalidateType.InvalidateType.HasFlag(InvalidateType.Image)
if (invalidateType.InvalidateType == InvalidateType.Image
&& invalidateType.Source != this
&& !RebuildSuspended)
{

9
DesignTools/Operations/Image/LinearExtrude.cs
View file

@ -41,6 +41,9 @@ namespace MatterHackers.MatterControl.DesignTools
{
public double Height { get; set; } = 5;
public override bool CanApply => true;
public override bool CanRemove => true;
[JsonIgnore]
private IVertexSource VertexSource
{
@ -63,9 +66,9 @@ namespace MatterHackers.MatterControl.DesignTools
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Path))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Path)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
DesignTools/Operations/Path/SmoothPath.cs
View file

@ -61,9 +61,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Path))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Path)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
DesignTools/Operations/PinchObject3D.cs
View file

@ -101,9 +101,9 @@ namespace MatterHackers.MatterControl.DesignTools
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

8
DesignTools/Primitives/BaseObject3D.cs
View file

@ -105,10 +105,10 @@ namespace MatterHackers.MatterControl.DesignTools
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Path)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Path
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

21
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -183,14 +183,21 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
scene.SelectionChanged += (s, e) => removeButton.Enabled = scene.SelectedItem?.CanRemove == true;
toolbar.AddChild(removeButton);
// Add container used to host the current specialized editor for the selection
selectedObjectEditorColumn.AddChild(editorPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
var scrollableEditor = new ScrollableWidget(true)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch
};
scrollableEditor.AddChild(editorPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Padding = new BorderDouble(top: 10)
});
scrollableEditor.ScrollArea.HAnchor = HAnchor.Stretch;
selectedObjectEditorColumn.AddChild(scrollableEditor);
inlineTitleEdit = new InlineTitleEdit("", theme, "Object Name");
inlineTitleEdit.TitleChanged += (s, e) =>
@ -201,15 +208,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
};
var selectedObjectEditorColumnBody = new GuiWidget()
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit
};
selectedObjectEditorColumnBody.AddChild(selectedObjectEditorColumn);
selectedObjectEditorSection = new SectionWidget("Editor", selectedObjectEditorColumnBody, theme, serializationKey: UserSettingsKey.EditorPanelExpanded, defaultExpansion: true)
selectedObjectEditorSection = new SectionWidget("Editor", selectedObjectEditorColumn, theme, serializationKey: UserSettingsKey.EditorPanelExpanded, defaultExpansion: true, setContentVAnchor: false)
{
VAnchor = VAnchor.Fit,
};

6
PartPreviewWindow/View3D/Actions/CombineObject3D.cs
View file

@ -50,9 +50,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
PartPreviewWindow/View3D/Actions/IntersectionObject3D.cs
View file

@ -50,9 +50,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs
View file

@ -53,9 +53,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

6
PartPreviewWindow/View3D/Actions/SubtractObject3D.cs
View file

@ -110,9 +110,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Content)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
&& !RebuildSuspended)
{

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit fc25dd0e2047fff38307d0fc4b4121f524f4282c
Subproject commit 9b05c840e4c3b32ae8e95d5d7c73da072430edc8