ScopyExceptionHandler: changed exception message and layout in pref menu

Signed-off-by: Adrian Suciu <[email protected]>
zzj2333 · Aug 31, 2020 · 2c8ed13 · 2c8ed13
1 parent 431b242
commit 2c8ed13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/scopyApplication.hpp b/src/scopyApplication.hpp
@@ -34,7 +34,7 @@
 #include "client/linux/handler/exception_handler.h"
 #endif
 
-#define CATCH_UNHANDLED_EXCEPTIONS
+//#define CATCH_UNHANDLED_EXCEPTIONS
 #endif
 #define GetScopyApplicationInstance() dynamic_cast<ScopyApplication*>(qApp)
 

diff --git a/src/scopyExceptionHandler.h b/src/scopyExceptionHandler.h
@@ -13,11 +13,12 @@ using namespace adiscope;
 	if(GetScopyApplicationInstance()->getDebugMode()) { \
 		QMessageBox msg; \
 		QString str; \
-		if(dynamic_cast<libm2k::m2k_exception*>(&e)) { \
-		str = QString("Exception %1 - %2 %3 thrown from %2:%3 caught in %4:%5. Scopy git tag %6.") \
-		.arg("m2k_exception").arg(e.type()).arg(e.what()).arg(QString::fromStdString(e.file())).arg(QString::number(e.line())).arg(__FILE__).arg(__LINE__).arg(SCOPY_VERSION_GIT); \
+		auto me = dynamic_cast<libm2k::m2k_exception*>(&e);\
+		if(me) { \
+		str = QString("Exception %1\ne.type() - %2\ne.what()  - %3\ne.iioCode() - %4\nthrown from %5:%6\ncaught in %7:%8\nScopy git tag %9\n") \
+		.arg("m2k_exception").arg(me->type()).arg(me->what()).arg(me->iioCode()).arg(QString::fromStdString(me->file())).arg(QString::number(me->line())).arg(__FILE__).arg(__LINE__).arg(SCOPY_VERSION_GIT); \
 		} \
-		else { str = QString("Exception  %1 - caught in %2:%3. Scopy git tag %4").arg(e.what()).arg(__FILE__).arg(__LINE__).arg(SCOPY_VERSION_GIT);} \
+		else { str = QString("Exception  %1\ncaught in %2:%3\nScopy git tag %4\n").arg(e.what()).arg(__FILE__).arg(__LINE__).arg(SCOPY_VERSION_GIT);} \
 		if(WriteScopyMinidump()) str = str + "Created minidump.";\
 		msg.setText(str);\
 		msg.exec();\

diff --git a/ui/preferences.ui b/ui/preferences.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1082</width>
-    <height>722</height>
+    <height>777</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1009,7 +1009,7 @@ color: white;
                <number>0</number>
               </property>
               <property name="verticalSpacing">
-               <number>15</number>
+               <number>10</number>
               </property>
               <item row="2" column="0">
                <layout class="QHBoxLayout" name="horizontalLayout_13">
@@ -1570,6 +1570,9 @@ QCheckBox::indicator:checked { background-color: rgb(74,100,255); }</string>
            </item>
            <item row="8" column="1">
             <layout class="QVBoxLayout" name="verticalLayout_8">
+             <property name="spacing">
+              <number>10</number>
+             </property>
              <property name="topMargin">
               <number>0</number>
              </property>