diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..495093536 --- /dev/null +++ b/.gitmodules @@ -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 diff --git a/ActionBar/PrinterActionRow.cs b/ActionBar/PrinterActionRow.cs index aa3e267e8..0e6603f2d 100644 --- a/ActionBar/PrinterActionRow.cs +++ b/ActionBar/PrinterActionRow.cs @@ -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) diff --git a/MatterControl.csproj b/MatterControl.csproj index 9d634e8af..1edefafc6 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -355,10 +355,10 @@ - ..\agg-sharp\AggTests\nunit.framework.dll + Submodules\agg-sharp\AggTests\nunit.framework.dll - ..\agg-sharp\PlatformWin32\OpenTK.dll + Submodules\agg-sharp\PlatformWin32\OpenTK.dll @@ -391,59 +391,59 @@ - + {9B062971-A88E-4A3D-B3C9-12B78D15FA66} clipper_library - + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} Csg - + {74F6BB6C-9D02-4512-A59A-21940E35C532} Gui - + {036BCCBA-52D8-457C-84AE-8821F209FE4A} ImageProcessing - + {DF6845CD-64C6-4263-8357-DA8066855739} MarchingSquares - + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} PlatformAbstract - + {1E01ABE0-B494-4FE4-B0D6-540133286887} RayTracer - + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} VectorMath - + {F67AE800-B0C7-42A8-836F-597B4E74591C} GCodeVisualizer - + {D3ABF72C-64C2-4E51-A119-E077210FA990} SerialPortCommunication - + {A526DC5D-65F3-461B-805F-D3AC9665F5C9} WindowsFileDialogs - + {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} MatterSlice - + {A737BC76-165B-46C6-82B7-8871C7C92942} MeshViewer - + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} Tesselate @@ -455,19 +455,19 @@ {3DF4CB3D-9A03-4256-9A81-70523AAD828B} Launcher - + {C958F745-156E-4BDC-A24A-3721C7BE7B8A} OpenGlGui - + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} RenderOpenGl - + {86F6AAF2-9B50-40B8-A427-1897D76471C5} PolygonMesh - + {670BDDFF-927B-425D-9DD1-22ACB14356EB} PlatformWin32 @@ -475,11 +475,11 @@ {865172A0-A1A9-49C2-9386-F2FDB4E141B7} MatterControlPluginSystem - + {CA96058C-1A37-465D-A357-D6D695B13D25} Localizations - + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} Agg diff --git a/MatterControl.sln b/MatterControl.sln index aba685c88..cba3ee9ed 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -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} diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj index 4ec25232b..7ca6790a3 100644 --- a/PluginSystem/MatterControlPluginSystem.csproj +++ b/PluginSystem/MatterControlPluginSystem.csproj @@ -143,15 +143,15 @@ - + {74F6BB6C-9D02-4512-A59A-21940E35C532} Gui - + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} Agg - + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} PlatformAbstract diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 4d82e6582..e07205266 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -142,27 +142,27 @@ - + {74F6BB6C-9D02-4512-A59A-21940E35C532} Gui - + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} Tesselate - + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} VectorMath - + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} Csg - + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} Agg - + {86F6AAF2-9B50-40B8-A427-1897D76471C5} PolygonMesh diff --git a/SlicerConfiguration/ActiveSliceSettings.cs b/SlicerConfiguration/ActiveSliceSettings.cs index 2f2486792..1e8ef5675 100644 --- a/SlicerConfiguration/ActiveSliceSettings.cs +++ b/SlicerConfiguration/ActiveSliceSettings.cs @@ -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() diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 9f7a4c956..1ba2e9031 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -261,6 +261,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration "has_hardware_leveling", "has_sd_card_reader", "extruder_count", + "show_reset_connection", "extruders_share_temperature", }; diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index bee4fca1f..4a07d754d 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -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"), diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index e9150d034..abf0ebf2b 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -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 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index e9a2e4b20..d6ce70e02 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -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 diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 0fed2b528..c425175a8 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -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": "" }, diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index adac4c048..3aa723027 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -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. diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice new file mode 160000 index 000000000..ac0318e10 --- /dev/null +++ b/Submodules/MatterSlice @@ -0,0 +1 @@ +Subproject commit ac0318e10703e38a668fcf1095ad893027417af4 diff --git a/Submodules/RemotingLite b/Submodules/RemotingLite new file mode 160000 index 000000000..8261eb876 --- /dev/null +++ b/Submodules/RemotingLite @@ -0,0 +1 @@ +Subproject commit 8261eb8761026fc8172d8b727c04e8135842d023 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp new file mode 160000 index 000000000..086c089bb --- /dev/null +++ b/Submodules/agg-sharp @@ -0,0 +1 @@ +Subproject commit 086c089bb97db8d1b6f92109261efebe4f8f54b8