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

Merge pull request #2182 from jlewin/design_tools

Browse source 
Evaluate creators in library root
This commit is contained in:
johnlewin 2017-06-17 10:55:20 -07:00 • committed by GitHub
commit bc06f2fd54
9 changed files with 90 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/WidescreenPanel.cs
View file

@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl
var library3DViewSplitter = new Splitter()
{
Padding = new BorderDouble(4),
SplitterDistance = 234,
SplitterDistance = 254,
SplitterWidth = 10,
SplitterBackground = ApplicationController.Instance.Theme.SplitterBackground
};

2
Library/Providers/FileSystem/FileSystemContainer.cs
View file

@ -34,10 +34,8 @@ using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.CustomWidgets;
namespace MatterHackers.MatterControl.Library
{

3
Library/Providers/GeneratorItem.cs
View file

@ -42,10 +42,11 @@ namespace MatterHackers.MatterControl.Library
this.IsProtected = true;
}
public GeneratorItem(string name, Func<IObject3D> collector)
public GeneratorItem(string name, Func<IObject3D> collector, string category = null)
{
this.Name = name;
this.Collector = collector;
this.Category = category;
}
public string ID => $"MatterHackers/ItemGenerator/{Name}".GetHashCode().ToString();

31
Library/Providers/LibraryConfig.cs
View file

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.Library
/// <summary>
/// Storage for plugin 'Creators' added via RegisterCreator
/// </summary>
private CreatorsContainer registeredCreators;
//private CreatorsContainer registeredCreators;
private List<ILibraryContainerLink> libraryProviders;
@ -73,19 +73,20 @@ namespace MatterHackers.MatterControl.Library
public LibraryConfig()
{
registeredCreators = new CreatorsContainer()
{
Name = "Creators",
ChildContainers = new List<ILibraryContainerLink>(),
Items = new List<ILibraryItem>()
};
//registeredCreators = new CreatorsContainer()
//{
// Name = "Creators",
// ChildContainers = new List<ILibraryContainerLink>(),
// Items = new List<ILibraryItem>()
//};
libraryProviders = new List<ILibraryContainerLink>()
{
/*
new DynamicContainerLink(
registeredCreators.Name,
StaticData.Instance.LoadIcon("icon_creator.png"),
() => registeredCreators),
() => registeredCreators), */
};
this.RootLibaryContainer = new RootLibraryContainer(libraryProviders);
@ -167,7 +168,19 @@ namespace MatterHackers.MatterControl.Library
public void RegisterCreator(ILibraryContainerLink containerItem)
{
registeredCreators.ChildContainers.Add(containerItem);
this.RootLibaryContainer.ChildContainers.Add(containerItem);
OnLibraryItemsChanged();
}
public void RegisterCreator(ILibraryContentItem libraryItem)
{
this.RootLibaryContainer.Items.Add(libraryItem);
OnLibraryItemsChanged();
}
public void RegisterCreator(ILibraryContentStream libraryItem)
{
this.RootLibaryContainer.Items.Add(libraryItem);
OnLibraryItemsChanged();
}

13
Library/Widgets/PrintLibraryWidget.cs
View file

@ -367,6 +367,19 @@ namespace MatterHackers.MatterControl.PrintLibrary
private void CreateMenuActions()
{
menuActions.Add(new PrintItemAction()
{
Title = "Pin to Library",
AllowMultiple = false,
AllowContainers = true,
AllowProtected = true,
Action = (selectedLibraryItems, listView) =>
{
Console.WriteLine();
}
});
// edit menu item
menuActions.Add(new PrintItemAction()
{

17
TextCreator/CardHolderTool/CardHolder.cs
View file

@ -1,21 +1,18 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using MatterHackers.Csg;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.Font;
using MatterHackers.Agg.UI;
using MatterHackers.Csg;
using MatterHackers.Csg.Solids;
using MatterHackers.Csg.Transform;
using MatterHackers.Csg.Processors;
using MatterHackers.VectorMath;
using MatterHackers.RenderOpenGl;
using MatterHackers.DataConverters3D;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl;
using MatterHackers.Localizations;
using MatterHackers.Agg;
using MatterHackers.MatterControl.CustomWidgets;
using System.Linq;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.RenderOpenGl;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.SimplePartScripting
{

100
TextCreator/Library/TextLibraryContainer.cs
View file

@ -1,100 +0,0 @@
/*
Copyright (c) 2016, 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;
using System.Collections.Generic;
using System.Linq;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.Plugins.BrailleBuilder;
using MatterHackers.MatterControl.Plugins.TextCreator;
using MatterHackers.Agg.PlatformAbstract;
using System.IO;
namespace MatterHackers.MatterControl.Library
{
public class TextLibraryContainer : LibraryContainer
{
private static IObject3D textItem;
private static IObject3D brailleItem;
public TextLibraryContainer(string name)
{
this.Name = name;
this.ChildContainers = new List<ILibraryContainerLink>();
this.Items = Generators.ToList<ILibraryItem>();
}
internal static List<ILibraryItem> Generators = new List<ILibraryItem>()
{
new GeneratorItem("Text".Localize(), () =>
{
if(textItem == null)
{
var generator = new TextGenerator();
textItem = generator.CreateText(
"Text".Localize(),
1,
.25,
1,
true);
}
return textItem;
}),
new GeneratorItem("Braille".Localize(), () =>
{
if (brailleItem == null)
{
string braille = "Braille".Localize();
var generator = new BrailleGenerator();
brailleItem = generator.CreateText(
braille,
1,
.25,
true,
braille);
}
return brailleItem;
}),
// TODO: Filepath won't work on Android. Needs to load from/to stream via custom type
new FileSystemFileItem(StaticData.Instance.MapPath(Path.Combine("Images", "mh-logo.png")))
{
Name = "Image Converter".Localize()
}
};
public override void Dispose()
{
}
}
}

1
TextCreator/TextCreator.csproj
View file

@ -142,7 +142,6 @@
<Compile Include="Braille\BrailleGrade2Mapping.cs" />
<Compile Include="CardHolderTool\CardHolder.cs" />
<Compile Include="TextCreatorPlugin.cs" />
<Compile Include="Library\TextLibraryContainer.cs" />
<Compile Include="Text\TextGenerator.cs" />
<Compile Include="Text\TextEditor.cs" />
</ItemGroup>

51
TextCreator/TextCreatorPlugin.cs
View file

@ -27,10 +27,15 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.IO;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl;
using MatterHackers.MatterControl.Library;
using MatterHackers.MatterControl.Plugins.BrailleBuilder;
using MatterHackers.MatterControl.Plugins.TextCreator;
using MatterHackers.MatterControl.PluginSystem;
namespace MatterHackers.Plugins.EditorTools
@ -39,13 +44,47 @@ namespace MatterHackers.Plugins.EditorTools
{
public override void Initialize(GuiWidget application)
{
string name = "Text Tools".Localize();
string category = "Text Tools".Localize();
var library = ApplicationController.Instance.Library;
ApplicationController.Instance.Library.RegisterCreator(
new DynamicContainerLink(
name,
LibraryProviderHelpers.LoadInvertIcon("FileDialog", "folder.png"),
() => new TextLibraryContainer(name)));
library.RegisterCreator(
new GeneratorItem(
"Text".Localize(),
() =>
{
var generator = new TextGenerator();
return generator.CreateText(
"Text".Localize(),
1,
.25,
1,
true);
},
category));
library.RegisterCreator(
new GeneratorItem(
"Braille".Localize(),
() =>
{
string braille = "Braille".Localize();
var generator = new BrailleGenerator();
return generator.CreateText(
braille,
1,
.25,
true,
braille);
},
category));
// TODO: Filepath won't work on Android. Needs to load from/to stream via custom type
library.RegisterCreator(
new FileSystemFileItem(StaticData.Instance.MapPath(Path.Combine("Images", "mh-logo.png")))
{
Name = "Image Converter".Localize(),
Category = category
});
base.Initialize(application);
}