Relative path names for easier copying of file groups.

Parallel/vtkPDataSetReader.cxx

@@ -88,18 +88,6 @@ vtkPDataSetReader::~vtkPDataSetReader()
 {
   delete[] this->FileName;
   this->SetNumberOfPieces(0);
-
-  if (this->PieceFileNames)
-    {
-    for (int i = 0; i < this->NumberOfPieces; ++i)
-      {
-      if (this->PieceFileNames[i])
-        {
-        delete [] this->PieceFileNames[i];
-        this->PieceFileNames[i] = NULL;
-        }
-      }
-    }
 }
 
 
@@ -185,6 +173,11 @@ vtkDataSet *vtkPDataSetReader::GetOutput()
 
   // Creates an output if necessary.
   this->CheckOutput();
+  if (! this->Outputs)
+    {
+    return NULL;
+    }
+
   output = (vtkDataSet *)(this->Outputs[0]);
 
   return output;
@@ -262,9 +255,31 @@ void vtkPDataSetReader::ExecuteInformation()
 {
   ifstream *file;
   char str[1024];
+  char dir[512];
+  char *pfn, *pdir;
+  int count, dirLength;
   vtkDataSet *output;
   int i;
 
+  // Extract the directory form the filename so we can complete relative paths.
+  count = dirLength = 0;
+  pfn = this->FileName;
+  pdir = dir;
+  // Copy filename to dir, and keep track of the last slash.
+  while (*pfn != '\0' && count < 512)
+    {
+    *pdir++ = *pfn++;
+    ++count;
+    if (*pfn == '/' || *pfn == '\\')
+      {
+      // The extra +1 is to keep the last slash.
+      dirLength = count+1;
+      }
+    }
+  // This trims off every thing after the last slash.
+  dir[dirLength] = '\0';
+
+  // Start writing the meta-data pvtk file.
   file = this->OpenFile();
   if (file == NULL)
     {
@@ -374,7 +389,14 @@ void vtkPDataSetReader::ExecuteInformation()
       file->getline(str, 512);
       // Take all characters after the quote off.
       str[strlen(str)-1] = '\0';
-      strcpy(this->PieceFileNames[i], str+19);
+      if (str[19] != '/' && str[20] != ':' && dirLength > 0)
+        { // Must be a relative path.
+        sprintf(this->PieceFileNames[i], "%s%s", dir, str+19);
+        }
+      else
+        {
+        strcpy(this->PieceFileNames[i], str+19);
+        }
       // Now read the extent.
       file->getline(str, 512);
       // Take all characters after the quote off.
@@ -386,7 +408,14 @@ void vtkPDataSetReader::ExecuteInformation()
       file->getline(str, 512);
       // Take all characters after the quote off.
       str[strlen(str)-4] = '\0';
-      strcpy(this->PieceFileNames[i], str+19);
+      if (str[19] != '/' && str[20] != ':' && dirLength > 0)
+        { // Must be a relative path.
+        sprintf(this->PieceFileNames[i], "%s%s", dir, str+19);
+        }
+      else
+        {
+        strcpy(this->PieceFileNames[i], str+19);
+        }
       }
     }
 }
@@ -589,6 +618,10 @@ ifstream *vtkPDataSetReader::OpenFile()
 
   if (! file || file->fail())
     {
+    if (file)
+      {
+      delete [] file;
+      }
     vtkErrorMacro(<< "Initialize: Could not open file " << this->FileName);
     return NULL;
     }
@@ -874,9 +907,6 @@ void vtkPDataSetReader::StructuredGridExecute()
     return;
     }
 
-  // Allocate the data object.
-  output->SetExtent(uExt);
-
   // Get the pieces that will be read.
   pieceMask = new int[this->NumberOfPieces];
   for (i = 0; i < this->NumberOfPieces; ++i)
@@ -928,6 +958,7 @@ void vtkPDataSetReader::StructuredGridExecute()
     delete [] pieces;
     delete [] pieceMask;
     reader->Delete();
