Added primitives to the main MatterControl project

Experimenting with calling the 'Library' tab 'Designs'
This commit is contained in:
LarsBrubaker 2018-10-11 20:21:35 -07:00
parent a05e584ad7
commit e9bc662dd3
4 changed files with 171 additions and 2 deletions

View file

@ -64,6 +64,16 @@ namespace MatterHackers.MatterControl.Library
IsReadOnly = true
});
this.ChildContainers.Add(
new DynamicContainerLink(
() => "Primitives".Localize(),
AggContext.StaticData.LoadIcon(Path.Combine("Library", "folder_20x20.png")),
AggContext.StaticData.LoadIcon(Path.Combine("Library", "folder.png")),
() => new PrimitivesContainer())
{
IsReadOnly = true
});
this.ChildContainers.Add(
new DynamicContainerLink(
() => "Print Queue".Localize(),

View file

@ -0,0 +1,159 @@
/*
Copyright (c) 2017, 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.IO;
using MatterHackers.Agg.Platform;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DesignTools;
using MatterHackers.MatterControl.DesignTools.Operations;
using MatterHackers.MatterControl.Plugins.BrailleBuilder;
namespace MatterHackers.MatterControl.Library
{
public class PrimitivesContainer : LibraryContainer
{
public PrimitivesContainer()
{
Name = "Primitives".Localize();
}
public override void Load()
{
var library = ApplicationController.Instance.Library;
long index = DateTime.Now.Ticks;
var libraryItems = new List<GeneratorItem>()
{
new GeneratorItem(
() => "Cube".Localize(),
() => CubeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Pyramid".Localize(),
() => PyramidObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Wedge".Localize(),
() => WedgeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Half Wedge".Localize(),
() => HalfWedgeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Text".Localize(),
() => TextObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Cylinder".Localize(),
() => CylinderObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Cone".Localize(),
() => ConeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Half Cylinder".Localize(),
() => HalfCylinderObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Torus".Localize(),
() => TorusObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Ring".Localize(),
() => RingObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Sphere".Localize(),
() => SphereObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Half Sphere".Localize(),
() => HalfSphereObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Image Converter".Localize(),
() =>
{
// Build ImageConverter stack
var imageObject = new ImageObject3D()
{
AssetPath = AggContext.StaticData.ToAssetPath(Path.Combine("Images", "mh-logo.png"))
};
imageObject.Invalidate(new InvalidateArgs(imageObject, InvalidateType.Properties, null));
var path = new ImageToPathObject3D();
path.Children.Add(imageObject);
path.Invalidate(new InvalidateArgs(path, InvalidateType.Properties, null));
var smooth = new SmoothPathObject3D();
smooth.Children.Add(path);
smooth.Invalidate(new InvalidateArgs(smooth, InvalidateType.Properties, null));
var extrude = new LinearExtrudeObject3D();
extrude.Children.Add(smooth);
extrude.Invalidate(new InvalidateArgs(extrude, InvalidateType.Properties, null));
var baseObject = new BaseObject3D()
{
BaseType = BaseTypes.None
};
baseObject.Children.Add(extrude);
baseObject.Invalidate(new InvalidateArgs(baseObject, InvalidateType.Properties, null));
return new ComponentObject3D(new [] { baseObject })
{
ComponentID = "4D9BD8DB-C544-4294-9C08-4195A409217A",
SurfacedEditors = new List<string>
{
"$.Children<BaseObject3D>.Children<LinearExtrudeObject3D>.Children<SmoothPathObject3D>.Children<ImageToPathObject3D>.Children<ImageObject3D>",
"$.Children<BaseObject3D>.Children<LinearExtrudeObject3D>.Height",
"$.Children<BaseObject3D>.Children<LinearExtrudeObject3D>.Children<SmoothPathObject3D>.SmoothDistance",
"$.Children<BaseObject3D>.Children<LinearExtrudeObject3D>.Children<SmoothPathObject3D>.Children<ImageToPathObject3D>",
"$.Children<BaseObject3D>",
}
};
})
{ DateCreated = new System.DateTime(index++) },
};
string title = "Primitive Shapes".Localize();
foreach (var item in libraryItems)
{
item.Category = title;
Items.Add(item);
}
}
}
}

View file

@ -223,7 +223,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
tabControl.AddTab(
libraryTab = new ChromeTab("Library", "Library".Localize(), tabControl, libraryWidget, theme, hasClose: false)
libraryTab = new ChromeTab("Library", "Designs".Localize(), tabControl, libraryWidget, theme, hasClose: false)
{
MinimumSize = new Vector2(0, theme.TabButtonHeight),
Name = "Library Tab",

@ -1 +1 @@
Subproject commit 01a942cfefd04b2674304efca21f6a27b679a4f6
Subproject commit 9b89d41acd249a345b071849db9eca6e213644ab