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

Made the Debugger.Break() only exist in debug mode.

Browse source
This commit is contained in:
Lars Brubaker 2015-09-17 13:45:26 -07:00
parent 6af489407d
commit 79928f8fb7
20 changed files with 57 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AboutPage/AboutWidget.cs
View file

@ -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();
}
}
}

4
AboutPage/HTMLParser/ImageWidget_AsyncLoadOnDraw.cs
View file

@ -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();
}
}
}

4
AboutPage/UpdateControlData.cs
View file

@ -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);

2
AboutPage/UpdateControlView.cs
View file

@ -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());
}

2
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -420,7 +420,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
}
catch (Exception)
{
Debugger.Break();
GuiWidget.BreakInDebugger();
}
}

4
ControlElements/ThemeFactory.cs
View file

@ -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;
}

7
DataStorage/Datastore.cs
View file

@ -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();
}
}
}

5
DataStorage/Models.cs
View file

@ -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();
}

8
Library/Provider/LibraryProviderFileSystem.cs
View file

@ -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();
}
});

2
MatterControlApplication.cs
View file

@ -655,7 +655,7 @@ namespace MatterHackers.MatterControl
catch (Exception e)
{
Debug.Print(e.Message);
Debugger.Break();
GuiWidget.BreakInDebugger();
#if DEBUG
throw e;
#endif

4
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -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(() =>
{

2
PartPreviewWindow/ViewGcodeWidget.cs
View file

@ -309,7 +309,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
catch (Exception e)
{
Debug.Print(e.Message);
Debugger.Break();
GuiWidget.BreakInDebugger();
}
gCodeRenderer.CreateFeaturesForLayerIfRequired(0);
}

34
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -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);
}

4
PrinterControls/PrinterConnections/EditConnectionWidget.cs
View file

@ -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
}
}

2
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -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));

4
Queue/PrintItemWrapper.cs
View file

@ -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;
}
}

6
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -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;

6
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -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");
}
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit e777fc325ba5e1c11e232bcea7801c007746f82b
Subproject commit a5a5a0d8c6bcf700e7336068e6062fb4f6b8f376

2
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -186,7 +186,7 @@ namespace MatterHackers.MatterControl.UI
catch (Exception e)
{
Debug.Print(e.Message);
Debugger.Break();
GuiWidget.BreakInDebugger();
}
}
Stopwatch time = Stopwatch.StartNew();