From: Michael Wiebusch <stratomaster@gmx.net>
Date: Thu, 1 Aug 2013 13:38:46 +0000 (+0200)
Subject: quickEdit seems to work partially
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=2a6f797c35a5fa6f2e7f3cefe9710846424c22ec;p=mvdsensorcontrol.git

quickEdit seems to work partially
---

diff --git a/tools/jtageditor.pl b/tools/jtageditor.pl
index fb0fe16..3b26c59 100755
--- a/tools/jtageditor.pl
+++ b/tools/jtageditor.pl
@@ -3,6 +3,8 @@ print "Content-type: text/html\n\n";
 
 # TODO
 
+# substitute selectedConfigFile() with "$configFileName" inside print_registers and print_fieldsi
+# outsource print_registers and print_fields to xmlOperations
 
 # make jtageditor callable with config file name as CGI
 # argument, so editor opens specified config file
diff --git a/tools/prevImg.pl b/tools/prevImg.pl
index e943e67..92f676f 100755
--- a/tools/prevImg.pl
+++ b/tools/prevImg.pl
@@ -50,6 +50,6 @@ system("./unpack_hld.pl -f ./temp.hld");
 print br;
 print img{src=>'./preview/image_recalibrated_ccc1.png'};
 print br;
-print "finished",br;
+print "finishedd",br;
 print end_html;
 
diff --git a/tools/testgui.js b/tools/testgui.js
index 4d394ff..9e700ba 100644
--- a/tools/testgui.js
+++ b/tools/testgui.js
@@ -26,7 +26,8 @@ function getdata(command,dId,async) {
 function reloadQuickEditArea(configFile,destId) {
   
   var configFile_ = encodeURIComponent(configFile);
-  getdata("testgui.pl?action=print_quickEditArea&configFile="+configFile_,destId,"false");
+  var destId_ = encodeURIComponent(destId);
+  getdata("testgui.pl?action=print_quickEditArea&configFile="+configFile_+"&destId="+destId_,destId,"false");
   
 }
   
\ No newline at end of file
diff --git a/tools/testgui.pl b/tools/testgui.pl
index 3d1a32c..16ee6ba 100755
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -34,6 +34,8 @@ my $quickEditMaskFile = $confDir."/".$quickEditMaskFileName;
 
 my $quickEditMaskTree;
 my $setupTree;
+my $sensorAreaId;
+my $quickEditAreaId;
 
 
 #######################
@@ -46,18 +48,27 @@ unless($q->param()) {
   #if called without arguments, 
   init_html();
 } else {
+#####################################
+######## process CGI request ########
+#####################################
   print header;
-  print start_html(
-  -title=>'testgui_debug',
-  -style=>{'src'=>'../layout/styles.css'},
-  -script=>{ -type => 'text/javascript',
-  -src => './testgui.js'}
-  );
   #process the arguments
   
+  if ($q->param('action') eq "print_quickEditArea") {
+    my $configFileName = $q->param('configFile');
+    my $destId = $q->param('destId');
+    $quickEditAreaId = $destId;
+    print_quickEditArea($configFileName);
+  } else {
   
+  print start_html(
+  -title=>'testgui_debug',
+  -style=>{'src'=>'../layout/styles.css'}
+  );
   report_param();
   
+  }
+  
 }
   
   
@@ -219,7 +230,7 @@ sub print_sensorArea {
   my $sensorPosition = $sensor->findnodes("./position")->shift();
   my $sensorDescription = $sensor->findvalue("./description");
   
-  my $sensorAreaId = $sensorId;
+  $sensorAreaId = $sensorId;
   print "<div class='sensorAreaDiv' id='".$sensorAreaId."'>";
   print "<table class='sensorAreaTable'>";
   print "<tr>";
@@ -227,7 +238,9 @@ sub print_sensorArea {
   print "</tr>";
   print "<tr>";
   my $previewFieldId = "preview".$sensorName;
-  print "<td id='".$previewFieldId."' >blah</td><td>";
+  print "<td id='".$previewFieldId."' >blah</td>";
+  $quickEditAreaId = "quickEdit".$sensorConfig;
+  print "<td id='".$quickEditAreaId."'>";
   print_quickEditArea($sensorConfig);
   print "</td>";
   print "</tr>";
@@ -333,13 +346,13 @@ EOF
 
     if ( $xmlfile eq $configFile ) {  # we are printing the Specifications Tree
       print <<EOF;
-<td class='button_move' onclick='deleteSettings(selectedConfigFile(),"$registerName","");reloadSetTree()'>&nbsp;X&nbsp;</td>
+<td class='button_move' onclick='deleteSettings("$configFileName","$registerName","");reloadQuickEditArea("$configFileName","$quickEditAreaId")'>&nbsp;X&nbsp;</td>
 EOF
     }
     if ( $xmlfile eq $specFile ) {    # we are printing the Settings Tree
 
       print <<EOF;
-<td class='button_move' onclick='copyDefaultRegister(selectedConfigFile(),"$registerName");reloadSetTree()'>&nbsp;&rarr;&nbsp;</td>
+<td class='button_move' onclick='copyDefaultRegister("$configFileName","$registerName");reloadQuickEditArea("$configFileName","$quickEditAreaId")'>&nbsp;&rarr;&nbsp;</td>
 EOF
     }
 
@@ -431,24 +444,24 @@ EOF
     else {
       print <<EOF;
 <td align='right'>
-<input type='text' align='right' value='$fieldValue' onchange='saveSettings(selectedConfigFile(),"$registerName","$fieldName",this.value);reloadSetTree()'  >
+<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(selectedConfigFile(),"$registerName","$fieldName","$fieldValue");'>&nbsp;&rarr;&nbsp;</td>
-EOF
-    }
+#     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(selectedConfigFile(),"$registerName","$fieldName");reloadSetTree()'>&nbsp;X&nbsp;</td>
+<td class='button_move' onclick='deleteSettings("$configFileName","$registerName","$fieldName");reloadQuickEditArea("$configFileName","$quickEditAreaId")'>&nbsp;X&nbsp;</td>
 EOF
       }
       else {