Skip to content

Commit 9e03dd7

Browse files
dcwhitedcwhite
committed
Crash fix attempt
1 parent 17ba08a commit 9e03dd7

File tree

2 files changed

+74
-26
lines changed

2 files changed

+74
-26
lines changed

‎src/ExampleNets/FwdInvToolkit/forward_problem.srn5‎

Lines changed: 70 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@
938938
</module>
939939
<state>
940940
<stateMap>
941-
<count>7</count>
941+
<count>9</count>
942942
<item_version>0</item_version>
943943
<item>
944944
<first>
@@ -976,6 +976,30 @@
976976
</value>
977977
</second>
978978
</item>
979+
<item>
980+
<first>
981+
<name>NodeAsPoints</name>
982+
</first>
983+
<second>
984+
<name>NodeAsPoints</name>
985+
<value>
986+
<which>3</which>
987+
<value>1</value>
988+
</value>
989+
</second>
990+
</item>
991+
<item>
992+
<first>
993+
<name>NodeAsSpheres</name>
994+
</first>
995+
<second>
996+
<name>NodeAsSpheres</name>
997+
<value>
998+
<which>3</which>
999+
<value>0</value>
1000+
</value>
1001+
</second>
1002+
</item>
9791003
<item>
9801004
<first>
9811005
<name>NodeTransparency</name>
@@ -1038,7 +1062,7 @@
10381062
</module>
10391063
<state>
10401064
<stateMap>
1041-
<count>8</count>
1065+
<count>10</count>
10421066
<item_version>0</item_version>
10431067
<item>
10441068
<first>
@@ -1088,6 +1112,30 @@
10881112
</value>
10891113
</second>
10901114
</item>
1115+
<item>
1116+
<first>
1117+
<name>NodeAsPoints</name>
1118+
</first>
1119+
<second>
1120+
<name>NodeAsPoints</name>
1121+
<value>
1122+
<which>3</which>
1123+
<value>1</value>
1124+
</value>
1125+
</second>
1126+
</item>
1127+
<item>
1128+
<first>
1129+
<name>NodeAsSpheres</name>
1130+
</first>
1131+
<second>
1132+
<name>NodeAsSpheres</name>
1133+
<value>
1134+
<which>3</which>
1135+
<value>0</value>
1136+
</value>
1137+
</second>
1138+
</item>
10911139
<item>
10921140
<first>
10931141
<name>NodeTransparency</name>
@@ -1196,7 +1244,7 @@
11961244
<name>TargetError</name>
11971245
<value>
11981246
<which>1</which>
1199-
<value>1e-013</value>
1247+
<value>1e-13</value>
12001248
</value>
12011249
</second>
12021250
</item>
@@ -1786,11 +1834,11 @@
17861834
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
17871835
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
17881836
p, li { white-space: pre-wrap; }
1789-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
1790-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Adjust resolution of the problem&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1837+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1838+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;Adjust resolution of the problem&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
17911839
<noteText>Adjust resolution of the problem</noteText>
17921840
<position>5</position>
1793-
<fontSize>8</fontSize>
1841+
<fontSize>13</fontSize>
17941842
</second>
17951843
</item>
17961844
<item>
@@ -1799,11 +1847,11 @@ p, li { white-space: pre-wrap; }
17991847
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
18001848
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
18011849
p, li { white-space: pre-wrap; }
1802-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
1803-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Set Conductivity values&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1850+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1851+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;Set Conductivity values&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
18041852
<noteText>Set Conductivity values</noteText>
18051853
<position>5</position>
1806-
<fontSize>8</fontSize>
1854+
<fontSize>13</fontSize>
18071855
</second>
18081856
</item>
18091857
<item>
@@ -1812,11 +1860,11 @@ p, li { white-space: pre-wrap; }
18121860
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
18131861
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
18141862
p, li { white-space: pre-wrap; }
1815-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
1816-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Choose time step&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1863+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1864+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;Choose time step&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
18171865
<noteText>Choose time step</noteText>
18181866
<position>4</position>
1819-
<fontSize>8</fontSize>
1867+
<fontSize>13</fontSize>
18201868
</second>
18211869
</item>
18221870
<item>
@@ -1825,11 +1873,11 @@ p, li { white-space: pre-wrap; }
18251873
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
18261874
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
18271875
p, li { white-space: pre-wrap; }
1828-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
1829-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Segmentation File&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1876+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1877+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;Segmentation File&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
18301878
<noteText>Segmentation File</noteText>
18311879
<position>5</position>
1832-
<fontSize>8</fontSize>
1880+
<fontSize>13</fontSize>
18331881
</second>
18341882
</item>
18351883
<item>
@@ -1838,11 +1886,11 @@ p, li { white-space: pre-wrap; }
18381886
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
18391887
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
18401888
p, li { white-space: pre-wrap; }
1841-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
1842-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Sock geometry&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1889+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1890+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;Sock geometry&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
18431891
<noteText>Sock geometry</noteText>
18441892
<position>5</position>
1845-
<fontSize>8</fontSize>
1893+
<fontSize>13</fontSize>
18461894
</second>
18471895
</item>
18481896
<item>
@@ -1851,13 +1899,13 @@ p, li { white-space: pre-wrap; }
18511899
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
18521900
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
18531901
p, li { white-space: pre-wrap; }
1854-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
1855-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Matrix of Epicardial potentials &lt;/span&gt;&lt;/p&gt;
1856-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;for all time steps&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1902+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1903+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;Matrix of Epicardial potentials &lt;/span&gt;&lt;/p&gt;
1904+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:16pt;&quot;&gt;for all time steps&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
18571905
<noteText>Matrix of Epicardial potentials
18581906
for all time steps</noteText>
18591907
<position>5</position>
1860-
<fontSize>8</fontSize>
1908+
<fontSize>13</fontSize>
18611909
</second>
18621910
</item>
18631911
</moduleNotes>

‎src/Interface/Application/GuiApplication.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ using namespace SCIRun::Gui;
3636

3737
int GuiApplication::run(int argc, const char* argv[])
3838
{
39-
QApplication app(argc, const_cast<char**>(argv));
40-
4139
try
42-
{
40+
{
41+
QApplication app(argc, const_cast<char**>(argv));
42+
4343
SCIRun::Gui::SCIRunMainWindow* mainWin = SCIRun::Gui::SCIRunMainWindow::Instance();
4444

4545
mainWin->setController(Core::Application::Instance().controller());
4646
mainWin->initialize();
47-
47+
4848
return app.exec();
4949
}
5050
catch (std::exception& e)

0 commit comments

Comments
 (0)