added nice icons to testgui, testgui visual feedback now distinguishes between busy...

diff --git a/Environment.pm b/Environment.pm
index cc93cd799d29575902d1e48bb2187acf06d5e992..3fb35ee6944bdea6fd227d61ce395b1be74edb9f 100644 (file)
--- a/Environment.pm
+++ b/Environment.pm
@@ -19,6 +19,7 @@ use constant SPECDIR          => JTAGROOTPATH."specs/";
 use constant PICTUREPATH      => TEMPDIR."prevImgs/";                #path for images on webserver (absolute path)
 use constant PICTUREPATHREL   => "../temp/prevImgs/";                #path for images on webserver relative to tools/
 use constant DUMPPATH         => "/tmp/MAPS_PREV/";                  #path for small hld dumps
+use constant SHAREPATH        => JTAGROOTPATH."share/";             #path for icons and misc stuff
 
 use constant SETUPFILE        => SETUPDIR."testsetup.xml";
 

diff --git a/share/error.png b/share/error.png
new file mode 100644 (file)
index 0000000..6361129
Binary files /dev/null and b/share/error.png differ

diff --git a/share/hourglass.png b/share/hourglass.png
new file mode 100644 (file)
index 0000000..a023581
Binary files /dev/null and b/share/hourglass.png differ

diff --git a/tools/run.pl b/tools/run.pl
index c4887a828e0f0b15f171b0698d82f86b2170ef76..145b511a34721e588da7d91fefc477028052230e 100755 (executable)
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -61,6 +61,7 @@ my $dummy;
 $dummy=qx"./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath 2>&1"; #14
 $dummy.=qx"rm $dumpPath/temp.hld 2>&1";
 $dummy.=qx"mv $dumpPath/te1* $dumpPath/temp.hld 2>&1";
+$dummy.=qx"rm $picPath/*.png 2>&1"; # delete old pictures
 $dummy.=qx"./preview/unpack_hld.pl -f $dumpPath/temp.hld -p $picPath 2>&1";
 my $escapedDummy = escapeHTML($dummy);
 $escapedDummy =~ s/\n/<br>/g;

diff --git a/tools/testgui.js b/tools/testgui.js
index ea2da805668e9a46112e2a4c024f1f06ec8b7ddd..01b6ca9cf8c5c5571dee94dcb13efa0704917ab6 100644 (file)
--- a/tools/testgui.js
+++ b/tools/testgui.js
@@ -1,6 +1,4 @@
 
-// var sensorIdHash = new Object();
- 
 
 
 
