Changeset 1453 for trunk/packages/vizservers/nanovis/Unirect.cpp

Timestamp:

May 19, 2009 10:31:04 AM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/packages/vizservers/nanovis/Unirect.cpp (modified) (5 diffs)

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -55 +55 @@
     /* Default order is  z, y, x. */
     int axis1, axis2, axis3;
-    axis1 = 2;                  /* Z-axis */
+    axis1 = 0;                  /* X-axis */
     axis2 = 1;                  /* Y-axis */
-    axis3 = 0;                  /* X-axis */
+    axis3 = 2;                  /* Z-axis */
 
     values = NULL;
@@ -186 +186 @@
                 "wrong number of values: must be xnum*ynum*znum*extents", 
                          (char *)NULL);
-        return TCL_ERROR;
+       return TCL_ERROR;
     }
     
-    if ((axis1 != 2) || (axis2 != 1) || (axis3 != 0)) {
+#ifdef notdef
+    if ((axis1 != 0) || (axis2 != 1) || (axis3 != 2)) {
         // Reorder the data into x, y, z where x varies fastest and so on.
         int z;
@@ -216 +217 @@
         values = data;
     }
-
+#endif
     _values = values;
     _nValues = nValues;
@@ -241 +242 @@
     }
     _initialized = true;
+    { 
+        FILE *f;
+        f = fopen("/tmp/unirect3d.txt", "w");
+        fprintf(f, "unirect3d xmin %g xmax %g xnum %d ", _xMin, _xMax, _xNum);
+        fprintf(f, "ymin %g ymax %g ynum %d ", _yMin, _yMax, _yNum);
+        fprintf(f, "zmin %g zmax %g znum %d ", _zMin, _zMax, _zNum);
+        fprintf(f, "components %d values {\n",  _nComponents);
+        for (size_t i = 0; i < _nValues; i+= 3) {
+            fprintf(f, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
+        }
+        fprintf(f, "}\n");
+        fclose(f);
+    }
     return TCL_OK;
 }
@@ -554 +568 @@
     _nValues *= _nComponents;
     _initialized = true;
-    fprintf(stderr, "xMin %g xMax %g xNum %d\n", _xMin, _xMax, _xNum);
-    fprintf(stderr, "yMin %g yMay %g yNum %d\n", _yMin, _yMax, _yNum);
-    fprintf(stderr, "zMin %g zMaz %g zNum %d\n", _zMin, _zMax, _zNum);
-    fprintf(stderr, "nValues %d components %d values {\n", 
-            _nValues, _nComponents);
-    for (size_t i = 0; i < _nValues; i+= 3) {
-        fprintf(stderr, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
-    }
-    fprintf(stderr, "}\n");
+#ifdef notdef
+    { 
+        FILE *f;
+        f = fopen("/tmp/dx.txt", "w");
+        fprintf(f, "unirect3d xmin %g xmax %g xnum %d ", _xMin, _xMax, _xNum);
+        fprintf(f, "ymin %g ymax %g ynum %d ", _yMin, _yMax, _yNum);
+        fprintf(f, "zmin %g zmax %g znum %d ", _zMin, _zMax, _zNum);
+        fprintf(f, "components %d values {\n",  _nComponents);
+        for (size_t i = 0; i < _nValues; i+= 3) {
+            fprintf(f, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
+        }
+        fprintf(f, "}\n");
+        fclose(f);
+    }
+#endif
     return true;
 }