Changeset 1447 for trunk/packages/vizservers/nanovis

Timestamp:

May 18, 2009, 11:44:11 AM (15 years ago)

Author:

gah

Message:

 

File:

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

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -144 +144 @@
         } else if ((c == 'u') && (strcmp(string, "units") == 0)) {
             _vUnits = strdup(Tcl_GetString(objv[i+1]));
-        } else if ((c == 'o') && (strcmp(string, "order") == 0)) {
+        } else if ((c == 'c') && (strcmp(string, "components") == 0)) {
+            int n;
+
+            if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (n <= 0) {
+                Tcl_AppendResult(interp, "bad extents value: must be > 0",
+                                 (char *)NULL);
+                return TCL_ERROR;
+            }
+            _nComponents = n;
+        } else if ((c == 'a') && (strcmp(string, "axisorder") == 0)) {
             Tcl_Obj **axes;
             int n;
@@ -337 +349 @@
         } else if ((c == 'u') && (strcmp(string, "units") == 0)) {
             _vUnits = strdup(Tcl_GetString(objv[i+1]));
-        } else if ((c == 'e') && (strcmp(string, "extents") == 0)) {
+        } else if ((c == 'c') && (strcmp(string, "components") == 0)) {
             int n;
 
@@ -379 +391 @@
     if (_nValues != (_xNum * _yNum * _nComponents)) {
         Tcl_AppendResult(interp, 
-                "wrong number of values: must be xnum*ynum*extents", 
+                "wrong number of values: must be xnum*ynum*components", 
                          (char *)NULL);
+        fprintf(stderr, "x=%d y=%d c=%d, nv=%d\n", 
+                _xNum, _yNum, _nComponents, _nValues);
         return TCL_ERROR;
     }
@@ -642 +656 @@
     }
 }
+
+bool 
+Rappture::Unirect3d::Convert(Rappture::Unirect2d *dataPtr)
+{
+    _initialized = false;
+
+    _xValueMin = dataPtr->xValueMin();
+    _yValueMin = dataPtr->yValueMin();
+    _zValueMin = 0.0;
+    _xMin = dataPtr->xMin();
+    _yMin = dataPtr->yMin();
+    _zMin = 0.0;
+    _xMax = dataPtr->xMax();
+    _yMax = dataPtr->yMax();
+    _zMax = 0.0;
+    _xNum = dataPtr->xNum();
+    _yNum = dataPtr->yNum();
+    _zNum = 1;
+    switch (dataPtr->nComponents()) {
+    case 1:
+    case 3:
+        if (_values != NULL) {
+            delete [] _values;
+        }
+        _values = new float[dataPtr->nValues()];
+        memcpy(_values, dataPtr->values(), dataPtr->nValues());
+        _nValues = dataPtr->nValues();
+        _nComponents = dataPtr->nComponents();
+        break;
+    case 2:
+        float *values;
+        _nValues = 3 * _xNum * _yNum * _zNum;
+        if (_values != NULL) {
+            delete [] _values;
+        }
+        _values = new float[_nValues];
+        if (_values == NULL) {
+            return false;
+        }
+        values = dataPtr->values();
+        size_t i, j;
+        for(j = i = 0; i < dataPtr->nValues(); i += 2, j+= 3) {
+            _values[j] = values[i];
+            _values[j+1] = values[i+1];
+            _values[j+2] = 0.0f;
+        }           
+        _nComponents = 3;
+        break;
+    }
+    return true;
+}