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

Modify menu has been unified

Browse source
This commit is contained in:
LarsBrubaker 2020-09-26 10:59:31 -07:00
parent 2029c55029
commit 574f162903
12 changed files with 208 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/Library/ContentProviders/ImageContentProvider.cs
View file

@ -113,6 +113,6 @@ namespace MatterHackers.MatterControl.DesignTools
});
}
public ImageBuffer DefaultImage => AggContext.StaticData.LoadIcon("140.png", 16, 16);
public ImageBuffer DefaultImage => AggContext.StaticData.LoadIcon("image_converter.png", 16, 16);
}
}

2
MatterControlLib/Library/ContentProviders/OpenScadContentProvider.cs
View file

@ -66,6 +66,6 @@ namespace MatterHackers.MatterControl.Plugins
return Task.FromResult<ImageBuffer>(null);
}
public ImageBuffer DefaultImage => AggContext.StaticData.LoadIcon("140.png", 16, 16);
public ImageBuffer DefaultImage => AggContext.StaticData.LoadIcon("image_converter.png", 16, 16);
}
}

64
MatterControlLib/Library/Providers/GraphConfig.cs
View file

@ -1,64 +0,0 @@
/*
Copyright (c) 2019, 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;
using System.Collections.Generic;
using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl.Library
{
public class GraphConfig
{
private ApplicationController applicationController;
public Dictionary<string, SceneOperation> Operations { get; } = new Dictionary<string, SceneOperation>();
public Dictionary<Type, List<SceneOperation>> PrimaryOperations { get; } = new Dictionary<Type, List<SceneOperation>>();
public GraphConfig(ApplicationController applicationController)
{
this.applicationController = applicationController;
}
public void RegisterOperation(SceneOperation sceneSelectionOperation)
{
var thumbnails = applicationController.Thumbnails;
var resultType = sceneSelectionOperation.ResultType;
if (!SceneOperations.Instance.Icons.ContainsKey(resultType))
{
SceneOperations.Instance.Icons.Add(resultType, sceneSelectionOperation.Icon);
}
this.Operations.Add(sceneSelectionOperation.OperationID, sceneSelectionOperation);
}
}
}

2
MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs
View file

@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl.Library
tempScene.SelectedItem = imageObject;
// Invoke ImageConverter operation, passing image and scene
ApplicationController.Instance.Graph.Operations["ImageConverter"].Action(bedConfig);
SceneOperations.ById("ImageConverter").Action(bedConfig);
// Return replacement object constructed in ImageConverter operation
var constructedComponent = tempScene.SelectedItem;