Some of impl for #825

Author: dcwhite

src/Core/Command/GlobalCommandBuilderFromCommandLine.cc

@@ -73,21 +73,25 @@ using namespace SCIRun::Core::Commands;
 
     if (!params->inputFiles().empty())
     {
-      for (int i = 0; i < params->inputFiles().size(); ++i)
+      const int last = 1;
+      //TODO: support multiple files loaded--need to be able to execute and wait for each before loading next. See #825
+      // last = params->inputFiles().size()
+      for (int i = 0; i < last; ++i)
       {
         q->enqueue(cmdFactory_->create(LoadNetworkFile, i));
+
+        if (params->executeNetwork())
+          q->enqueue(cmdFactory_->create(ExecuteCurrentNetwork));
+        else if (params->executeNetworkAndQuit())
+        {
+          if (i == last - 1)
+            q->enqueue(cmdFactory_->create(SetupQuitAfterExecute));
+          q->enqueue(cmdFactory_->create(ExecuteCurrentNetwork));
+        }
       }
     }
     else if (params->pythonScriptFile())
       q->enqueue(cmdFactory_->create(RunPythonScript));
 
-    if (params->executeNetwork())
-      q->enqueue(cmdFactory_->create(ExecuteCurrentNetwork));
-    else if (params->executeNetworkAndQuit())
-    {
-      q->enqueue(cmdFactory_->create(SetupQuitAfterExecute));
-      q->enqueue(cmdFactory_->create(ExecuteCurrentNetwork));
-    }
-
     return q;
   }

src/ExampleNets/regression/showColorMap.srn5

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="10">
+<boost_serialization signature="serialization::archive" version="11">
 <networkFile class_id="0" tracking_level="0" version="2">
 	<networkInfo class_id="1" tracking_level="0" version="0">
 		<modules class_id="2" tracking_level="0" version="0">
@@ -50,7 +50,7 @@
 									<name>PadPercent</name>
 									<value>
 										<which>1</which>
-										<value>0</value>
+										<value>0.00000000000000000e+000</value>
 									</value>
 								</second>
 							</item>
@@ -114,7 +114,7 @@
 									<name>ColorMapName</name>
 									<value>
 										<which>2</which>
-										<value>Gray</value>
+										<value>Rainbow</value>
 									</value>
 								</second>
 							</item>
@@ -266,7 +266,7 @@
 									<name>CylinderRadius</name>
 									<value>
 										<which>1</which>
-										<value>0.050000000000000003</value>
+										<value>5.00000000000000030e-002</value>
 									</value>
 								</second>
 							</item>
@@ -278,7 +278,7 @@
 									<name>CylinderResolution</name>
 									<value>
 										<which>0</which>
-										<value>8</value>
+										<value>5</value>
 									</value>
 								</second>
 							</item>
@@ -314,7 +314,7 @@
 									<name>EdgeTransparencyValue</name>
 									<value>
 										<which>1</which>
-										<value>0.64999997615814209</value>
+										<value>6.49999976158142090e-001</value>
 									</value>
 								</second>
 							</item>
@@ -350,7 +350,7 @@
 									<name>FaceTransparencyValue</name>
 									<value>
 										<which>1</which>
-										<value>0.64999997615814209</value>
+										<value>6.49999976158142090e-001</value>
 									</value>
 								</second>
 							</item>
@@ -422,7 +422,7 @@
 									<name>SphereScaleValue</name>
 									<value>
 										<which>1</which>
-										<value>1</value>
+										<value>1.00000000000000000e+000</value>
 									</value>
 								</second>
 							</item>
@@ -506,36 +506,36 @@
 		<item class_id="16" tracking_level="0" version="0">
 			<first>CreateLatVol:0</first>
 			<second class_id="17" tracking_level="0" version="0">
-				<first>-1672</first>
-				<second>-1292</second>
+				<first>-1.67200000000000000e+003</first>
+				<second>-1.29200000000000000e+003</second>
 			</second>
 		</item>
 		<item>
 			<first>CreateStandardColorMap:0</first>
 			<second>
-				<first>-1520</first>
-				<second>-608</second>
+				<first>-1.52000000000000000e+003</first>
+				<second>-6.08000000000000000e+002</second>
 			</second>
 		</item>
 		<item>
 			<first>ShowColorMap:0</first>
 			<second>
-				<first>-1520</first>
-				<second>-912</second>
+				<first>-1.52000000000000000e+003</first>
+				<second>-9.12000000000000000e+002</second>
 			</second>
 		</item>
 		<item>
 			<first>ShowField:1</first>
 			<second>
-				<first>-1672</first>
-				<second>-1140</second>
+				<first>-1.67200000000000000e+003</first>
+				<second>-1.14000000000000000e+003</second>
 			</second>
 		</item>
 		<item>
 			<first>ViewScene:1</first>
 			<second>
-				<first>-1824</first>
-				<second>-988</second>
+				<first>-1.82400000000000000e+003</first>
+				<second>-9.88000000000000000e+002</second>
 			</second>
 		</item>
 	</modulePositions>
@@ -548,11 +548,11 @@
 				<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;
 &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;
 p, li { white-space: pre-wrap; }
-&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;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt;ID: 1&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
+&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;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; color:#ffffff;&quot;&gt;ID: 1&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
 				<noteText>ID: 1</noteText>
 				<position>0</position>
-				<fontSize>13</fontSize>
+				<fontSize>8</fontSize>
 			</second>
 		</item>
 	</moduleNotes>