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

Moving to using submodules

Browse source 
Changed HasEmergecyStoy to ShowResetConnection
This commit is contained in:
Lars Brubaker 2015-02-26 10:17:41 -08:00
parent f4317b55c9
commit 90331a49a3
16 changed files with 162 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitmodules vendored Normal file
View file

@ -0,0 +1,9 @@
[submodule "Submodules/RemotingLite"]
path = Submodules/RemotingLite
url = https://github.com/MatterHackers/RemotingLite.git
[submodule "Submodules/MatterSlice"]
path = Submodules/MatterSlice
url = https://github.com/MatterHackers/MatterSlice.git
[submodule "Submodules/agg-sharp"]
path = Submodules/agg-sharp
url = https://github.com/MatterHackers/agg-sharp.git

18
ActionBar/PrinterActionRow.cs
View file

@ -26,7 +26,7 @@ namespace MatterHackers.MatterControl.ActionBar
Button connectPrinterButton;
Button disconnectPrinterButton;
Button selectActivePrinterButton;
Button emergencyStopButton;
Button resetConnectionButton;
ConnectionWindow connectionWindow;
bool connectionWindowIsOpen = false;
@ -100,15 +100,15 @@ namespace MatterHackers.MatterControl.ActionBar
selectActivePrinterButton.Margin = new BorderDouble(0, 6, 6, 3);
}
string emergencyStopText = "Emergency Stop".Localize().ToUpper();
emergencyStopButton = actionBarButtonFactory.Generate(emergencyStopText, "e_stop4.png");
string resetConnectionText = "Reset\nConnection".Localize().ToUpper();
resetConnectionButton = actionBarButtonFactory.Generate(resetConnectionText, "e_stop4.png");
if (ApplicationController.Instance.WidescreenMode)
{
emergencyStopButton.Margin = new BorderDouble(0, 0, 3, 3);
resetConnectionButton.Margin = new BorderDouble(0, 0, 3, 3);
}
else
{
emergencyStopButton.Margin = new BorderDouble(6, 0, 3, 3);
resetConnectionButton.Margin = new BorderDouble(6, 0, 3, 3);
}
// Bind connect button states to active printer state
@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.ActionBar
this.AddChild(connectPrinterButton);
this.AddChild(disconnectPrinterButton);
this.AddChild(selectActivePrinterButton);
this.AddChild(emergencyStopButton);
this.AddChild(resetConnectionButton);
//this.AddChild(CreateOptionsMenu());
}
@ -134,7 +134,7 @@ namespace MatterHackers.MatterControl.ActionBar
selectActivePrinterButton.Click += new EventHandler(onSelectActivePrinterButton_Click);
connectPrinterButton.Click += new EventHandler(onConnectButton_Click);
disconnectPrinterButton.Click += new EventHandler(onDisconnectButtonClick);
emergencyStopButton.Click += new EventHandler(emergencyStopButton_Click);
resetConnectionButton.Click += new EventHandler(resetConnectionButton_Click);
base.AddHandlers();
}
@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl.ActionBar
}
}
void emergencyStopButton_Click(object sender, EventArgs mouseEvent)
void resetConnectionButton_Click(object sender, EventArgs mouseEvent)
{
PrinterConnectionAndCommunication.Instance.RebootBoard();
}
@ -274,7 +274,7 @@ namespace MatterHackers.MatterControl.ActionBar
// Ensure connect buttons are locked while long running processes are executing to prevent duplicate calls into said actions
connectPrinterButton.Enabled = communicationState != PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect;
disconnectPrinterButton.Enabled = communicationState != PrinterConnectionAndCommunication.CommunicationStates.Disconnecting;
emergencyStopButton.Visible = PrinterConnectionAndCommunication.Instance.PrinterIsConnected && ActiveSliceSettings.Instance.HasEmergencyStop();
resetConnectionButton.Visible = PrinterConnectionAndCommunication.Instance.PrinterIsConnected && ActiveSliceSettings.Instance.ShowResetConnection();
}
void onPrinterStatusChanged(object sender, EventArgs e)

44
MatterControl.csproj
View file

