Changeset 3943 for trunk/packages

Timestamp:

Sep 21, 2013 5:44:40 PM (11 years ago)

Author:

ldelgass

Message:

Fix vector magnitude computation in nanovis VTK reader

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (1 diff)
• VtkDataSetReader.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -309 +309 @@
         return TCL_ERROR;
     }
-#if 0
-    TRACE("nx = %d ny = %d nz = %d",
-          unirect->xNum(), unirect->yNum(), unirect->zNum());
-    TRACE("x0 = %lg y0 = %lg z0 = %lg",
-          unirect->xMin(), unirect->yMin(), unirect->zMin());
-    TRACE("lx = %lg ly = %lg lz = %lg",
-          unirect->xMax() - unirect->xMin(),
-          unirect->yMax() - unirect->yMin(),
-          unirect->zMax() - unirect->zMin());
-    TRACE("dx = %lg dy = %lg dz = %lg",
-          unirect->xNum() > 1 ? (unirect->xMax() - unirect->xMin())/(unirect->xNum()-1) : 0,
-          unirect->yNum() > 1 ? (unirect->yMax() - unirect->yMin())/(unirect->yNum()-1) : 0,
-          unirect->zNum() > 1 ? (unirect->zMax() - unirect->zMin())/(unirect->zNum()-1) : 0);
-    TRACE("magMin = %lg magMax = %lg",
-          unirect->magMin(), unirect->magMax());
-#endif
     if (unirect != NULL) {
+        TRACE("nx = %d ny = %d nz = %d",
+              unirect->xNum(), unirect->yNum(), unirect->zNum());
+        TRACE("x0 = %lg y0 = %lg z0 = %lg",
+              unirect->xMin(), unirect->yMin(), unirect->zMin());
+        TRACE("lx = %lg ly = %lg lz = %lg",
+              unirect->xMax() - unirect->xMin(),
+              unirect->yMax() - unirect->yMin(),
+              unirect->zMax() - unirect->zMin());
+        TRACE("dx = %lg dy = %lg dz = %lg",
+              unirect->xNum() > 1 ? (unirect->xMax() - unirect->xMin())/(unirect->xNum()-1) : 0,
+              unirect->yNum() > 1 ? (unirect->yMax() - unirect->yMin())/(unirect->yNum()-1) : 0,
+              unirect->zNum() > 1 ? (unirect->zMax() - unirect->zMin())/(unirect->zNum()-1) : 0);
+        TRACE("magMin = %lg magMax = %lg",
+              unirect->magMin(), unirect->magMax());
+
         flow->data(unirect);
     } else {

trunk/packages/vizservers/nanovis/VtkDataSetReader.cpp

@@ -120 +120 @@
             vtkIdType idx = resampledDataSet->ComputePointId(loc);
             resampledDataSet->GetPointData()->GetVectors()->GetTuple(idx, vec);
-            val = sqrt(vec[0]*vec[0] + vec[1]*vec[1] * vec[2]*vec[2]);
+            val = sqrt(vec[0]*vec[0] + vec[1]*vec[1] + vec[2]*vec[2]);
             data[nindex] = (float)val;
             data[nindex+1] = (float)vec[0];
@@ -157 +157 @@
     }
 
+    TRACE("isVectorData: %s", isVectorData ? "yes" : "no");
     TRACE("nx = %i ny = %i nz = %i", nx, ny, nz);
     TRACE("x0 = %lg y0 = %lg z0 = %lg", x0, y0, z0);