From: hadaq@gsi.de <hadaq@gsi.de>
Date: Mon, 28 Apr 2014 12:19:20 +0000 (+0200)
Subject: fixed rate with multi-views in xml gui
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b03397328ce7eb63d395e4eb1dfb74b99ccbd33f;p=daqtools.git

fixed rate with multi-views in xml gui
---

diff --git a/web/htdocs/scripts/xmlpage.js b/web/htdocs/scripts/xmlpage.js
index 11771f7..a28965d 100644
--- a/web/htdocs/scripts/xmlpage.js
+++ b/web/htdocs/scripts/xmlpage.js
@@ -54,11 +54,25 @@
     var opt = "";
     if(document.getElementById("rate").checked) opt += "rate";
     if(document.getElementById("cache").checked) opt += "cache";
-    var part = command.split('-');
-    command = part[0]+"-"+part[1]+"-"+part[2] + "-" + opt;
+    com = command.split('&');
+    command = "";
+    for(i = 0; i < com.length; i++) {
+      if (com[i] != "") { 
+         var part = com[i].split('-');
+         command += part[0]+"-"+part[1]+"-"+part[2] + "-" + opt + "&";
+         }
+      }
     refresh(period);
     }
     
+/*    command = "";
+    for(i = 0; i < part.length; i++) {
+      if (part[i] != "rate" && part[i] != "cache" && part[i] != "ratechache" && part[i] != "") {
+        command += part[i] + '-';
+        }
+      }
+    command += opt;*/    
+    
   function setaddress(e) {
     address=document.getElementById("address").value;
     var part = command.split('-');
diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 2644b11..7925951 100644
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -221,7 +221,7 @@
 
     <register name="DataRateCtr" address="001f" purpose="status" mode="r">
       <description>Data Counter being written to Event Buffer/wraparound counter</description>
-      <field name="DataRateCtr" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+      <field name="DataRateCtr" start="0" bits="32" format="unsigned" rate="1" />
     </register>
 
   </group>
@@ -373,7 +373,7 @@
 
     <register name="HitRateCtr" address="0016" purpose="status" mode="r">
       <description>Hit wraparound counter</description>
-      <field name="HitRateCtr" start="0" bits="32" format="unsigned" />
+      <field name="HitRateCtr" start="0" bits="32" format="unsigned" rate="1" />
     </register>
 
   </group>