@ -355,10 +355,10 @@
<Reference Include="System.Core" />
<Reference Include="Mono.Posix" />
<Reference Include="nunit.framework">
<HintPath>..\agg-sharp\AggTests\nunit.framework.dll</HintPath>
<HintPath>Submodules\agg-sharp\AggTests\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="OpenTK">
<HintPath>..\agg-sharp\PlatformWin32\OpenTK.dll</HintPath>
<HintPath>Submodules\agg-sharp\PlatformWin32\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
@ -391,59 +391,59 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\agg-sharp\clipper_library\clipper_library.csproj">
<ProjectReference Include="Submodules\agg-sharp\clipper_library\clipper_library.csproj">
<Project>{9B062971-A88E-4A3D-B3C9-12B78D15FA66}</Project>
<Name>clipper_library</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Csg\Csg.csproj">
<ProjectReference Include="Submodules\agg-sharp\Csg\Csg.csproj">
<Project>{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}</Project>
<Name>Csg</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Gui\Gui.csproj">
<ProjectReference Include="Submodules\agg-sharp\Gui\Gui.csproj">
<Project>{74F6BB6C-9D02-4512-A59A-21940E35C532}</Project>
<Name>Gui</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\ImageProcessing\ImageProcessing.csproj">
<ProjectReference Include="Submodules\agg-sharp\ImageProcessing\ImageProcessing.csproj">
<Project>{036BCCBA-52D8-457C-84AE-8821F209FE4A}</Project>
<Name>ImageProcessing</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\MarchingSquares\MarchingSquares.csproj">
<ProjectReference Include="Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj">
<Project>{DF6845CD-64C6-4263-8357-DA8066855739}</Project>
<Name>MarchingSquares</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\PlatformAbstract\PlatformAbstract.csproj">
<ProjectReference Include="Submodules\agg-sharp\PlatformAbstract\PlatformAbstract.csproj">
<Project>{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}</Project>
<Name>PlatformAbstract</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\RayTracer\RayTracer.csproj">
<ProjectReference Include="Submodules\agg-sharp\RayTracer\RayTracer.csproj">
<Project>{1E01ABE0-B494-4FE4-B0D6-540133286887}</Project>
<Name>RayTracer</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\VectorMath\VectorMath.csproj">
<ProjectReference Include="Submodules\agg-sharp\VectorMath\VectorMath.csproj">
<Project>{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\examples\GCodeVisualizer\GCodeVisualizer.csproj">
<ProjectReference Include="Submodules\agg-sharp\examples\GCodeVisualizer\GCodeVisualizer.csproj">
<Project>{F67AE800-B0C7-42A8-836F-597B4E74591C}</Project>
<Name>GCodeVisualizer</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\SerialPortCommunication\SerialPortCommunication.csproj">
<ProjectReference Include="Submodules\agg-sharp\SerialPortCommunication\SerialPortCommunication.csproj">
<Project>{D3ABF72C-64C2-4E51-A119-E077210FA990}</Project>
<Name>SerialPortCommunication</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\WindowsFileDialogs\WindowsFileDialogs.csproj">
<ProjectReference Include="Submodules\agg-sharp\WindowsFileDialogs\WindowsFileDialogs.csproj">
<Project>{A526DC5D-65F3-461B-805F-D3AC9665F5C9}</Project>
<Name>WindowsFileDialogs</Name>
</ProjectReference>
<ProjectReference Include="..\MatterSlice\MatterSlice.csproj">
<ProjectReference Include="Submodules\MatterSlice\MatterSlice.csproj">
<Project>{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}</Project>
<Name>MatterSlice</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\examples\MeshViewer\MeshViewer.csproj">
<ProjectReference Include="Submodules\agg-sharp\examples\MeshViewer\MeshViewer.csproj">
<Project>{A737BC76-165B-46C6-82B7-8871C7C92942}</Project>
<Name>MeshViewer</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Tesselate\Tesselate.csproj">
<ProjectReference Include="Submodules\agg-sharp\Tesselate\Tesselate.csproj">
<Project>{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}</Project>
<Name>Tesselate</Name>
</ProjectReference>
@ -455,19 +455,19 @@
<Project>{3DF4CB3D-9A03-4256-9A81-70523AAD828B}</Project>
<Name>Launcher</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\OpenGlGui\OpenGlGui.csproj">
<ProjectReference Include="Submodules\agg-sharp\OpenGlGui\OpenGlGui.csproj">
<Project>{C958F745-156E-4BDC-A24A-3721C7BE7B8A}</Project>
<Name>OpenGlGui</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\RenderOpenGl\RenderOpenGl.csproj">
<ProjectReference Include="Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj">
<Project>{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}</Project>
<Name>RenderOpenGl</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\PolygonMesh\PolygonMesh.csproj">
<ProjectReference Include="Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj">
<Project>{86F6AAF2-9B50-40B8-A427-1897D76471C5}</Project>
<Name>PolygonMesh</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\PlatformWin32\PlatformWin32.csproj">
<ProjectReference Include="Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj">
<Project>{670BDDFF-927B-425D-9DD1-22ACB14356EB}</Project>
<Name>PlatformWin32</Name>
</ProjectReference>
@ -475,11 +475,11 @@
<Project>{865172A0-A1A9-49C2-9386-F2FDB4E141B7}</Project>
<Name>MatterControlPluginSystem</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Localizations\Localizations.csproj">
<ProjectReference Include="Submodules\agg-sharp\Localizations\Localizations.csproj">
<Project>{CA96058C-1A37-465D-A357-D6D695B13D25}</Project>
<Name>Localizations</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Agg\Agg.csproj">
<ProjectReference Include="Submodules\agg-sharp\Agg\Agg.csproj">
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>

207
MatterControl.sln
View file

@ -30,56 +30,56 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterCont
{670BDDFF-927B-425D-9DD1-22ACB14356EB} = {670BDDFF-927B-425D-9DD1-22ACB14356EB}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tesselate", "..\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tesselate", "Submodules\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformWin32", "..\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformWin32", "Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}"
ProjectSection(ProjectDependencies) = postProject
{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}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorMath", "..\agg-sharp\VectorMath\VectorMath.csproj", "{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorMath", "Submodules\agg-sharp\VectorMath\VectorMath.csproj", "{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderOpenGl", "..\agg-sharp\RenderOpenGl\RenderOpenGl.csproj", "{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderOpenGl", "Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj", "{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gui", "..\agg-sharp\Gui\Gui.csproj", "{74F6BB6C-9D02-4512-A59A-21940E35C532}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gui", "Submodules\agg-sharp\Gui\Gui.csproj", "{74F6BB6C-9D02-4512-A59A-21940E35C532}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csg", "..\agg-sharp\Csg\Csg.csproj", "{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csg", "Submodules\agg-sharp\Csg\Csg.csproj", "{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolygonMesh", "..\agg-sharp\PolygonMesh\PolygonMesh.csproj", "{86F6AAF2-9B50-40B8-A427-1897D76471C5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolygonMesh", "Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj", "{86F6AAF2-9B50-40B8-A427-1897D76471C5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agg", "..\agg-sharp\Agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agg", "Submodules\agg-sharp\Agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGlGui", "..\agg-sharp\OpenGlGui\OpenGlGui.csproj", "{C958F745-156E-4BDC-A24A-3721C7BE7B8A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGlGui", "Submodules\agg-sharp\OpenGlGui\OpenGlGui.csproj", "{C958F745-156E-4BDC-A24A-3721C7BE7B8A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTracer", "..\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTracer", "Submodules\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GCodeVisualizer", "..\agg-sharp\examples\GCodeVisualizer\GCodeVisualizer.csproj", "{F67AE800-B0C7-42A8-836F-597B4E74591C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GCodeVisualizer", "Submodules\agg-sharp\examples\GCodeVisualizer\GCodeVisualizer.csproj", "{F67AE800-B0C7-42A8-836F-597B4E74591C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerialPortCommunication", "..\agg-sharp\SerialPortCommunication\SerialPortCommunication.csproj", "{D3ABF72C-64C2-4E51-A119-E077210FA990}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerialPortCommunication", "Submodules\agg-sharp\SerialPortCommunication\SerialPortCommunication.csproj", "{D3ABF72C-64C2-4E51-A119-E077210FA990}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeshViewer", "..\agg-sharp\examples\MeshViewer\MeshViewer.csproj", "{A737BC76-165B-46C6-82B7-8871C7C92942}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeshViewer", "Submodules\agg-sharp\examples\MeshViewer\MeshViewer.csproj", "{A737BC76-165B-46C6-82B7-8871C7C92942}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localizations", "..\agg-sharp\Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localizations", "Submodules\agg-sharp\Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessing", "..\agg-sharp\ImageProcessing\ImageProcessing.csproj", "{036BCCBA-52D8-457C-84AE-8821F209FE4A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessing", "Submodules\agg-sharp\ImageProcessing\ImageProcessing.csproj", "{036BCCBA-52D8-457C-84AE-8821F209FE4A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clipper_library", "..\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clipper_library", "Submodules\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarchingSquares", "..\agg-sharp\MarchingSquares\MarchingSquares.csproj", "{DF6845CD-64C6-4263-8357-DA8066855739}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFileDialogs", "..\agg-sharp\WindowsFileDialogs\WindowsFileDialogs.csproj", "{A526DC5D-65F3-461B-805F-D3AC9665F5C9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFileDialogs", "Submodules\agg-sharp\WindowsFileDialogs\WindowsFileDialogs.csproj", "{A526DC5D-65F3-461B-805F-D3AC9665F5C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextCreator", "..\MatterControlPlugins\TextCreator\TextCreator.csproj", "{F49EC1DD-D645-4709-8667-B57318AF67B0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice", "..\MatterSlice\MatterSlice.csproj", "{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}"
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
@ -87,7 +87,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControlAuth", "..\Mat
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PictureCreator", "..\MatterControlPictureCreator\PictureCreator\PictureCreator.csproj", "{BEC6FD13-C765-4B90-836B-53823AC12E20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformAbstract", "..\agg-sharp\PlatformAbstract\PlatformAbstract.csproj", "{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformAbstract", "Submodules\agg-sharp\PlatformAbstract\PlatformAbstract.csproj", "{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudServices", "..\CloudServicesPlugin\CloudServices\CloudServices.csproj", "{6782BF37-8139-4DC6-885E-98D22D1FB258}"
EndProject
@ -144,11 +144,10 @@ Global
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|x64.ActiveCfg = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|Any CPU.Build.0 = Debug64|x64
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x64.ActiveCfg = Debug64|x64
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x64.Build.0 = Debug64|x64
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x64.ActiveCfg = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x86.ActiveCfg = Debug|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Release|Any CPU.Build.0 = Release|Any CPU
{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Release|x64.ActiveCfg = Release|Any CPU
@ -162,11 +161,10 @@ Global
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug|x64.ActiveCfg = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug|x86.ActiveCfg = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|Any CPU.Build.0 = Debug64|x64
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x64.ActiveCfg = Debug64|x64
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x64.Build.0 = Debug64|x64
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x64.ActiveCfg = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x86.ActiveCfg = Debug|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Release|Any CPU.Build.0 = Release|Any CPU
{670BDDFF-927B-425D-9DD1-22ACB14356EB}.Release|x64.ActiveCfg = Release|Any CPU
@ -180,11 +178,10 @@ Global
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug|x64.ActiveCfg = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug|x86.ActiveCfg = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|Any CPU.Build.0 = Debug64|x64
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x64.ActiveCfg = Debug64|x64
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x64.Build.0 = Debug64|x64
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x86.ActiveCfg = Debug64|x64
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x64.ActiveCfg = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x86.ActiveCfg = Debug|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Release|Any CPU.Build.0 = Release|Any CPU
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Release|x64.ActiveCfg = Release|Any CPU
@ -198,11 +195,10 @@ Global
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug|x64.ActiveCfg = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug|x86.ActiveCfg = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|Any CPU.Build.0 = Debug64|x64
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x64.ActiveCfg = Debug64|x64
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x64.Build.0 = Debug64|x64
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x64.ActiveCfg = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x86.ActiveCfg = Debug|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Release|Any CPU.Build.0 = Release|Any CPU
{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Release|x64.ActiveCfg = Release|Any CPU
@ -217,11 +213,10 @@ Global
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x64.ActiveCfg = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x64.Build.0 = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x86.ActiveCfg = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.Build.0 = Debug64|x64
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x64.ActiveCfg = Debug64|x64
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x64.Build.0 = Debug64|x64
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x86.ActiveCfg = Debug64|x64
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x64.ActiveCfg = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x86.ActiveCfg = Debug|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Release|Any CPU.Build.0 = Release|Any CPU
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Release|x64.ActiveCfg = Release|Any CPU
@ -236,11 +231,10 @@ Global
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x64.ActiveCfg = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x64.Build.0 = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x86.ActiveCfg = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.Build.0 = Debug64|x64
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x64.ActiveCfg = Debug64|x64
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x64.Build.0 = Debug64|x64
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x86.ActiveCfg = Debug64|x64
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x64.ActiveCfg = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x86.ActiveCfg = Debug|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Release|Any CPU.Build.0 = Release|Any CPU
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Release|x64.ActiveCfg = Release|Any CPU
@ -254,11 +248,10 @@ Global
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug|x64.ActiveCfg = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug|x86.ActiveCfg = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|Any CPU.Build.0 = Debug64|x64
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x64.ActiveCfg = Debug64|x64
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x64.Build.0 = Debug64|x64
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x64.ActiveCfg = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x86.ActiveCfg = Debug|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Release|Any CPU.Build.0 = Release|Any CPU
{86F6AAF2-9B50-40B8-A427-1897D76471C5}.Release|x64.ActiveCfg = Release|Any CPU
@ -273,11 +266,11 @@ Global
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|x64.ActiveCfg = Debug|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|x64.Build.0 = Debug|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|x86.ActiveCfg = Debug|Any CPU
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|Any CPU.Build.0 = Debug64|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x64.ActiveCfg = Debug64|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x64.Build.0 = Debug64|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x86.ActiveCfg = Debug64|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x64.ActiveCfg = Debug|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x64.Build.0 = Debug|x64
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x86.ActiveCfg = Debug|Any CPU
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.Build.0 = Release|Any CPU
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|x64.ActiveCfg = Release|x64
@ -291,11 +284,10 @@ Global
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|x64.ActiveCfg = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|x86.ActiveCfg = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|Any CPU.Build.0 = Debug64|x64
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x64.ActiveCfg = Debug64|x64
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x64.Build.0 = Debug64|x64
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x64.ActiveCfg = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x86.ActiveCfg = Debug|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Any CPU.Build.0 = Release|Any CPU
{C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|x64.ActiveCfg = Release|Any CPU
@ -332,11 +324,10 @@ Global
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug|x64.ActiveCfg = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug|x86.ActiveCfg = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|Any CPU.Build.0 = Debug64|x64
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x64.ActiveCfg = Debug64|x64
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x64.Build.0 = Debug64|x64
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x64.ActiveCfg = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x86.ActiveCfg = Debug|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Release|Any CPU.Build.0 = Release|Any CPU
{1E01ABE0-B494-4FE4-B0D6-540133286887}.Release|x64.ActiveCfg = Release|Any CPU
@ -351,11 +342,10 @@ Global
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x64.ActiveCfg = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x64.Build.0 = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x86.ActiveCfg = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.Build.0 = Debug64|x64
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x64.ActiveCfg = Debug64|x64
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x64.Build.0 = Debug64|x64
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x86.ActiveCfg = Debug64|x64
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x64.ActiveCfg = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x86.ActiveCfg = Debug|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Release|Any CPU.Build.0 = Release|Any CPU
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Release|x64.ActiveCfg = Release|Any CPU
@ -369,11 +359,10 @@ Global
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug|x64.ActiveCfg = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug|x86.ActiveCfg = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|Any CPU.Build.0 = Debug64|x64
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x64.ActiveCfg = Debug64|x64
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x64.Build.0 = Debug64|x64
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x64.ActiveCfg = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x86.ActiveCfg = Debug|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Release|Any CPU.Build.0 = Release|Any CPU
{D3ABF72C-64C2-4E51-A119-E077210FA990}.Release|x64.ActiveCfg = Release|Any CPU
@ -388,11 +377,10 @@ Global
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x64.ActiveCfg = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x64.Build.0 = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x86.ActiveCfg = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.Build.0 = Debug64|x64
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x64.ActiveCfg = Debug64|x64
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x64.Build.0 = Debug64|x64
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x64.ActiveCfg = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x86.ActiveCfg = Debug|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Release|Any CPU.Build.0 = Release|Any CPU
{A737BC76-165B-46C6-82B7-8871C7C92942}.Release|x64.ActiveCfg = Release|Any CPU
@ -425,11 +413,10 @@ Global
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x64.ActiveCfg = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x64.Build.0 = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x86.ActiveCfg = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.Build.0 = Debug64|x64
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x64.ActiveCfg = Debug64|x64
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x64.Build.0 = Debug64|x64
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x86.ActiveCfg = Debug64|x64
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x64.ActiveCfg = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x86.ActiveCfg = Debug|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release|Any CPU.Build.0 = Release|Any CPU
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release|x64.ActiveCfg = Release|Any CPU
@ -441,14 +428,12 @@ Global
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release64|x86.ActiveCfg = Release64|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x64.ActiveCfg = Debug|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x64.Build.0 = Debug|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x64.ActiveCfg = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x86.ActiveCfg = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.Build.0 = Debug64|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x64.ActiveCfg = Debug64|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x64.Build.0 = Debug64|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x86.ActiveCfg = Debug64|x64
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x64.ActiveCfg = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x86.ActiveCfg = Debug|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.Build.0 = Release|Any CPU
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|x64.ActiveCfg = Release|Any CPU
@ -463,11 +448,10 @@ Global
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x64.ActiveCfg = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x64.Build.0 = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x86.ActiveCfg = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.Build.0 = Debug64|x64
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x64.ActiveCfg = Debug64|x64
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x64.Build.0 = Debug64|x64
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x86.ActiveCfg = Debug64|x64
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x64.ActiveCfg = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x86.ActiveCfg = Debug|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Release|Any CPU.Build.0 = Release|Any CPU
{DF6845CD-64C6-4263-8357-DA8066855739}.Release|x64.ActiveCfg = Release|Any CPU
@ -498,11 +482,10 @@ Global
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug|x64.ActiveCfg = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug|x86.ActiveCfg = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|Any CPU.Build.0 = Debug64|x64
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x64.ActiveCfg = Debug64|x64
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x64.Build.0 = Debug64|x64
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x86.ActiveCfg = Debug64|x64
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x64.ActiveCfg = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x86.ActiveCfg = Debug|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Release|Any CPU.Build.0 = Release|Any CPU
{A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Release|x64.ActiveCfg = Release|Any CPU
@ -604,11 +587,10 @@ Global
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug|x64.ActiveCfg = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|Any CPU.ActiveCfg = Debug64|x64
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|Any CPU.Build.0 = Debug64|x64
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x64.ActiveCfg = Debug64|x64
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x64.Build.0 = Debug64|x64
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|Any CPU.Build.0 = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x64.ActiveCfg = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x86.ActiveCfg = Debug|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Release|Any CPU.Build.0 = Release|Any CPU
{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Release|x64.ActiveCfg = Release|Any CPU
@ -710,6 +692,7 @@ Global
{F67AE800-B0C7-42A8-836F-597B4E74591C} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{D3ABF72C-64C2-4E51-A119-E077210FA990} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{A737BC76-165B-46C6-82B7-8871C7C92942} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{CA96058C-1A37-465D-A357-D6D695B13D25} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{036BCCBA-52D8-457C-84AE-8821F209FE4A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{DF6845CD-64C6-4263-8357-DA8066855739} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}

6
PluginSystem/MatterControlPluginSystem.csproj
View file

@ -143,15 +143,15 @@
<Compile Include="MatterControlPluginBase.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\agg-sharp\Gui\Gui.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\Gui\Gui.csproj">
<Project>{74F6BB6C-9D02-4512-A59A-21940E35C532}</Project>
<Name>Gui</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\agg\Agg.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\Agg\Agg.csproj">
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\PlatformAbstract\PlatformAbstract.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\PlatformAbstract\PlatformAbstract.csproj">
<Project>{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}</Project>
<Name>PlatformAbstract</Name>
</ProjectReference>

12
PrinterDriverInstaller/InfInstaller.csproj
View file

@ -142,27 +142,27 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\agg-sharp\Gui\Gui.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\Gui\Gui.csproj">
<Project>{74F6BB6C-9D02-4512-A59A-21940E35C532}</Project>
<Name>Gui</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\Tesselate\Tesselate.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\Tesselate\Tesselate.csproj">
<Project>{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}</Project>
<Name>Tesselate</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\VectorMath\VectorMath.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\VectorMath\VectorMath.csproj">
<Project>{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\Csg\Csg.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\Csg\Csg.csproj">
<Project>{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}</Project>
<Name>Csg</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\agg\Agg.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\Agg\Agg.csproj">
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>
<ProjectReference Include="..\..\agg-sharp\PolygonMesh\PolygonMesh.csproj">
<ProjectReference Include="..\Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj">
<Project>{86F6AAF2-9B50-40B8-A427-1897D76471C5}</Project>
<Name>PolygonMesh</Name>
</ProjectReference>

4
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -233,9 +233,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return GetActiveValue("has_fan") == "1";
}
public bool HasEmergencyStop()
public bool ShowResetConnection()
{
return GetActiveValue("has_emergency_stop") == "1";
return GetActiveValue("show_reset_connection") == "1";
}
public bool HasHardwareLeveling()

1
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -261,6 +261,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
"has_hardware_leveling",
"has_sd_card_reader",
"extruder_count",
"show_reset_connection",
"extruders_share_temperature",
};

2
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -211,7 +211,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new NotPassedItem("", "has_heated_bed"),
new NotPassedItem("", "has_sd_card_reader"),
new NotPassedItem("", "z_can_be_negative"),
new NotPassedItem("", "has_emergency_stop"),
new NotPassedItem("", "show_reset_connection"),
//retractionOnExtruderSwitch=14.5
new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"),

2
StaticData/PrinterSettings/config.ini
View file

@ -52,7 +52,7 @@ has_fan = 1
has_hardware_leveling = 0
has_heated_bed = 1
has_sd_card_reader = 0
has_emergency_stop = 1
show_reset_connection = 0
heat_extruder_before_homing = 0
infill_acceleration = 0
infill_every_layers = 1

2
StaticData/SliceSettings/Layouts.txt
View file

@ -239,7 +239,7 @@ Advanced
has_hardware_leveling
has_heated_bed
has_sd_card_reader
has_emergency_stop
show_reset_connection
extruder_count
heat_extruder_before_homing
extruders_share_temperature

6
StaticData/SliceSettings/Properties.json
View file

@ -414,9 +414,9 @@
"ExtraSettings": "bed_temperature,first_layer_bed_temperature"
},
{
"SlicerConfigName": "has_emergency_stop",
"PresentationName": "Enable Emergency Stop",
"HelpText": "Make the emergency stop option available during print.",
"SlicerConfigName": "show_reset_connection",
"PresentationName": "Show Reset Connection",
"HelpText": "Makes visible a button that will reset the connection when pressed. This can be used on printers that support it as an emergency stop.",
"DataEditType": "HARDWARE_PRESENT",
"ExtraSettings": ""
},

18
StaticData/Translations/Master.txt
View file

@ -3128,18 +3128,12 @@ Translated:This gcode will be inserted into the output right after the temperatu
English:GCode file too big to load for '{0}'.
Translated:GCode file too big to load for '{0}'.
English:Emergency Stop
Translated:Emergency Stop
English:Reset\nConnection
Translated:Reset\nConnection
English:Immediately kills connection to printer
Translated:Immediately kills connection to printer
English:Show Reset Connection
Translated:Show Reset Connection
English:Make the emergency stop option available during print.
Translated:Make the emergency stop option available during print.
English:Enable Emergency Stop
Translated:Enable Emergency Stop
English:Stop
Translated:Stop
English:Makes visible a button that will reset the connection when pressed. This can be used on printers that support it as an emergency stop.
Translated:Makes visible a button that will reset the connection when pressed. This can be used on printers that support it as an emergency stop.

1
Submodules/MatterSlice Submodule

@ -0,0 +1 @@
Subproject commit ac0318e10703e38a668fcf1095ad893027417af4

1
Submodules/RemotingLite Submodule

@ -0,0 +1 @@
Subproject commit 8261eb8761026fc8172d8b727c04e8135842d023

1
Submodules/agg-sharp Submodule

@ -0,0 +1 @@
Subproject commit 086c089bb97db8d1b6f92109261efebe4f8f54b8