Commit 628d831b authored by Charles Law's avatar Charles Law
Browse files

Fixing Reading and writing structured points.

parent a17724b3
......@@ -22,7 +22,7 @@
#include "vtkObjectFactory.h"
#include "vtkSource.h"
vtkCxxRevisionMacro(vtkDataObject, "1.91");
vtkCxxRevisionMacro(vtkDataObject, "1.92");
vtkStandardNewMacro(vtkDataObject);
vtkCxxSetObjectMacro(vtkDataObject,FieldData,vtkFieldData);
......@@ -672,14 +672,16 @@ void vtkDataObject::InternalDataObjectCopy(vtkDataObject *src)
{
this->WholeExtent[idx] = src->WholeExtent[idx];
this->Extent[idx] = src->Extent[idx];
this->UpdateExtent[idx] = src->UpdateExtent[idx];
// Copying these update variables caused me no end of grief.
//this->UpdateExtent[idx] = src->UpdateExtent[idx];
}
this->Piece = src->Piece;
this->NumberOfPieces = src->NumberOfPieces;
this->MaximumNumberOfPieces = src->MaximumNumberOfPieces;
this->UpdateNumberOfPieces = src->UpdateNumberOfPieces;
this->UpdatePiece = src->UpdatePiece;
this->UpdateGhostLevel = src->UpdateGhostLevel;
// Copying these update variables caused me no end of grief.
//this->UpdateNumberOfPieces = src->UpdateNumberOfPieces;
//this->UpdatePiece = src->UpdatePiece;
//this->UpdateGhostLevel = src->UpdateGhostLevel;
this->ReleaseDataFlag = src->ReleaseDataFlag;
this->PipelineMTime = src->PipelineMTime;
this->UpdateTime = src->UpdateTime;
......
......@@ -34,7 +34,7 @@
#include "vtkUnstructuredGrid.h"
#include "vtkExtentTranslator.h"
vtkCxxRevisionMacro(vtkPDataSetReader, "1.22");
vtkCxxRevisionMacro(vtkPDataSetReader, "1.23");
vtkStandardNewMacro(vtkPDataSetReader);
//----------------------------------------------------------------------------
......@@ -659,7 +659,7 @@ void vtkPDataSetReader::ReadPVTKFileInformation(ifstream *file)
this->DataType = VTK_RECTILINEAR_GRID;
this->StructuredFlag = 1;
}
else if (strcmp(val, "vtkImageData") == 0)
else if (strcmp(val, "vtkImageData") == 0 || strcmp(val, "vtkStructuredPoints") == 0)
{
this->DataType = VTK_IMAGE_DATA;
this->StructuredFlag = 1;
......
......@@ -24,7 +24,7 @@
#include "vtkStructuredGrid.h"
#include "vtkRectilinearGrid.h"
vtkCxxRevisionMacro(vtkPDataSetWriter, "1.8");
vtkCxxRevisionMacro(vtkPDataSetWriter, "1.9");
vtkStandardNewMacro(vtkPDataSetWriter);
//----------------------------------------------------------------------------
......@@ -171,6 +171,7 @@ void vtkPDataSetWriter::Write()
this->WriteUnstructuredMetaData(input, fileRoot, fileName, fptr);
break;
case VTK_IMAGE_DATA:
case VTK_STRUCTURED_POINTS:
this->WriteImageMetaData((vtkImageData*)input, fileRoot, fileName, fptr);
break;
case VTK_RECTILINEAR_GRID:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment