Changeset 1529 for trunk/packages

Timestamp:

Jun 24, 2009, 11:20:14 AM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (1 diff)
• Unirect.cpp (modified) (7 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -2129 +2129 @@
 }
 
+
+#ifdef notdef
+
+// Read the header of a vtk data file. Returns 0 if error.
+bool 
+VtkReadHeader()
+{
+    char *p, *endPtr;
+
+  line = getline(&p, endPtr);
+  if (line == endPtr) {
+      vtkErrorMacro(<<"Premature EOF reading first line! " << " for file: " 
+                    << (this->FileName?this->FileName:"(Null FileName)"));
+      return false;
+  }
+  if (sscanf(line, "# vtk DataFile Version %s", version) != 1) {
+      vtkErrorMacro(<< "Unrecognized file type: "<< line << " for file: " 
+                    << (this->FileName?this->FileName:"(Null FileName)"));
+      return false;
+  }    
+  // Read title
+  line = getline(&p, endPtr);
+  if (line == endPtr) {
+      vtkErrorMacro(<<"Premature EOF reading title! " << " for file: " 
+                    << (this->FileName?this->FileName:"(Null FileName)"));
+      return false;
+  }
+  if (_title != NULL) {
+      delete [] _title;
+  }
+  _title = new char[strlen(line) + 1];
+  strcpy(_title, line);
+
+  // Read type
+  line = getline(&p, endPtr);
+  if (line == endPtr) {
+      vtkErrorMacro(<<"Premature EOF reading file type!" << " for file: " 
+                    << (this->FileName?this->FileName:"(Null FileName)"));
+      return false;
+  }
+  word = GetWord(line, &endPtr);
+  if (strncasecmp(word, "ascii", 5) == 0) {
+      _fileType = VTK_ASCII;
+  } else if (strcasecmp(word, "binary", 6) == 0) {
+      _fileType = VTK_BINARY;
+  } else {
+      vtkErrorMacro(<< "Unrecognized file type: "<< line << " for file: " 
+                    << (this->FileName?this->FileName:"(Null FileName)"));
+      _fileType = 0;
+      return false;
+
+  }
+  // Read dataset type
+  line = getline(&p, endPtr);
+  if (line == endPtr) {
+      vtkErrorMacro(<<"Premature EOF reading file type!" << " for file: " 
+                    << (this->FileName?this->FileName:"(Null FileName)"));
+      return false;
+  }
+  word = GetWord(line, &endPtr);
+  if (strncasecmp(word, "dataset", 7) == 0) {
+      // Read dataset type
+      line = getline(&p, endPtr);
+      if (line == endPtr) {
+          // EOF
+      }
+      type = GetWord(line, &endPtr);
+      if (strncasecmp(word, "structured_grid", 15) == 0) {
+          vtkErrorMacro(<< "Cannot read dataset type: " << line);
+          return 1;
+      }
+    // Read keyword and dimensions
+    //
+    while (!done)
+      {
+      if (!this->ReadString(line))
+        {
+        break;
+        }
+
+      // Have to read field data because it may be binary.
+      if (! strncmp(this->LowerCase(line), "field", 5))
+        {
+        vtkFieldData* fd = this->ReadFieldData();
+        fd->Delete(); 
+        }
+
+      if ( ! strncmp(this->LowerCase(line),"dimensions",10) )
+        {
+        int ext[6];
+        if (!(this->Read(ext+1) && 
+              this->Read(ext+3) && 
+              this->Read(ext+5)))
+          {
+          vtkErrorMacro(<<"Error reading dimensions!");
+          this->CloseVTKFile ();
+          return 1;
+          }
+        // read dimensions, change to extent;
+        ext[0] = ext[2] = ext[4] = 0;
+        --ext[1];
+        --ext[3];
+        --ext[5];
+        outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+                     ext, 6);
+        // That is all we wanted !!!!!!!!!!!!!!!
+        this->CloseVTKFile();
+        return 1;
+        }
+      }
+    }
+
+
+
+  float progress=this->GetProgress();
+  this->UpdateProgress(progress + 0.5*(1.0 - progress));
+  
+  return 1;
+}
+#endif

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -306 +306 @@
                               Tcl_Obj *const *objv)
 {
-
     if ((objc & 0x01) == 0) {
         Tcl_AppendResult(interp, Tcl_GetString(objv[0]), ": ",
@@ -453 +452 @@
     }
     
-#ifndef notdef
     if ((axis[0] != 1) || (axis[1] != 0)) {
         fprintf(stderr, "reordering data\n");
-        // Reorder the data into x, y where x varies fastest and so on.
+        /* Reorder the data into x, y where x varies fastest and so on. */
         size_t y;
         float *data, *dp;
@@ -478 +476 @@
         _values = data;
     }
-#endif
     _initialized = true;
     return TCL_OK;
@@ -490 +487 @@
     int nx, ny, nz, npts;
     double x0, y0, z0, dx, dy, dz, ddx, ddy, ddz;
-    char *p, *endPtr;
-
-    dx = dy = dz = 0.0;                 // Suppress compiler warning.
-    x0 = y0 = z0 = 0.0;                 // May not have an origin line.
-    nx = ny = nz = npts = 0;            // Suppress compiler warning.
-    for (p = string, endPtr = p + length; p < endPtr; /*empty*/) {
+    char *p, *pend;
+
+    dx = dy = dz = 0.0;                 /* Suppress compiler warning. */
+    x0 = y0 = z0 = 0.0;                 /* May not have an origin line. */
+    nx = ny = nz = npts = 0;            /* Suppress compiler warning. */
+    for (p = string, pend = p + length; p < pend; /*empty*/) {
         char *line;
 
-        line = getline(&p, endPtr);
-        if (line == endPtr) {
-            break;
+        line = getline(&p, pend);
+        if (line == pend) {
+            break;                      /* EOF */
         }
         if ((line[0] == '#') || (line == '\0')) {
-            continue;           // Skip blank or comment lines.
+            continue;                   /* Skip blank or comment lines. */
         }
         if (sscanf(line, "object %*d class gridpositions counts %d %d %d", 
@@ -513 +510 @@
             }
         } else if (sscanf(line, "origin %lg %lg %lg", &x0, &y0, &z0) == 3) {
-            // found origin
+            /* Found origin. */
         } else if (sscanf(line, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
-            // found one of the delta lines
+            /* Found one of the delta lines. */
             if (ddx != 0.0) {
                 dx = ddx;
@@ -571 +568 @@
             for (size_t iz = 0; iz < _zNum; iz++) {
                 char *line;
-                if ((p == endPtr) || (_nValues > (size_t)npts)) {
+                if ((p == pend) || (_nValues > (size_t)npts)) {
                     break;
                 }
-                line = getline(&p, endPtr);
+                line = getline(&p, pend);
                 if ((line[0] == '#') || (line[0] == '\0')) {
-                    continue;   // Skip blank or comment lines.
+                    continue;           /* Skip blank or comment lines. */
                 }
                 double vx, vy, vz;
@@ -604 +601 @@
         }
     }
-    // make sure that we read all of the expected points
+    /* Make sure that we read all of the expected points. */
     if (_nValues != (size_t)npts) {
         result.addError("inconsistent data: expected %d points"