status quo, changed js stuff to be accessible in a more general way, still testgui...

diff --git a/layout/testgui.css b/layout/testgui.css
index 5f40b92f5f98f48d91bfddb4d08f9357577d8c6d..79f132ac18066a44158fd208076e9a0cc27d8db1 100644 (file)
--- a/layout/testgui.css
+++ b/layout/testgui.css
@@ -183,7 +183,7 @@ table.fields td.button_move_deac {
 
 .bitfield {
   background:#dea;
-  visibility:collapse;
+/*   visibility:collapse; */
 }
 
 table.registers td.fieldcontainer {

diff --git a/tools/testgui.js b/tools/testgui.js
index fd610dda18c8a2d1631019906c27c230f6716a28..4d394ffa6ad4d65705e599b3b7bc099ef5244f0c 100644 (file)
--- a/tools/testgui.js
+++ b/tools/testgui.js
@@ -23,5 +23,10 @@ function getdata(command,dId,async) {
   
   
   
+function reloadQuickEditArea(configFile,destId) {
   
+  var configFile_ = encodeURIComponent(configFile);
+  getdata("testgui.pl?action=print_quickEditArea&configFile="+configFile_,destId,"false");
+  
+}
   
\ No newline at end of file

diff --git a/tools/testgui.pl b/tools/testgui.pl
index ec87f9efce3fda62f151f380d22c7d4427356c28..0f5494b66323ddb61d4700ae98443d75e9827a9b 100755 (executable)
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -54,6 +54,8 @@ unless($q->param()) {
   -src => './testgui.js'}
   );
   #process the arguments
+  
+  
   report_param();
   
 }
@@ -97,8 +99,10 @@ print start_html(
 -style=>[{'src'=>'../layout/styles.css'},
 {'src'=>'../layout/testgui.css'}
 ],
--script=>{ -type => 'text/javascript',
--src => './testgui.js'}
+-script=>[
+{ -type => 'text/javascript', -src => './testgui.js'},
+{ -type => 'text/javascript', -src => './xmlOperations.js'}
+]
 );
 
 print h2("testgui");
@@ -269,6 +273,206 @@ 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 $xmltree->findnodes("/MAPS/register");
+#   print "<table class=\"registers\"";
+#   if ( $xmlfile eq $configFile ) {
+#     print "id='configFileRegisters'";
+#   }
+#   print ">";
+#   
+#   for my $register (@registers) {
+#   
+# 
+#     my $registerName  = $register->findvalue("./\@name");
+#     
+#     # if register not in the mask file, don't print!
+#     unless( $quickEditMaskTree->findnodes("/MAPS/register[\@name='".
+#     $registerName."']")) {
+#       next;
+#     }
+#     
+#     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 = $xmlfile . "//" . $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("$registerName","");'>&nbsp;X&nbsp;</td>
+# EOF
+#     }
+#     if ( $xmlfile eq $specFile ) {    # we are printing the Settings Tree
+# 
+#       print <<EOF;
+# <td class='button_move' onclick='copyDefaultRegister("$registerName");'>&nbsp;&rarr;&nbsp;</td>
+# EOF
+#     }
+# 
+#     print "</tr>";
+# 
+#     #print "<tr>";
+# 
+#     print '<tr id="' . $flistid . '" background=dea>';
+#     print '<td></td>';
+#     print '<td  class="fieldcontainer">';
+#     print_fields( $xmlfile, $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 @fields       = sort by_name $register->findnodes("./field");
+#   print "<table class=\"fields\">";
+#   for my $field (@fields) {
+#   
+#     my $fieldName      = $field->findvalue("./\@name");
+#     
+#     # if field not in the mask file, don't print!
+#     unless( $quickEditMaskTree->findnodes("/MAPS/register[\@name='".
+#     $registerName."']/field[\@name='".$fieldName."']")) {
+#       next;
+#     }
+#     
+#     my $isHeritageFrom = $field->findvalue("./\@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("$registerName","$fieldName",this.value)'  >
+# </td>
+# EOF
+# 
+#     }
+# 
+#     print '</td>';
+#     if ( $xmlfile eq $specFile ) { # we are printing the Specifications tree
+#       print <<EOF;
+# <td class='button_move' onclick='saveSettings("$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("$registerName","$fieldName");'>&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 print_registers {
 
   my $configFile = getConfigFile();
@@ -289,20 +493,17 @@ sub print_registers {
   else {
     die "xmlfile given to sub print_registers is unknown";
   }
-  
   my @registers = sort by_name $xmltree->findnodes("/MAPS/register");
   print "<table class=\"registers\"";
   if ( $xmlfile eq $configFile ) {
     print "id='configFileRegisters'";
   }
   print ">";
-  
   for my $register (@registers) {
-  
 
     my $registerName  = $register->findvalue("./\@name");
     
-    # if register not in the mask file, don't print!
+     # if register not in the mask file, don't print!
     unless( $quickEditMaskTree->findnodes("/MAPS/register[\@name='".
     $registerName."']")) {
       next;
@@ -330,13 +531,13 @@ EOF
 
     if ( $xmlfile eq $configFile ) {  # we are printing the Specifications Tree
       print <<EOF;
-<td class='button_move' onclick='deleteSettings("$registerName","");'>&nbsp;X&nbsp;</td>
+<td class='button_move' onclick='deleteSettings(selectedConfigFile(),"$registerName","");reloadSetTree()'>&nbsp;X&nbsp;</td>
 EOF
     }
     if ( $xmlfile eq $specFile ) {    # we are printing the Settings Tree
 
       print <<EOF;
-<td class='button_move' onclick='copyDefaultRegister("$registerName");'>&nbsp;&rarr;&nbsp;</td>
+<td class='button_move' onclick='copyDefaultRegister(selectedConfigFile(),"$registerName");reloadSetTree()'>&nbsp;&rarr;&nbsp;</td>
 EOF
     }
 
@@ -344,7 +545,7 @@ EOF
 
     #print "<tr>";
 
-    print '<tr id="' . $flistid . '" background=dea>';
+    print '<tr id="' . $flistid . '" class="bitfield">';
     print '<td></td>';
     print '<td  class="fieldcontainer">';
     print_fields( $xmlfile, $register );
@@ -354,7 +555,6 @@ EOF
   print "</table>";
 }
 
-
 sub print_fields {
 
   my $configFile = getConfigFile();
@@ -370,15 +570,13 @@ sub print_fields {
   my @fields       = sort by_name $register->findnodes("./field");
   print "<table class=\"fields\">";
   for my $field (@fields) {
-  
-    my $fieldName      = $field->findvalue("./\@name");
-    
-    # if field not in the mask file, don't print!
+    my $fieldName      = $field->findvalue("./\@name"); 
+      # if field not in the mask file, don't print!
     unless( $quickEditMaskTree->findnodes("/MAPS/register[\@name='".
     $registerName."']/field[\@name='".$fieldName."']")) {
       next;
     }
-    
+
     my $isHeritageFrom = $field->findvalue("./\@isHeritageFrom") || "";
     my $readOnlyFlag   = 0;
     my $fieldValue     = $field->findvalue("./\@value");
@@ -431,7 +629,7 @@ EOF
     else {
       print <<EOF;
 <td align='right'>
-<input type='text' align='right' value='$fieldValue' onchange='saveSettings("$registerName","$fieldName",this.value)'  >
+<input type='text' align='right' value='$fieldValue' onchange='saveSettings(selectedConfigFile(),"$registerName","$fieldName",this.value);reloadSetTree()'  >
 </td>
 EOF
 
@@ -440,7 +638,7 @@ EOF
     print '</td>';
     if ( $xmlfile eq $specFile ) { # we are printing the Specifications tree
       print <<EOF;
-<td class='button_move' onclick='saveSettings("$registerName","$fieldName","$fieldValue");'>&nbsp;&rarr;&nbsp;</td>
+<td class='button_move' onclick='saveSettings(selectedConfigFile(),"$registerName","$fieldName","$fieldValue");'>&nbsp;&rarr;&nbsp;</td>
 EOF
     }
     if ( $xmlfile eq $configFile ) {    # we are printing the Settings Tree
@@ -448,7 +646,7 @@ EOF
       if ( $isHeritageFrom eq "" )
       {    # these are actual settings, not inherited!
         print <<EOF;
-<td class='button_move' onclick='deleteSettings("$registerName","$fieldName");'>&nbsp;X&nbsp;</td>
+<td class='button_move' onclick='deleteSettings(selectedConfigFile(),"$registerName","$fieldName");reloadSetTree()'>&nbsp;X&nbsp;</td>
 EOF
       }
       else {
@@ -467,4 +665,3 @@ EOF
   print "</table>";
 
 }
-