@@ -16,36 +14,20 @@ function reloadQuickEditArea(configFile,destId) {
   
   
 function run(time) {
-//   sensorIdHash["hugo"]="hugo";
-//   sensorIdHash["hugo2"]="hugonaut";
 
   
   for( var sensorId in previewAreaIdHash){
-//     alert(laufid+" => "+previewAreaIdHash[laufid]);
     var sensorId_ = encodeURIComponent(sensorId);
-    getdata("testgui.pl?action=showPlot&sensorId=",previewAreaIdHash[sensorId],true);
+    getdata("testgui.pl?action=showPlot&sensorId="+sensorId_+"&busy=true",previewAreaIdHash[sensorId],true);
   }
   
   var time_= encodeURIComponent(time);
   getdata("run.pl?runtime="+time_,"theConsole",false);
   
   for( var sensorId in previewAreaIdHash){
-//     alert(laufid+" => "+previewAreaIdHash[laufid]);
     var sensorId_ = encodeURIComponent(sensorId);
     getdata("testgui.pl?action=showPlot&sensorId="+sensorId_,previewAreaIdHash[sensorId],true);
   }
 }
 
 
-
-// function toggleVis(elementId) {
-// if(document.getElementById(elementId)){
-// if( document.getElementById(elementId).style.visibility == "visible") {
-//   document.getElementById(elementId).style.visibility = "collapse";
-// } else {
-//   document.getElementById(elementId).style.visibility = "visible" ;
-// }
-// }
-// }
-
-

diff --git a/tools/testgui.pl b/tools/testgui.pl
index 38d0004f3b5772f0a4f9fb57bdbba2dbebaadf1d..025b58548d9a031f9027c7c5ecc379267d84090c 100755 (executable)
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -61,19 +61,26 @@ unless($q->param()) {
   print header;
   #process the arguments
   
+  # CGI says I have to print the quick Edit Area
   if ($q->param('action') eq "print_quickEditArea") {
     my $configFileName = $q->param('configFile');
     my $destId = $q->param('destId');
     $quickEditAreaId = $destId;
     print_quickEditArea($configFileName);
+  # CGI says I have to show plots
   } elsif ($q->param('action') eq "showPlot") {
     
     my $sensorId = $q->param('sensorId');
-    my $imgSrc = $picPath.'/image_recalibrated_'.$sensorId.'.png';
-    if (-e $imgSrc) {
-      print img{src=>$imgSrc."?".rand(),title=>$sensorId};
+    
+    if ($q->param('busy') ne "false" ) {
+      print img{src=>"../share/hourglass.png",title=>$sensorId};
     } else {
-      print img{src=>"./preview/error.jpg",title=>$sensorId};
+      my $imgSrc = $picPath.'/image_recalibrated_'.$sensorId.'.png';
+      if (-e $imgSrc) {
+        print img{src=>$imgSrc."?".rand(),title=>$sensorId};
+      } else {
+        print img{src=>"../share/error.png",title=>$sensorId};
+      }
     }
   } else {
   
@@ -249,12 +256,7 @@ sub print_sensorArea {
   $sensorAreaId = $sensorId;
   print "<div class='sensorAreaDiv' id='".$sensorAreaId."'>";
   print "<table class='sensorAreaTable'>";
-#   print "<tr>";
-#   print "<td colspan=2 align='center' class='td_solid'>";
-# #   print "<table><tr><td>$sensorName (id=$sensorId)</td></tr>";
-# #   print "<tr><td>description: $sensorDescription</td></tr></table>";
-#   print "</td>";
-#   print "</tr>";V
+
   print "<tr>";
   my $previewAreaId = "preview_".$sensorId;
   print "<td class='previewArea'>";
@@ -267,12 +269,7 @@ sub print_sensorArea {
   print_quickEditArea($sensorConfig);
   print "</td>";
   print "</tr>";
-#   print "<tr>";
-#   print "<td colspan=2 align='right'>";
-#   my $command = "./prevImg.pl";
-#   print q%<input type='button' onClick='getdata("%.$command.q%","%.$previewAreaId.q%","true")' value='run'>%;
-#   print "</td>";
-#   print "</tr>";
+
   print "</table>";
   print "</div>";
   
@@ -288,17 +285,6 @@ sub print_quickEditArea {
 
 
   
-#   print "<table>";
-#   my @fields = $quickEditMaskTree->findnodes("/MAPS/register/field");
-#   for my $field (@fields) {
-#     print "<tr><td>";
-#     print $field->findvalue("./\@name");
-#     print "</td></tr>";
-#     
-#   
-#   }
-#   print "</table>";
-#   print "print_registers();",br;
   parseConfigAndSpec($argumentConfigFile);
   integrateAncestry();
   print "<div class='header'>quick editor</div>";
@@ -311,203 +297,6 @@ sub print_quickEditArea {
 
 
 
-# 
-# sub print_registers {
-# 
-#   my $configFile = getConfigFile();
-#   my $specFile = getSpecFile();
-#   my $configFileName = getConfigFileName();
-#   my $specFileName = getSpecFileName();
-#   my $configTree = getConfigTree();
-#   my $specTree = getSpecTree();
-#   
-#   my $xmlfile = $_[0];
-#   my $xmltree;
-# #   if ( $xmlfile eq $configFile ) {
-# #     $xmltree = $configTree;
-# #   }
-# #   elsif ( $xmlfile eq $specFile ) {
-# #     $xmltree = $specTree;
-# #   }
-# #   else {
-# #     die "xmlfile given to sub print_registers is unknown";
-# #   }
-#   my @registers = sort by_name $quickEditMaskTree->findnodes("/MAPS/register");
-#   print "<table class=\"registers\"";
-#   if ( $xmlfile eq $configFile ) {
-#     print "id='configFileRegisters'";
-#   }
-#   print ">";
-#   for my $register (@registers) {
-# 
-#     my $registerName  = $register->findvalue("./\@name");
-#     my $registerId    = $register->findvalue("./\@id");
-#     my $registerSize  = $register->findvalue("./\@size");
-#     my $registerDescr = prepare_text(
-#       $specTree->findvalue(
-#         "/MAPS/register[\@name='" . $registerName . "']/description"
-#         )
-#         || "n/a"
-#     );
-# 
-#     my $flistid = $configFile . "//" . $registerName;
-# 
-#     print "<tr>";
-# 
-#     print <<EOF;
-# <td onClick='toggleVis("$flistid",this)' class='regheader'>&nbsp;+&nbsp;</td>
-# EOF
-#     print "<td title=\"$registerDescr\">$registerName</td>";
-# 
-#     #print "<td>$registerId</td>";
-# 
-# #     if ( $xmlfile eq $configFile ) {  # we are printing the Specifications Tree
-# #       print <<EOF;
-# # <td class='button_move' onclick='deleteSettings("$configFileName","$registerName","");reloadQuickEditArea("$configFileName","$quickEditAreaId")'>&nbsp;X&nbsp;</td>
-# # EOF
-# #     }
-# 
-# 
-#     print "</tr>";
-# 
-#     #print "<tr>";
-# 
-#     print '<tr id="' . $flistid . '" class="bitfield">';
-#     print '<td></td>';
-#     print '<td  class="fieldcontainer">';
-#     print_fields( $configFile, $register );
-#     print "<td>";
-#     print "</tr>";
-#   }
-#   print "</table>";
-# }
-# 
-# sub print_fields {
-# 
-#   my $configFile = getConfigFile();
-#   my $specFile = getSpecFile();
-#   my $configFileName = getConfigFileName();
-#   my $specFileName = getSpecFileName();
-#   my $configTree = getConfigTree();
-#   my $specTree = getSpecTree();
-# 
-#   my $register     = $_[1];
-#   my $xmlfile      = $_[0];
-#   my $registerName = $register->findvalue("./\@name");
-#   
-#   my @maskFields       = sort by_name $register->findnodes("./field");
-#   print "<table class=\"fields\">";
-#   for my $maskField (@maskFields) {
-#   
-#     my $fieldName      = $maskField->findvalue("./\@name");    
-#     
-#     my $field = $configTree->findnodes("/MAPS/register[\@name='".
-#     $registerName."']/field[\@name='".$fieldName."']")->shift();
-# 
-#     
-#     unless(defined($field)){
-# 
-#       my $specField = $specTree->findnodes("/MAPS/register[\@name='".
-#       $registerName."']/field[\@name='".$fieldName."']")->shift();
-#       $field=$register->addNewChild("","field");
-#       $field->setAttribute("name",$fieldName);
-#       $field->setAttribute("value",$specField->findvalue("./\@defaultValue"));
-#       $field->setAttribute( "isHeritageFrom", $specFileName );
-#     }
-#   
-# 
-#     
-#     
-# 
-#     my $isHeritageFrom = $field->findvalue("./\@isHeritageFrom") || "";
-# #     my $isHeritageFrom = "";
-#     my $readOnlyFlag   = 0;
-#     my $fieldValue     = $field->findvalue("./\@value");
-#     my $fieldSize      =
-#       $specTree->findvalue( "/MAPS/register[\@name='"
-#         . $registerName
-#         . "']/field[\@name='"
-#         . $fieldName
-#         . "']/\@size" )
-#       || "n/a";
-#     my $fieldDescr = prepare_text(
-#       $specTree->findvalue(
-#             "/MAPS/register[\@name='"
-#           . $registerName
-#           . "']/field[\@name='"
-#           . $fieldName
-#           . "']/description"
-#         )
-#         || "n/a"
-#     );
-# 
-#     my $maxFieldVal = 2**$fieldSize;
-#     my $sizeInfo    =
-#       sprintf(
-#       "Field contains %d bits, possible values: 0-%d (0x0-0x%x)\n\n",
-#       $fieldSize, $maxFieldVal, $maxFieldVal );
-# 
-#     $fieldDescr = $sizeInfo . $fieldDescr;
-# 
-#     unless ( $isHeritageFrom eq "" ) {
-#       $fieldDescr =
-#         "Field was inherited from $isHeritageFrom\n\n" . $fieldDescr;
-#     }
-# 
-#     my $fieldId = $xmlfile . "//" . $registerName . "/" . $fieldName;
-#     if ( $fieldValue eq "" ) {
-#       $fieldValue   = $field->findvalue("./\@defaultValue");
-#       $readOnlyFlag = 1;
-#     }
-# 
-#     print "<tr class='fileLevel" . getFileLevel($isHeritageFrom) . "'>";
-#     print "<td width=120 title=\"$fieldDescr\"";
-#     print ">$fieldName</td>";
-#     print "<td> &nbsp;=&nbsp;</td>";
-#     if ($readOnlyFlag) {
-#       print <<EOF;
-#     <td width=120  align='right'>$fieldValue</td>
-# EOF
-#     }
-#     else {
-#       print <<EOF;
-# <td align='right'>
-# <input type='text' align='right' value='$fieldValue' onchange='saveSettings("$configFileName","$registerName","$fieldName",this.value);reloadQuickEditArea("$configFileName","$quickEditAreaId")'  >
-# </td>
-# EOF
-# 
-#     }
-# 
-#     print '</td>';
-# #     if ( $xmlfile eq $specFile ) { # we are printing the Specifications tree
-# #       print <<EOF;
-# # <td class='button_move' onclick='saveSettings("$configFileName","$registerName","$fieldName","$fieldValue");'>&nbsp;&rarr;&nbsp;</td>
-# # EOF
-# #     }
-#     if ( $xmlfile eq $configFile ) {    # we are printing the Settings Tree
-# 
-#       if ( $isHeritageFrom eq "" )
-#       {    # these are actual settings, not inherited!
-#         print <<EOF;
-# <td class='button_move' onclick='deleteSettings("$configFileName","$registerName","$fieldName");reloadQuickEditArea("$configFileName","$quickEditAreaId")'>&nbsp;X&nbsp;</td>
-# EOF
-#       }
-#       else {
-#         print "<td class='button_move_deac'>&nbsp;X&nbsp;</td>";
-#       }
-#     }
-#     print "</tr>";
-#     if (   ( any2dec($fieldValue) < 0 )
-#       or ( any2dec($fieldValue) > $maxFieldVal ) )
-#     {
-#       print
-# "<tr class='fieldError'><td colspan = 4 align='center'>!!!Above value not in allowed range!!!</td></tr>"
-#         ;    # just debug
-#     }
-#   }
-#   print "</table>";
-# 
-# }
 
 sub report_param {
   print br,br;