Changeset 961 for trunk

Timestamp:

Mar 24, 2008, 1:04:03 PM (17 years ago)

Author:

gah

Message:

added type checking to dx objects

Location:

trunk/vizservers/nanovis

Files:

• RpDX.cpp (modified) (7 diffs)
• dxReader.cpp (modified) (5 diffs)
• dxReader2.cpp (modified) (1 diff)

trunk/vizservers/nanovis/RpDX.cpp

@@ -18 +18 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <float.h>
 
 using namespace Rappture;
 
 DX::DX(const char* filename) :
-    _dataMin(1e21),
-    _dataMax(1e-21),
-    _nzero_min(1e21),
+    _dataMin(FLT_MAX),
+    _dataMax(-FLT_MAX),
+    _nzero_min(FLT_MAX),
     _numAxis(0),
     _axisLen(NULL),
@@ -65 +66 @@
 
     fprintf(stdout, "_n = %d\n",_n);
+    if (type != 7) {
+        fprintf(stderr, "WARNING: positions is not type float (type=%d)\n"
+                type);
+        fflush(stderr);
+    }
     fprintf(stdout, "_rank = %d\n",_rank);
     fprintf(stdout, "_shape = %d\n",_shape);
@@ -138 +144 @@
 
     // grab the data array from the dx object and store it in _data
-    float *data = NULL;
     dxdata = (Array) DXGetComponentValue((Field) _dxobj, (char *)"data");
-    data = (float*) DXGetArrayData(dxdata);
+    DXGetArrayInfo(dxdata, NULL, &type, NULL, NULL, NULL);
     _data = new float[_n];
     if (_data == NULL) {
@@ -147 +152 @@
         fflush(stdout);
     }
-    memcpy(_data,data,sizeof(float)*_n);
+
+    switch (type) {
+    case TYPE_FLOAT:
+        float *float_data;
+
+        float_data = (float*) DXGetArrayData(dxdata);
+        memcpy(_data, float_data, sizeof(float)*_n);
+        break;
+    case TYPE_DOUBLE:
+        double *double_data;
+        double_data = (double*) DXGetArrayData(dxdata);
+        for (i = 0; i < _n; i++) {
+            fprintf(stderr, "data[%d]=%g\n", i, double_data[i]);
+            _data[i] = double_data[i];
+        }
+    default:
+        fprintf(stdout, "don't know how to handle data of type %d\n", type);
+        fflush(stdout);
+    }
 
     // print debug info
-    for (int lcv = 0, pt = 0; lcv < _n; lcv+=3,pt+=9) {
+    for (int lcv = 0, pt = 0; lcv < _n; lcv +=3, pt+=9) {
         fprintf(stdout,
             "(%f,%f,%f)|->% 8e\n(%f,%f,%f)|->% 8e\n(%f,%f,%f)|->% 8e\n",
@@ -158 +181 @@
         fflush(stdout);
     }
-
     __collectDataStats();
-
 }
 
@@ -195 +216 @@
 DX::__collectDataStats()
 {
-    _dataMin = 1e21;
-    _dataMax = 1e-21;
-    _nzero_min = 1e21;
+    _dataMin = FLT_MAX;
+    _dataMax = -FLT_MAX;
+    _nzero_min = FLT_MAX;
 
     // populate _dataMin, _dataMax, _nzero_min
-    for (int lcv = 0; lcv < _n; lcv=lcv+3) {
+    for (int lcv = 0; lcv < _n; lcv++) {
         if (_data[lcv] < _dataMin) {
             _dataMin = _data[lcv];
@@ -207 +228 @@
             _dataMax = _data[lcv];
         }
-        if ((_data[lcv] != 0) && (_data[lcv] < _nzero_min)) {
+        if ((_data[lcv] > 0.0f) && (_data[lcv] < _nzero_min)) {
             _nzero_min = _data[lcv];
         }
+    }
+    if (_nzero_min == FLT_MAX) {
+        fprintf(stderr, "could not find a positive minimum value\n");
+        fflush(stderr);
     }
 }

trunk/vizservers/nanovis/dxReader.cpp

@@ -199 +199 @@
         volPtr->yAxis.SetRange(y0, y0 + (ny * dy));
         volPtr->zAxis.SetRange(z0, z0 + (nz * dz));
-        volPtr->wAxis.SetRange(y0, y0 + (ny * dy));
+        volPtr->wAxis.SetRange(vmin, vmax);
         volPtr->update_pending = true;
         delete [] data;
@@ -416 +416 @@
             volPtr->yAxis.SetRange(y0, y0 + (ny * dy));
             volPtr->zAxis.SetRange(z0, z0 + (nz * dz)); 
-            volPtr->wAxis.SetRange(z0, z0 + (nz * dz));
+            volPtr->wAxis.SetRange(vmin, vmax);
             volPtr->update_pending = true;
             delete [] data;
@@ -560 +560 @@
             volPtr->zAxis.SetRange(field.rangeMin(Rappture::zaxis),
                    field.rangeMax(Rappture::zaxis));
-            volPtr->wAxis.SetRange(field.rangeMin(Rappture::zaxis),
-                   field.rangeMax(Rappture::zaxis));
+            volPtr->wAxis.SetRange(field.valueMin(), field.valueMax());
             volPtr->update_pending = true;
             delete [] data;
@@ -801 +800 @@
             volPtr->zAxis.SetRange(field.rangeMin(Rappture::zaxis),
                    field.rangeMax(Rappture::zaxis));
-            volPtr->wAxis.SetRange(field.rangeMin(Rappture::zaxis),
-                   field.rangeMax(Rappture::zaxis));
+            volPtr->wAxis.SetRange(field.valueMin(), field.valueMax());
             volPtr->update_pending = true;
             // TBD..
@@ -950 +948 @@
             volPtr->zAxis.SetRange(field.rangeMin(Rappture::zaxis),
                    field.rangeMax(Rappture::zaxis));
-            volPtr->wAxis.SetRange(field.rangeMin(Rappture::zaxis),
-                   field.rangeMax(Rappture::zaxis));
+            volPtr->wAxis.SetRange(field.valueMin(), field.valueMax());
             volPtr->update_pending = true;
             // TBD..

trunk/vizservers/nanovis/dxReader2.cpp

@@ -95 +95 @@
     volPtr->yAxis.SetRange(origin[1], max[1]);
     volPtr->zAxis.SetRange(origin[2], max[2]);
-    volPtr->wAxis.SetRange(origin[2], max[2]);
+    volPtr->wAxis.SetRange(dxObj.dataMin(), dxObj.dataMax());
     volPtr->update_pending = true;
 
-    delete [] data;
+    delete [] data; 
 
     //