Changeset 14138

Timestamp:

06/09/12 21:54:08 (13 years ago)

Author:

tbretz

Message:

Changed the seperator for rows from \0 to \x7f. In this way we can just scale the data by 126 and do not need to add or subtract 1.

Location:

trunk/FACT++

Files:

• src/smartfact.cc (modified) (3 diffs)
• www/smartfact/index.js (modified) (3 diffs)

trunk/FACT++/src/smartfact.cc

@@ -540 +540 @@
         out << stat.min << '\n';
         out << stat.med << '\n';
-        out << stat.max << '\0';
+        out << stat.max << '\x7f';
         for (auto it=vec.begin(); it!=vec.end(); it++)
         {
@@ -548 +548 @@
             for (uint64_t i=0; i<it->size(); i++)
             {
-                float range = nearbyint(126*(double(it->at(i))-offset)/scale)+1; // [-2V; 2V]
-                if (range>127)
-                    range=127;
-                if (range<1)
-                    range=1;
+                float range = nearbyint(126*(double(it->at(i))-offset)/scale); // [-2V; 2V]
+                if (range>126)
+                    range=126;
+                if (range<0)
+                    range=0;
                 val[i] = (uint8_t)range;
             }
@@ -558 +558 @@
             const char *ptr = reinterpret_cast<char*>(val.data());
             out.write(ptr, val.size()*sizeof(uint8_t));
-            out << '\0';
+            out << '\x7f';
         }
 

trunk/FACT++/www/smartfact/index.js

@@ -1119 +1119 @@
         return HLStoRGB(0);
 
-    var hue = (col-1)/127;
+    var hue = col/126;
     return HLStoRGB(hue);
 }
@@ -1367 +1367 @@
 
         ctx.beginPath();
-        ctx.moveTo(ml, ch-mb-(data[j].charCodeAt(0)-1)/126*h);
+        ctx.moveTo(ml, ch-mb-data[j].charCodeAt(0)/126*h);
         for (var i=1; i<data[j].length; i++)
-            ctx.lineTo(ml+w/(data[j].length-1)*i, ch-mb-(data[j].charCodeAt(i)-1)/126*h);
+            ctx.lineTo(ml+w/(data[j].length-1)*i, ch-mb-data[j].charCodeAt(i)/126*h);
 
         // --- finalize data ---
@@ -1523 +1523 @@
     ctx.clearRect(0, 0, canv.width, canv.height);
 
-    var data = result.split('\0');
+    var data = result.split('\x7f');
     if (data.length<2)
         return;