Changeset 3575 for trunk/packages/vizservers/nanovis/ReaderCommon.cpp

Timestamp:

Mar 25, 2013 1:25:35 PM (11 years ago)

Author:

ldelgass

Message:

Fix typo, also clamp data outside given range in normalizeScalar

File:

• trunk/packages/vizservers/nanovis/ReaderCommon.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/ReaderCommon.cpp

@@ -30 +30 @@
 }
 
+/**
+ * \brief Normalize data to [0,1] based on vmin,vmax range
+ * 
+ * Data outside of given range is clamped, and NaNs are set to
+ * -1 in the output
+ *
+ * \param data Float array of unnormalized data, will be normalized on return
+ * \param count Number of elts in array
+ * \param stride Stride between values in data array
+ * \param vmin Minimum value in data array
+ * \param vmax Maximum value in data array
+ */
 void
 normalizeScalar(float *data, int count, int stride, double vmin, double vmax)
@@ -39 +51 @@
         if (isnan(v)) {
             data[i] = -1.0f;
-        } else if (data[i] >= min) {
+        } else if (v < vmin) {
+            data[i] = 0.0f;
+        } else if (v > vmax) {
+            data[i] = 1.0f;
+        } else {
             data[i] = (float)((v - vmin)/ dv);
         }