+    return;
     }
 
   // Allocate the points.
@@ -1042,7 +1073,14 @@ void vtkPDataSetReader::CoverExtent(int ext[6], int *pieceMask)
         {
         cExt[j*2+1] = this->PieceExtents[i][j*2+1];
         }
-      area *= cExt[j*2+1] - cExt[j*2];
+      if (cExt[j*2] > cExt[j*2+1])
+        {
+        area = 0.0;
+        }
+      else
+        {
+        area *= (cExt[j*2+1] - cExt[j*2] + 1);
+        }
       }
     if (area > bestArea)
       {

Parallel/vtkPDataSetWriter.cxx

@@ -71,6 +71,7 @@ vtkPDataSetWriter::vtkPDataSetWriter()
 
   this->FilePattern = NULL;
   this->SetFilePattern("%s.%d.vtk");
+  this->UseRelativeFileNames = 1;
 }
 
 //----------------------------------------------------------------------------
@@ -146,6 +147,33 @@ void vtkPDataSetWriter::Write()
     {
     fileRoot[length-4] = '\0';
     }
+  // If we are using relative file names, trim off the directory path.
+  if (this->UseRelativeFileNames)
+    {
+    char *tmp, *slash;
+    // Find the last / or \ in the file name.
+    slash = NULL;
+    tmp = fileRoot;
+    while (*tmp != '\0')
+      {
+      if (*tmp == '/' || *tmp == '\\')
+        {
+        slash = tmp;
+        }
+      ++tmp;
+      }
+    // Copy just the filename into root.
+    if (slash)
+      {
+      ++slash;
+      tmp = fileRoot;
+      while (*slash != '\0')
+        {
+        *tmp++ = *slash++;
+        }
+      *tmp = '\0';         
+      }
+    }
 
   // Lets write the toplevel file.
   if (this->StartPiece == 0)
@@ -193,6 +221,19 @@ void vtkPDataSetWriter::Write()
     delete fptr;
     }
 
+  // Restore the fileRoot to the full path.
+  strncpy(fileRoot, this->FileName, length);
+  fileRoot[length] = '\0';
+  // Trim off the pvtk extension.
+  if (strncmp(fileRoot+length-5, ".pvtk", 5) == 0)
+    {
+    fileRoot[length-5] = '\0';
+    }
+  if (strncmp(fileRoot+length-4, ".vtk", 4) == 0)
+    {
+    fileRoot[length-4] = '\0';
+    }
+
   // Now write the pieces assigned to this writer.
   vtkDataSetWriter *writer = vtkDataSetWriter::New();
   writer->SetFileTypeToBinary();
@@ -368,6 +409,7 @@ void vtkPDataSetWriter::PrintSelf(ostream& os, vtkIndent indent)
   os << indent << "NumberOfPieces: " << this->NumberOfPieces << endl;
   os << indent << "GhostLevel: " << this->GhostLevel << endl;
   os << indent << "FilePattern: " << this->FilePattern << endl;
+  os << indent << "UseRelativeFileNames: " << this->UseRelativeFileNames << endl;
 }
 
 

Parallel/vtkPDataSetWriter.h

@@ -91,6 +91,15 @@ public:
   vtkSetStringMacro(FilePattern);
   vtkGetStringMacro(FilePattern);
 
+  // Description:
+  // This flag determines whether to use absolute paths for the piece files.
+  // By default the pieces are put in the main directory, and the piece file
+  // names in the meta data pvtk file are relative to this directory.
+  // This should make moving the whole lot to another directory, an easier task.
+  vtkSetMacro(UseRelativeFileNames, int);
+  vtkGetMacro(UseRelativeFileNames, int);
+  vtkBooleanMacro(UseRelativeFileNames, int);
+
 protected:
   vtkPDataSetWriter();
   ~vtkPDataSetWriter();
@@ -114,6 +123,8 @@ protected:
   int NumberOfPieces;
   int GhostLevel;
 
+  int UseRelativeFileNames;
+
   char *FilePattern;
 };