renamed prevImg.pl to run.pl, renamed run.pl to run.pl_old, changed misc stuff

diff --git a/setup/testsetup.xml b/setup/testsetup.xml
index b9c801af662a16107d23d00fcce29ec62255c749..89b84def520ae183ecdae8039153877ba71cff96 100644 (file)
--- a/setup/testsetup.xml
+++ b/setup/testsetup.xml
@@ -6,7 +6,7 @@
   <description>The main MVD prototype system setup file</description>
   <controller id="0" address="f308" name="board01">
     <chain id="0" name="chain0">
-      <sensor id="0" 
+      <sensor id="ccc1" 
               serial="11"
               name="sensor11"
               config="sensor11.xml"

diff --git a/tools/preview/run.pl b/tools/preview/run.pl_old
similarity index 100%
rename from tools/preview/run.pl
rename to tools/preview/run.pl_old

diff --git a/tools/prevImg.pl b/tools/run.pl
similarity index 90%
rename from tools/prevImg.pl
rename to tools/run.pl
index 8b8f15ed15b33a64119dd51a3fb7d84571e40cee..ec88fe27501008c3481cc54d9c690fcf902c8b69 100755 (executable)
--- a/tools/prevImg.pl
+++ b/tools/run.pl
@@ -2,7 +2,6 @@
 #print "Content-type: text/html\n\n";
 
 
-my $me = "testgui.pl";
 
 use strict;
 use warnings;
@@ -46,9 +45,11 @@ my $dummy;
 $dummy=qx"./exec_evtbuild_t.pl -t $runtime 2>&1"; #14
 $dummy.=qx"mv te1* ./temp.hld 2>&1";
 $dummy.=qx"./unpack_hld.pl -f ./temp.hld 2>&1";
+
+print escapeHTML($dummy);
 # qx%./run.pl -t 0.1 -id ccc1ccc1%;
 # print br;
-print img{src=>'./preview/image_recalibrated_ccc1.png?'.rand(),title=>$dummy};
+# print img{src=>'./preview/image_recalibrated_ccc1.png?'.rand(),title=>$dummy};
 # print br;
 # print "finished",br;
 print end_html;

diff --git a/tools/testgui.pl b/tools/testgui.pl
index 924b0a2f28722cf0090d61b35f8074d7548e64d6..ba2f24890ddbf4c425a64aa756431474f85c9c3f 100755 (executable)
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -238,9 +238,9 @@ sub print_sensorArea {
   print "<td colspan=2 align='center' class='td_solid'>$sensorName</td>";
   print "</tr>";
   print "<tr>";
-  my $previewAreaId = "preview_".$sensorName;
+  my $previewAreaId = "preview_".$sensorId;
   print "<td id='".$previewAreaId."' class='previewArea' > [not run yet!] </td>";
-  $quickEditAreaId = "quickEdit_".$sensorName;
+  $quickEditAreaId = "quickEdit_".$sensorId;
   print "<td id='".$quickEditAreaId."' class='quickEditArea'>";
   print_quickEditArea($sensorConfig);
   print "</td>";