diff --git a/AboutPage/AboutWidget.cs b/AboutPage/AboutWidget.cs index 70e7e88e5..399bccee3 100644 --- a/AboutPage/AboutWidget.cs +++ b/AboutPage/AboutWidget.cs @@ -203,7 +203,7 @@ namespace MatterHackers.MatterControl } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } else @@ -233,7 +233,7 @@ namespace MatterHackers.MatterControl } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } break; @@ -252,7 +252,7 @@ namespace MatterHackers.MatterControl } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } break; @@ -283,7 +283,7 @@ namespace MatterHackers.MatterControl } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } } diff --git a/AboutPage/HTMLParser/ImageWidget_AsyncLoadOnDraw.cs b/AboutPage/HTMLParser/ImageWidget_AsyncLoadOnDraw.cs index 225555100..c142af3e6 100644 --- a/AboutPage/HTMLParser/ImageWidget_AsyncLoadOnDraw.cs +++ b/AboutPage/HTMLParser/ImageWidget_AsyncLoadOnDraw.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } @@ -111,7 +111,7 @@ namespace MatterHackers.MatterControl } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } } diff --git a/AboutPage/UpdateControlData.cs b/AboutPage/UpdateControlData.cs index 32bab9d05..8c2ef70be 100644 --- a/AboutPage/UpdateControlData.cs +++ b/AboutPage/UpdateControlData.cs @@ -292,7 +292,7 @@ namespace MatterHackers.MatterControl } catch { - Debugger.Break(); + GuiWidget.BreakInDebugger(); //Unknown download size downloadSize = 0; } @@ -435,7 +435,7 @@ namespace MatterHackers.MatterControl } catch { - Debugger.Break(); + GuiWidget.BreakInDebugger(); if (System.IO.File.Exists(friendlyFileName)) { System.IO.File.Delete(friendlyFileName); diff --git a/AboutPage/UpdateControlView.cs b/AboutPage/UpdateControlView.cs index 30329cd0a..c4a8193f9 100644 --- a/AboutPage/UpdateControlView.cs +++ b/AboutPage/UpdateControlView.cs @@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl } catch { - Debugger.Break(); + GuiWidget.BreakInDebugger(); installUpdateLink.Visible = false; updateStatusText.Text = string.Format("Oops! Unable to install update.".Localize()); } diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index ca1e17395..6672a637b 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -420,7 +420,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } diff --git a/ControlElements/ThemeFactory.cs b/ControlElements/ThemeFactory.cs index 4ad152568..287da2e5f 100644 --- a/ControlElements/ThemeFactory.cs +++ b/ControlElements/ThemeFactory.cs @@ -1,6 +1,6 @@ using MatterHackers.Agg; +using MatterHackers.Agg.UI; using MatterHackers.MatterControl.SettingsManagement; - /* Copyright (c) 2014, Kevin Pope All rights reserved. @@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl } catch { - Debugger.Break(); + GuiWidget.BreakInDebugger(); themeIndex = defaultThemeIndex; } diff --git a/DataStorage/Datastore.cs b/DataStorage/Datastore.cs index abac363fc..f91d67443 100644 --- a/DataStorage/Datastore.cs +++ b/DataStorage/Datastore.cs @@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using MatterHackers.Agg.PlatformAbstract; +using MatterHackers.Agg.UI; using System; using System.Collections.Generic; using System.Diagnostics; @@ -218,7 +219,7 @@ namespace MatterHackers.MatterControl.DataStorage } catch { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } } @@ -255,7 +256,7 @@ namespace MatterHackers.MatterControl.DataStorage } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); // we faild to close so lets wait a bit and try again Thread.Sleep(1000); try @@ -264,7 +265,7 @@ namespace MatterHackers.MatterControl.DataStorage } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } } diff --git a/DataStorage/Models.cs b/DataStorage/Models.cs index 86b979b83..aa0cc98a1 100644 --- a/DataStorage/Models.cs +++ b/DataStorage/Models.cs @@ -27,6 +27,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using MatterHackers.Agg.UI; using MatterHackers.MatterControl.PrintLibrary.Provider; using Newtonsoft.Json; using System; @@ -171,7 +172,7 @@ namespace MatterHackers.MatterControl.DataStorage } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); Thread.Sleep(100); this.TryHandleInsert(); } @@ -191,7 +192,7 @@ namespace MatterHackers.MatterControl.DataStorage } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); Thread.Sleep(100); this.TryHandleUpdate(); } diff --git a/Library/Provider/LibraryProviderFileSystem.cs b/Library/Provider/LibraryProviderFileSystem.cs index 80bd57422..ea1b5d7ea 100644 --- a/Library/Provider/LibraryProviderFileSystem.cs +++ b/Library/Provider/LibraryProviderFileSystem.cs @@ -264,7 +264,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider } catch (Exception e) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } // save it to the root directory @@ -305,7 +305,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider } catch (Exception e) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } return outputFileName; @@ -345,7 +345,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } try @@ -385,7 +385,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider } catch (Exception) { - Debugger.Break(); + GuiWidget.BreakInDebugger(); } }); diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index be4fd7de5..5766c59d8 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -655,7 +655,7 @@ namespace MatterHackers.MatterControl catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); #if DEBUG throw e; #endif diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 4a52e5f3f..0529042f0 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -1896,7 +1896,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow catch (System.UnauthorizedAccessException e2) { Debug.Print(e2.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); saveSucceded = false; UiThread.RunOnIdle(() => { @@ -1907,7 +1907,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); saveSucceded = false; UiThread.RunOnIdle(() => { diff --git a/PartPreviewWindow/ViewGcodeWidget.cs b/PartPreviewWindow/ViewGcodeWidget.cs index f6b5ccf9e..eff878f7b 100644 --- a/PartPreviewWindow/ViewGcodeWidget.cs +++ b/PartPreviewWindow/ViewGcodeWidget.cs @@ -309,7 +309,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); } gCodeRenderer.CreateFeaturesForLayerIfRequired(0); } diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index 556fa6a65..45b211992 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -368,7 +368,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch { Console.WriteLine("Unable to convert BaudRate to integer"); - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } return baudRate; @@ -892,7 +892,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); return -1; } } @@ -1001,7 +1001,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch(Exception e2) { Debug.Print(e2.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Debug.WriteLine("Unable to Parse Bed Temperature: {0}".FormatWith(temp)); } } @@ -1120,7 +1120,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch(Exception e2) { Debug.Print(e2.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Debug.WriteLine("Unable to Parse Fan Speed: {0}".FormatWith(fanSpeed)); } } @@ -1373,7 +1373,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); // Let's track this issue if possible. MatterControlApplication.Instance.ReportException(e, this.GetType().Name, MethodBase.GetCurrentMethod().Name); } @@ -1596,31 +1596,31 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch (TimeoutException e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); } catch (IOException e2) { Debug.Print(e2.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); OnConnectionFailed(null); } catch (InvalidOperationException ex) { Debug.Print(ex.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Debug.WriteLine(ex.Message); // this happens when the serial port closes after we check and before we read it. } catch (UnauthorizedAccessException e3) { Debug.Print(e3.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); OnConnectionFailed(null); } catch (Exception e4) { Debug.Print(e4.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); // Let's track this issue if possible. MatterControlApplication.Instance.ReportException(e4, this.GetType().Name, MethodBase.GetCurrentMethod().Name); } @@ -1776,7 +1776,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); MatterControlApplication.Instance.ReportException(e, this.GetType().Name, MethodBase.GetCurrentMethod().Name); } } @@ -1964,7 +1964,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); return false; } } @@ -2226,14 +2226,14 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch (System.ArgumentOutOfRangeException e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); connectionFailureMessage = LocalizedString.Get("Unsupported Baud Rate"); OnConnectionFailed(null); } catch (Exception ex) { Debug.Print(ex.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Debug.WriteLine("An unexpected exception occurred: " + ex.Message); OnConnectionFailed(null); } @@ -2970,7 +2970,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch (IOException ex) { Debug.Print(ex.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Trace.WriteLine("Error writing to printer: " + ex.Message); // Handle hardware disconnects by relaying the failure reason and shutting down open resources @@ -2979,12 +2979,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication catch (TimeoutException e2) { Debug.Print(e2.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); } catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); // Let's track this issue if possible. MatterControlApplication.Instance.ReportException(e, this.GetType().Name, MethodBase.GetCurrentMethod().Name); } diff --git a/PrinterControls/PrinterConnections/EditConnectionWidget.cs b/PrinterControls/PrinterConnections/EditConnectionWidget.cs index 0821de76e..eaaf8c0f3 100644 --- a/PrinterControls/PrinterConnections/EditConnectionWidget.cs +++ b/PrinterControls/PrinterConnections/EditConnectionWidget.cs @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); //No active COM ports } } @@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); //No active COM ports } } diff --git a/PrinterControls/TerminalWindow/TerminalWidget.cs b/PrinterControls/TerminalWindow/TerminalWidget.cs index 563730967..eb98e2a5f 100644 --- a/PrinterControls/TerminalWindow/TerminalWidget.cs +++ b/PrinterControls/TerminalWindow/TerminalWidget.cs @@ -234,7 +234,7 @@ namespace MatterHackers.MatterControl catch(UnauthorizedAccessException e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); PrinterOutputCache.Instance.PrinterLines.Add(""); PrinterOutputCache.Instance.PrinterLines.Add(writeFaildeWaring); PrinterOutputCache.Instance.PrinterLines.Add(cantAccessPath.FormatWith(filePathToSave)); diff --git a/Queue/PrintItemWrapper.cs b/Queue/PrintItemWrapper.cs index aab2fe91f..d1f5ce65b 100644 --- a/Queue/PrintItemWrapper.cs +++ b/Queue/PrintItemWrapper.cs @@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.PrintQueue catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); //file not found } } @@ -190,7 +190,7 @@ namespace MatterHackers.MatterControl.PrintQueue catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); this.fileHashCode = 0; } } diff --git a/SlicerConfiguration/ActiveSliceSettings.cs b/SlicerConfiguration/ActiveSliceSettings.cs index 445a3ecaa..26983cab8 100644 --- a/SlicerConfiguration/ActiveSliceSettings.cs +++ b/SlicerConfiguration/ActiveSliceSettings.cs @@ -686,7 +686,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Debug.WriteLine(string.Format("Error loading configuration: {0}", e)); return null; } @@ -720,7 +720,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); Debug.WriteLine(string.Format("Error loading configuration: {0}", e)); } } @@ -917,7 +917,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); string stackTraceNoBackslashRs = e.StackTrace.Replace("\r", ""); ContactFormWindow.Open("Parse Error while slicing".Localize(), e.Message + stackTraceNoBackslashRs); return false; diff --git a/SlicerConfiguration/SettingsControlSelectors.cs b/SlicerConfiguration/SettingsControlSelectors.cs index fe5e669d1..4b80980e8 100644 --- a/SlicerConfiguration/SettingsControlSelectors.cs +++ b/SlicerConfiguration/SettingsControlSelectors.cs @@ -255,7 +255,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); //Unable to set selected value } } @@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); //Unable to set selected value } } @@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration catch(Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); throw new Exception("MatterSlice is not available, for some strange reason"); } } diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index e777fc325..a5a5a0d8c 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit e777fc325ba5e1c11e232bcea7801c007746f82b +Subproject commit a5a5a0d8c6bcf700e7336068e6062fb4f6b8f376 diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 1efaee724..eb15cd1b8 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -186,7 +186,7 @@ namespace MatterHackers.MatterControl.UI catch (Exception e) { Debug.Print(e.Message); - Debugger.Break(); + GuiWidget.BreakInDebugger(); } } Stopwatch time = Stopwatch.StartNew();