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

Adding new MS lib changes

Browse source
This commit is contained in:
Lars Brubaker 2018-09-05 16:56:00 -07:00
parent 4689552b28
commit e20e683e8c
6 changed files with 51 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControl.csproj
View file

@ -646,10 +646,6 @@
<Project>{d3e41b4e-bfbb-44ca-94c8-95c00f754fdd}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="Submodules\MatterSlice\MatterSlice.csproj">
<Project>{c46ca728-dd2f-4dd1-971a-aaa89d9dff95}</Project>
<Name>MatterSlice</Name>
</ProjectReference>
<ProjectReference Include="Submodules\agg-sharp\Tesselate\Tesselate.csproj">
<Project>{ae37de1f-22f7-49ee-8732-fc6bc8dc58d9}</Project>
<Name>Tesselate</Name>
@ -686,6 +682,14 @@
<Project>{990a9ad3-b6a4-407b-9dfc-9c722af7c9b9}</Project>
<Name>InfInstaller</Name>
</ProjectReference>
<ProjectReference Include="Submodules\MatterSlice\MatterSlice.csproj">
<Project>{b0aed568-8796-42b9-baa9-ebc796134e78}</Project>
<Name>MatterSlice</Name>
</ProjectReference>
<ProjectReference Include="Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj">
<Project>{23bd06a4-d017-4dd0-a922-d2aad91c3484}</Project>
<Name>MatterSliceLib</Name>
</ProjectReference>
<ProjectReference Include="Submodules\MatterSlice\MSClipperLib\MSClipperLib.csproj">
<Project>{2c564be1-352d-4ddb-8226-f0981f983c60}</Project>
<Name>MSClipperLib</Name>

40
MatterControl.sln
View file

@ -8,7 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterCont
{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}
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} = {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}
{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}
@ -58,8 +57,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarchingSquares", "Submodul
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControlPluginSystem", "PluginSystem\MatterControlPluginSystem.csproj", "{865172A0-A1A9-49C2-9386-F2FDB4E141B7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice", "Submodules\MatterSlice\MatterSlice.csproj", "{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launcher.csproj", "{3DF4CB3D-9A03-4256-9A81-70523AAD828B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agg-sharp", "agg-sharp", "{2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}"
@ -88,11 +85,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net3dBool", "Submodules\agg
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MatterSlice", "MatterSlice", "{57647FCB-8F00-4C05-972C-3CF6ACD12A63}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pathfinding", "Submodules\MatterSlice\Pathfinding\Pathfinding.csproj", "{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pathfinding", "Submodules\MatterSlice\Pathfinding\Pathfinding.csproj", "{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuadTree", "Submodules\MatterSlice\QuadTree\QuadTree.csproj", "{23EC3364-7C93-4169-9AB2-7181C66004C0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuadTree", "Submodules\MatterSlice\QuadTree\QuadTree.csproj", "{23EC3364-7C93-4169-9AB2-7181C66004C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSClipperLib", "Submodules\MatterSlice\MSClipperLib\MSClipperLib.csproj", "{2C564BE1-352D-4DDB-8226-F0981F983C60}"
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}"
EndProject
@ -108,6 +105,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterHackers.VeldridProvid
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Winforms", "MatterControl.Winforms\MatterControl.Winforms.csproj", "{D6DC2669-7B1F-40FE-89BF-45D4C94473E3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterSliceLib", "Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj", "{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice", "Submodules\MatterSlice\MatterSlice.csproj", "{B0AED568-8796-42B9-BAA9-EBC796134E78}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
@ -248,14 +249,6 @@ Global
{865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Release|Any CPU.Build.0 = Release|Any CPU
{865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|Any CPU.Build.0 = Release|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@ -416,6 +409,22 @@ Global
{D6DC2669-7B1F-40FE-89BF-45D4C94473E3}.Release|Any CPU.Build.0 = Release|Any CPU
{D6DC2669-7B1F-40FE-89BF-45D4C94473E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D6DC2669-7B1F-40FE-89BF-45D4C94473E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Release|Any CPU.Build.0 = Release|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -436,7 +445,6 @@ Global
{9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{DF6845CD-64C6-4263-8357-DA8066855739} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{865172A0-A1A9-49C2-9386-F2FDB4E141B7} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
{3DF4CB3D-9A03-4256-9A81-70523AAD828B} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{04667764-DC7B-4B95-AEF6-B4E6C87A54E9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
@ -457,6 +465,8 @@ Global
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{676EB09F-8913-49A4-AB85-5DA45506AB3D} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{D6DC2669-7B1F-40FE-89BF-45D4C94473E3} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
{B0AED568-8796-42B9-BAA9-EBC796134E78} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}

2
SlicerConfiguration/Slicer.cs
View file

@ -299,7 +299,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
if(cancellationToken.IsCancellationRequested)
{
MatterSlice.MatterSlice.Stop();
MatterHackers.MatterSlice.MatterSlice.Stop();
}
if (s is string stringValue)
{

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 606965b1bfde50d378ae862985199e22eeaa8389
Subproject commit 728e72bd8837b5dc02b85284589082dcee123ad3

8
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -122,6 +122,14 @@
<Project>{d3e41b4e-bfbb-44ca-94c8-95c00f754fdd}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj">
<Project>{23bd06a4-d017-4dd0-a922-d2aad91c3484}</Project>
<Name>MatterSliceLib</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\MatterSlice\Tests\MatterSlice.Tests\MatterSlice.Tests.csproj">
<Project>{8cd15b23-d30f-470e-99ba-9276fb7cabd4}</Project>
<Name>MatterSlice.Tests</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

8
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -144,6 +144,14 @@
<Project>{d3e41b4e-bfbb-44ca-94c8-95c00f754fdd}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\MatterSlice\MatterSlice.csproj">
<Project>{b0aed568-8796-42b9-baa9-ebc796134e78}</Project>
<Name>MatterSlice</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj">
<Project>{23bd06a4-d017-4dd0-a922-d2aad91c3484}</Project>
<Name>MatterSliceLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="C5" Version="2.5.3" />