Made MatterControl run as a .net standard app
Moving matter control to a lib and creating a new exe to run it
This commit is contained in:
Lars Brubaker
parent
8b4790e493
commit
bed90234e7
485 changed files with 283 additions and 571 deletions
33
App.config
33
App.config
|
|
@ -1,29 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<loadFromRemoteSources enabled="true" />
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<probing privatePath="lib" />
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
|
||||
</startup>
|
||||
<system.net>
|
||||
<defaultProxy>
|
||||
<proxy bypassonlocal="false" usesystemdefault="true" />
|
||||
</defaultProxy>
|
||||
</system.net>
|
||||
</configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
|
||||
</startup>
|
||||
</configuration>
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
using MatterHackers.Agg;
|
||||
using MatterHackers.Agg.UI;
|
||||
using MatterHackers.VectorMath;
|
||||
using MatterHackers.MatterControl.CustomWidgets;
|
||||
using MatterHackers.Agg.Image;
|
||||
using MatterHackers.MatterControl.DataStorage;
|
||||
using MatterHackers.Localizations;
|
||||
using MatterHackers.MatterControl.SlicerConfiguration;
|
||||
using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling;
|
||||
using MatterHackers.Agg.VertexSource;
|
||||
|
||||
namespace MatterHackers.MatterControl
|
||||
{
|
||||
public class ThemeSelectorWindow : SystemWindow
|
||||
{
|
||||
GuiWidget currentColorTheme;
|
||||
Button closeButton;
|
||||
Button saveButton;
|
||||
TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
|
||||
public ThemeSelectorWindow()
|
||||
:base(400, 200)
|
||||
{
|
||||
Title = LocalizedString.Get("Theme Selector").Localize();
|
||||
|
||||
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
topToBottom.AnchorAll();
|
||||
topToBottom.Padding = new BorderDouble(3, 0, 3, 5);
|
||||
|
||||
//Create Header
|
||||
FlowLayoutWidget headerRow = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
headerRow.HAnchor = HAnchor.ParentLeftRight;
|
||||
headerRow.Margin = new BorderDouble(0, 3, 0, 0);
|
||||
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
|
||||
//Create 'Theme Change' label and add it to Header
|
||||
string themeChangeHeader = LocalizedString.Get("Select Theme".Localize());
|
||||
TextWidget elementHeader = new TextWidget(string.Format("{0}:", themeChangeHeader), pointSize: 14);
|
||||
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
elementHeader.HAnchor = HAnchor.ParentLeftRight;
|
||||
elementHeader.VAnchor = Agg.UI.VAnchor.ParentBottom;
|
||||
|
||||
//Add label to header
|
||||
headerRow.AddChild(elementHeader);
|
||||
//Add Header
|
||||
topToBottom.AddChild(headerRow);
|
||||
|
||||
|
||||
//Theme Selector widget container and add themeselector
|
||||
FlowLayoutWidget themeChangeWidgetContainer = new FlowLayoutWidget();
|
||||
themeChangeWidgetContainer.Padding = new BorderDouble(3);
|
||||
themeChangeWidgetContainer.HAnchor |= Agg.UI.HAnchor.ParentLeftRight;
|
||||
|
||||
GuiWidget currentColorTheme = new GuiWidget();
|
||||
currentColorTheme.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentColorTheme.VAnchor = VAnchor.ParentBottomTop;
|
||||
currentColorTheme.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
|
||||
|
||||
|
||||
ThemeColorSelectorWidget themeSelector = new ThemeColorSelectorWidget(colorToChangeTo: currentColorTheme);
|
||||
themeSelector.Margin = new BorderDouble(right: 5);
|
||||
themeChangeWidgetContainer.AddChild(themeSelector);
|
||||
|
||||
|
||||
//Create CurrentColorTheme GUI Widgets
|
||||
GuiWidget currentColorThemeBorder = new GuiWidget();
|
||||
currentColorThemeBorder.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
|
||||
currentColorThemeBorder.VAnchor = VAnchor.ParentBottomTop;
|
||||
currentColorThemeBorder.Margin = new BorderDouble (top: 2, bottom: 2);
|
||||
currentColorThemeBorder.Padding = new BorderDouble(4);
|
||||
currentColorThemeBorder.BackgroundColor = RGBA_Bytes.White;
|
||||
|
||||
|
||||
|
||||
|
||||
FlowLayoutWidget presetsFormContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
|
||||
{
|
||||
presetsFormContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
presetsFormContainer.VAnchor = VAnchor.ParentBottomTop;
|
||||
presetsFormContainer.Padding = new BorderDouble(3);
|
||||
presetsFormContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
}
|
||||
|
||||
FlowLayoutWidget currentColorLabelContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
currentColorLabelContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentColorLabelContainer.Margin = new BorderDouble(0, 3, 0, 0);
|
||||
currentColorLabelContainer.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
|
||||
string currentColorThemeLabelText = LocalizedString.Get("Currently Selected Theme".Localize());
|
||||
TextWidget currentColorThemeHeader = new TextWidget(string.Format("{0}:", currentColorThemeLabelText), pointSize: 14);
|
||||
currentColorThemeHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
currentColorThemeHeader.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentColorThemeHeader.VAnchor = Agg.UI.VAnchor.ParentBottom;
|
||||
currentColorLabelContainer.AddChild(currentColorThemeHeader);
|
||||
|
||||
|
||||
//
|
||||
FlowLayoutWidget currentColorContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
currentColorContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentColorContainer.VAnchor = VAnchor.ParentBottomTop;
|
||||
currentColorContainer.Padding = new BorderDouble(3);
|
||||
currentColorContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
|
||||
currentColorContainer.AddChild(currentColorThemeBorder);
|
||||
currentColorThemeBorder.AddChild(currentColorTheme);
|
||||
|
||||
|
||||
presetsFormContainer.AddChild(themeChangeWidgetContainer);
|
||||
topToBottom.AddChild(presetsFormContainer);
|
||||
topToBottom.AddChild(currentColorLabelContainer);
|
||||
|
||||
topToBottom.AddChild(currentColorContainer);
|
||||
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
|
||||
FlowLayoutWidget buttonRow = new FlowLayoutWidget();
|
||||
buttonRow.HAnchor = HAnchor.ParentLeftRight;
|
||||
buttonRow.Padding = new BorderDouble(0, 3);
|
||||
|
||||
closeButton = textImageButtonFactory.Generate("Close");
|
||||
closeButton.Click += (sender, e) =>
|
||||
{
|
||||
UiThread.RunOnIdle((state) =>
|
||||
{
|
||||
Close();
|
||||
});
|
||||
};
|
||||
|
||||
saveButton = textImageButtonFactory.Generate("Save");
|
||||
saveButton.Click += (sender, e) =>
|
||||
{
|
||||
UserSettings.Instance.set("ActiveThemeIndex",((GuiWidget)sender).Name);
|
||||
ActiveTheme.Instance.LoadThemeSettings(int.Parse(((GuiWidget)sender).Name));//GUIWIDGET
|
||||
};
|
||||
|
||||
|
||||
buttonRow.AddChild(saveButton);
|
||||
buttonRow.AddChild(new HorizontalSpacer());
|
||||
buttonRow.AddChild(closeButton);
|
||||
topToBottom.AddChild(buttonRow);
|
||||
AddChild(topToBottom);
|
||||
|
||||
|
||||
ShowAsSystemWindow();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -53,9 +53,9 @@
|
|||
<Compile Include="WindowsPlatformsFeatures.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MatterControl.csproj">
|
||||
<Project>{0b8d6f56-bd7f-4426-b858-d9292b084656}</Project>
|
||||
<Name>MatterControl</Name>
|
||||
<ProjectReference Include="..\MatterControlLib\MatterControlLib.csproj">
|
||||
<Project>{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}</Project>
|
||||
<Name>MatterControlLib</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\PluginSystem\MatterControlPluginSystem.csproj">
|
||||
<Project>{865172a0-a1a9-49c2-9386-f2fdb4e141b7}</Project>
|
||||
|
|
|
|||
17
MatterControl.cs
Normal file
17
MatterControl.cs
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MatterControl
|
||||
{
|
||||
class Program
|
||||
{
|
||||
[STAThread]
|
||||
static void Main(string[] args)
|
||||
{
|
||||
MatterHackers.MatterControl.MatterControlLib.Main();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,100 +1,70 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<Company>MatterHackers Inc.</Company>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}</ProjectGuid>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<RootNamespace>MatterControl</RootNamespace>
|
||||
<AssemblyName>MatterControl</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<!--See the following for details on netstandard2 binding workround: https://github.com/dotnet/standard/issues/481-->
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
|
||||
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<CodeAnalysisRuleSet />
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<CodeAnalysisRuleSet />
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<StartupObject />
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="Community.CsharpSqlite\**" />
|
||||
<Compile Remove="Launcher\**" />
|
||||
<Compile Remove="MatterControl.OpenGL\**" />
|
||||
<Compile Remove="MatterControl.Printing\**" />
|
||||
<Compile Remove="MatterControl.Winforms\**" />
|
||||
<Compile Remove="packages\**" />
|
||||
<Compile Remove="PluginSystem\**" />
|
||||
<Compile Remove="PrinterDriverInstaller\**" />
|
||||
<Compile Remove="StaticData\**" />
|
||||
<Compile Remove="Submodules\**" />
|
||||
<Compile Remove="Tests\**" />
|
||||
<Compile Remove="Tools\**" />
|
||||
<EmbeddedResource Remove="Community.CsharpSqlite\**" />
|
||||
<EmbeddedResource Remove="Launcher\**" />
|
||||
<EmbeddedResource Remove="MatterControl.OpenGL\**" />
|
||||
<EmbeddedResource Remove="MatterControl.Printing\**" />
|
||||
<EmbeddedResource Remove="MatterControl.Winforms\**" />
|
||||
<EmbeddedResource Remove="packages\**" />
|
||||
<EmbeddedResource Remove="PluginSystem\**" />
|
||||
<EmbeddedResource Remove="PrinterDriverInstaller\**" />
|
||||
<EmbeddedResource Remove="StaticData\**" />
|
||||
<EmbeddedResource Remove="Submodules\**" />
|
||||
<EmbeddedResource Remove="Tests\**" />
|
||||
<EmbeddedResource Remove="Tools\**" />
|
||||
<None Remove="Community.CsharpSqlite\**" />
|
||||
<None Remove="Launcher\**" />
|
||||
<None Remove="MatterControl.OpenGL\**" />
|
||||
<None Remove="MatterControl.Printing\**" />
|
||||
<None Remove="MatterControl.Winforms\**" />
|
||||
<None Remove="packages\**" />
|
||||
<None Remove="PluginSystem\**" />
|
||||
<None Remove="PrinterDriverInstaller\**" />
|
||||
<None Remove="StaticData\**" />
|
||||
<None Remove="Submodules\**" />
|
||||
<None Remove="Tests\**" />
|
||||
<None Remove="Tools\**" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="DesignTools\Primitives\HexGridObject3D.cs" />
|
||||
<Compile Remove="PrinterCommunication\Io\TrackPrinterPosition.cs" />
|
||||
<Compile Include="MatterControl.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="MatterControl.OpenGL\MatterControl.OpenGL.csproj" />
|
||||
<ProjectReference Include="MatterControl.Printing\MatterControl.Printing.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\clipper_library\clipper_library.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\DataConverters2D\DataConverters2D.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\DataConverters3D\DataConverters3D.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\GuiAutomation\GuiAutomation.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\Gui\Gui.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\ImageProcessing\ImageProcessing.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\MeshThumbnails\MeshThumbnails\MeshThumbnails.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\RayTracer\RayTracer.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\VectorMath\VectorMath.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\Tesselate\Tesselate.csproj" />
|
||||
<ProjectReference Include="Community.CsharpSqlite\Community.CsharpSqlite.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj" />
|
||||
<ProjectReference Include="PluginSystem\MatterControlPluginSystem.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\Localizations\Localizations.csproj" />
|
||||
<ProjectReference Include="Submodules\agg-sharp\agg\Agg.csproj" />
|
||||
<ProjectReference Include="Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj" />
|
||||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Markdig" Version="0.15.2" />
|
||||
<PackageReference Include="MIConvexHull" Version="1.1.17.1019" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
||||
<PackageReference Include="Zeroconf" Version="3.0.30" />
|
||||
<ProjectReference Include="Community.CsharpSqlite\Community.CsharpSqlite.csproj">
|
||||
<Project>{f1653f20-d47d-4f29-8c55-3c835542af5f}</Project>
|
||||
<Name>Community.CsharpSqlite</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="MatterControlLib\MatterControlLib.csproj">
|
||||
<Project>{93bebfdf-b81a-4344-ab82-0dbf58b234cd}</Project>
|
||||
<Name>MatterControlLib</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="PdfSharp">
|
||||
<HintPath>PdfSharp.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -3,25 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27130.2010
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{0B8D6F56-BD7F-4426-B858-D9292B084656}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A} = {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}
|
||||
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F} = {F1653F20-D47D-4F29-8C55-3C835542AF5F}
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B} = {3DF4CB3D-9A03-4256-9A81-70523AAD828B}
|
||||
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532} = {74F6BB6C-9D02-4512-A59A-21940E35C532}
|
||||
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {9B062971-A88E-4A3D-B3C9-12B78D15FA66}
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25} = {CA96058C-1A37-465D-A357-D6D695B13D25}
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A} = {036BCCBA-52D8-457C-84AE-8821F209FE4A}
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E} = {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739} = {DF6845CD-64C6-4263-8357-DA8066855739}
|
||||
{1E01ABE0-B494-4FE4-B0D6-540133286887} = {1E01ABE0-B494-4FE4-B0D6-540133286887}
|
||||
{86F6AAF2-9B50-40B8-A427-1897D76471C5} = {86F6AAF2-9B50-40B8-A427-1897D76471C5}
|
||||
{670BDDFF-927B-425D-9DD1-22ACB14356EB} = {670BDDFF-927B-425D-9DD1-22ACB14356EB}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tesselate", "Submodules\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformWin32", "Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}"
|
||||
|
|
@ -43,7 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonMesh", "Submodules\a
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agg", "Submodules\agg-sharp\agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RayTracer", "Submodules\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}"
|
||||
EndProject
|
||||
|
|
@ -53,9 +34,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageProcessing", "Submodul
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clipper_library", "Submodules\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarchingSquares", "Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj", "{DF6845CD-64C6-4263-8357-DA8066855739}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarchingSquares", "Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj", "{DF6845CD-64C6-4263-8357-DA8066855739}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControlPluginSystem", "PluginSystem\MatterControlPluginSystem.csproj", "{865172A0-A1A9-49C2-9386-F2FDB4E141B7}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControlPluginSystem", "PluginSystem\MatterControlPluginSystem.csproj", "{865172A0-A1A9-49C2-9386-F2FDB4E141B7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launcher.csproj", "{3DF4CB3D-9A03-4256-9A81-70523AAD828B}"
|
||||
EndProject
|
||||
|
|
@ -91,11 +72,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuadTree", "Submodules\Matt
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSClipperLib", "Submodules\MatterSlice\MSClipperLib\MSClipperLib.csproj", "{2C564BE1-352D-4DDB-8226-F0981F983C60}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeshThumbnails", "Submodules\agg-sharp\MeshThumbnails\MeshThumbnails\MeshThumbnails.csproj", "{1A901129-C885-425F-8D4B-86698F98A2B4}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeshThumbnails", "Submodules\agg-sharp\MeshThumbnails\MeshThumbnails\MeshThumbnails.csproj", "{1A901129-C885-425F-8D4B-86698F98A2B4}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.OpenGL", "MatterControl.OpenGL\MatterControl.OpenGL.csproj", "{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.OpenGL", "MatterControl.OpenGL\MatterControl.OpenGL.csproj", "{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.csproj", "{DE958333-2467-409D-904D-92C9CCD0BA52}"
|
||||
EndProject
|
||||
|
|
@ -109,6 +90,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterSliceLib", "Submodule
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice", "Submodules\MatterSlice\MatterSlice.csproj", "{B0AED568-8796-42B9-BAA9-EBC796134E78}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControlLib", "MatterControlLib\MatterControlLib.csproj", "{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
|
||||
|
|
@ -121,14 +106,6 @@ Global
|
|||
Release|Mixed Platforms = Release|Mixed Platforms
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -425,6 +402,22 @@ Global
|
|||
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -1219,7 +1219,7 @@ namespace MatterHackers.MatterControl
|
|||
objectEditorsByType = new Dictionary<Type, HashSet<IObject3DEditor>>();
|
||||
|
||||
// Initialize plugins, passing the MatterControl assembly as the only non-dll instance
|
||||
PluginFinder.Initialize(Assembly.GetExecutingAssembly());
|
||||
//PluginFinder.Initialize(Assembly.GetExecutingAssembly());
|
||||
|
||||
foreach (IObject3DEditor editor in PluginFinder.CreateInstancesOf<IObject3DEditor>())
|
||||
{
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue