Commit 7e598cb1 authored by hrchilds's avatar hrchilds
Browse files

Update from February 17, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@178 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1bef9072
......@@ -2069,6 +2069,10 @@ VisWindow::ResetView(void)
// Modified to match changes in avtView2D made to handle full frame
// mode properly.
//
// Kathleen Bonnell, Thu Feb 12 16:15:03 PST 2004
// Added call to Render after call to FullFrameOff, to ensure that
// the changes shows up immediately on the screen.
//
// ****************************************************************************
void
......@@ -2101,6 +2105,7 @@ VisWindow::SetView2D(const avtView2D &v)
if (fullFrameChanged && !view2D.fullFrame)
{
FullFrameOff();
Render();
}
}
......@@ -2387,6 +2392,10 @@ VisWindow::Render(void)
// Modified to match changes in avtView2D and avtViewCurve made to handle
// full frame mode properly.
//
// Kathleen Bonnell, Thu Feb 12 16:15:03 PST 2004
// Added call to Render after call to FullFrameOn in 2d, to ensure that
// the changes shows up immediately on the screen.
//
// ****************************************************************************
void
......@@ -2413,6 +2422,7 @@ VisWindow::UpdateView()
{
FullFrameOff();
FullFrameOn(view2D.GetScaleFactor(size), 1);
Render();
}
}
else if (mode == WINMODE_3D)
......
<?xml version="1.0"?>
<Plugin name="EnSight" type="database" label="EnSight" version="1.0" dbtype="MTSD">
<Extensions>
case
</Extensions>
<Plugin name="EnSight" type="database" label="EnSight" version="1.0" enabled="true" dbtype="MTSD" haswriter="false">
<CXXFLAGS> $(ENSIGHT_FLAGS) </CXXFLAGS>
<LDFLAGS> $(ENSIGHT_LIBS) </LDFLAGS>
<Extensions> case </Extensions>
<Files components="M,E">
avtEnSightFileFormat.C
vtkVisItGenericEnSightReader.C
vtkVisItEnSightReader.C
vtkVisItEnSight6Reader.C
vtkVisItEnSight6BinaryReader.C
vtkVisItEnSightGoldReader.C
vtkVisItEnSightGoldBinaryReader.C
</Files>
<Attribute name="" purpose="" persistent="false" exportAPI="" exportInclude="">
</Attribute>
</Plugin>
......@@ -9,13 +9,14 @@
#include <vtkCellData.h>
#include <vtkDataArray.h>
#include <vtkDataArraySelection.h>
#include <vtkPointData.h>
#include <vtkStructuredGrid.h>
#include <vtkEnSightReader.h>
#include <vtkEnSightGoldBinaryReader.h>
#include <vtkEnSightGoldReader.h>
#include <vtkEnSight6BinaryReader.h>
#include <vtkEnSight6Reader.h>
#include <vtkVisItEnSightReader.h>
#include <vtkVisItEnSightGoldBinaryReader.h>
#include <vtkVisItEnSightGoldReader.h>
#include <vtkVisItEnSight6BinaryReader.h>
#include <vtkVisItEnSight6Reader.h>
#include <avtDatabaseMetaData.h>
......@@ -59,6 +60,11 @@ avtEnSightFileFormat::avtEnSightFileFormat(const char *fname)
// Programmer: Hank Childs
// Creation: April 23, 2003
//
// Modifications:
// Kathleen Bonnell, Thu Feb 12 16:06:21 PST 2004
// Use vtkVisIt EnSight readers, until we update to the VTK version that
// has the ByteOrder fix (Dated January 30, 2004 or later).
//
// ****************************************************************************
void
......@@ -154,7 +160,7 @@ avtEnSightFileFormat::InstantiateReader(const char *fname)
for (i = 0 ; i < end ; i++)
if (strncmp(buff + i, "Binary", bin_str_len) == 0)
isBinary = true;
if (isBinary)
debug3 << "Identified file as EnSight binary" << endl;
else
......@@ -166,15 +172,15 @@ avtEnSightFileFormat::InstantiateReader(const char *fname)
if (isBinary)
if (isGold)
reader = vtkEnSightGoldBinaryReader::New();
reader = vtkVisItEnSightGoldBinaryReader::New();
else
reader = vtkEnSight6BinaryReader::New();
reader = vtkVisItEnSight6BinaryReader::New();
else
if (isGold)
reader = vtkEnSightGoldReader::New();
reader = vtkVisItEnSightGoldReader::New();
else
reader = vtkEnSight6Reader::New();
reader = vtkVisItEnSight6Reader::New();
reader->SetCaseFileName(case_name);
if (path[0] != '\0')
reader->SetFilePath(path);
......@@ -212,6 +218,10 @@ avtEnSightFileFormat::~avtEnSightFileFormat()
// Programmer: Hank Childs
// Creation: April 23, 2003
//
// Modifications:
// Kathleen Bonnell, Thu Feb 12 16:06:21 PST 2004
// Reader's access to PointData and CellData has changed.
//
// ****************************************************************************
void
......@@ -221,7 +231,8 @@ avtEnSightFileFormat::RegisterVariableList(const char *primVar,
int i, j;
reader->SetReadAllVariables(0);
reader->RemoveAllVariableNames();
reader->GetPointDataArraySelection()->RemoveAllArrays();
reader->GetCellDataArraySelection()->RemoveAllArrays();
vector<const char *> vars;
vars.push_back(primVar);
......@@ -246,7 +257,7 @@ avtEnSightFileFormat::RegisterVariableList(const char *primVar,
for (i = 0 ; i < nsn ; i++)
{
const char *desc = reader->GetDescription(i,
vtkEnSightReader::SCALAR_PER_NODE);
vtkVisItEnSightReader::SCALAR_PER_NODE);
if (strcmp(name, desc) == 0)
{
isNodal = true;
......@@ -261,7 +272,7 @@ avtEnSightFileFormat::RegisterVariableList(const char *primVar,
for (i = 0 ; i < nsz ; i++)
{
const char *desc = reader->GetDescription(i,
vtkEnSightReader::SCALAR_PER_ELEMENT);
vtkVisItEnSightReader::SCALAR_PER_ELEMENT);
if (strcmp(name, desc) == 0)
{
isNodal = false;
......@@ -276,7 +287,7 @@ avtEnSightFileFormat::RegisterVariableList(const char *primVar,
for (i = 0 ; i < nsn ; i++)
{
const char *desc = reader->GetDescription(i,
vtkEnSightReader::VECTOR_PER_NODE);
vtkVisItEnSightReader::VECTOR_PER_NODE);
if (strcmp(name, desc) == 0)
{
isNodal = true;
......@@ -291,7 +302,7 @@ avtEnSightFileFormat::RegisterVariableList(const char *primVar,
for (i = 0 ; i < nsz ; i++)
{
const char *desc = reader->GetDescription(i,
vtkEnSightReader::VECTOR_PER_ELEMENT);
vtkVisItEnSightReader::VECTOR_PER_ELEMENT);
if (strcmp(name, desc) == 0)
{
isNodal = false;
......@@ -305,7 +316,15 @@ avtEnSightFileFormat::RegisterVariableList(const char *primVar,
EXCEPTION1(InvalidVariableException, name);
char *vname = (char *) name; // remove const for VTK.
reader->AddVariableName(vname, (isNodal ? 0 : 1));
if (isNodal)
{
reader->GetPointDataArraySelection()->EnableArray(vname);
}
else
{
reader->GetCellDataArraySelection()->EnableArray(vname);
}
}
doneUpdate = false;
......@@ -529,28 +548,28 @@ avtEnSightFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
for (i = 0 ; i < reader->GetNumberOfScalarsPerNode() ; i++)
{
const char *name = reader->GetDescription(i,
vtkEnSightReader::SCALAR_PER_NODE);
vtkVisItEnSightReader::SCALAR_PER_NODE);
AddScalarVarToMetaData(md, name, "mesh", AVT_NODECENT);
}
for (i = 0 ; i < reader->GetNumberOfScalarsPerElement() ; i++)
{
const char *name = reader->GetDescription(i,
vtkEnSightReader::SCALAR_PER_ELEMENT);
vtkVisItEnSightReader::SCALAR_PER_ELEMENT);
AddScalarVarToMetaData(md, name, "mesh", AVT_ZONECENT);
}
for (i = 0 ; i < reader->GetNumberOfVectorsPerNode() ; i++)
{
const char *name = reader->GetDescription(i,
vtkEnSightReader::VECTOR_PER_NODE);
vtkVisItEnSightReader::VECTOR_PER_NODE);
AddVectorVarToMetaData(md, name, "mesh", AVT_NODECENT);
}
for (i = 0 ; i < reader->GetNumberOfVectorsPerElement() ; i++)
{
const char *name = reader->GetDescription(i,
vtkEnSightReader::VECTOR_PER_ELEMENT);
vtkVisItEnSightReader::VECTOR_PER_ELEMENT);
AddVectorVarToMetaData(md, name, "mesh", AVT_ZONECENT);
}
}
......
......@@ -11,7 +11,7 @@
#include <string>
class vtkGenericEnSightReader;
class vtkVisItGenericEnSightReader;
// ****************************************************************************
......@@ -45,7 +45,7 @@ class avtEnSightFileFormat : public avtMTSDFileFormat
const std::vector<CharStrRef>&);
protected:
vtkGenericEnSightReader *reader;
vtkVisItGenericEnSightReader *reader;
bool doneUpdate;
void PrepReader(int);
......
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkEnSight6BinaryReader.h,v $
Language: C++
Date: $Date: 2003/10/24 17:16:18 $
Version: $Revision: 1.16 $
Module: $RCSfile: vtkVisItEnSight6BinaryReader.h,v $
Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkEnSight6BinaryReader - class to read binary EnSight6 files
// .NAME vtkVisItEnSight6BinaryReader - class to read binary EnSight6 files
// .SECTION Description
// vtkEnSight6BinaryReader is a class to read binary EnSight6 files into vtk.
// vtkVisItEnSight6BinaryReader is a class to read binary EnSight6 files into vtk.
// Because the different parts of the EnSight data can be of various data
// types, this reader produces multiple outputs, one per part in the input
// file.
......@@ -35,25 +32,26 @@
// This reader can only handle static EnSight datasets (both static geometry
// and variables).
#ifndef __vtkEnSight6BinaryReader_h
#define __vtkEnSight6BinaryReader_h
#ifndef __vtkVisItEnSight6BinaryReader_h
#define __vtkVisItEnSight6BinaryReader_h
#include "vtkEnSightReader.h"
#include <vtk_sl_io_exports.h>
#include <database_exports.h>
#include "vtkVisItEnSightReader.h"
class vtkIdTypeArray;
class vtkPoints;
class VTK_SL_IO_API vtkEnSight6BinaryReader : public vtkEnSightReader
class DATABASE_API VTK_IO_EXPORT vtkVisItEnSight6BinaryReader :
public vtkVisItEnSightReader
{
public:
static vtkEnSight6BinaryReader *New();
vtkTypeRevisionMacro(vtkEnSight6BinaryReader, vtkEnSightReader);
static vtkVisItEnSight6BinaryReader *New();
vtkTypeRevisionMacro(vtkVisItEnSight6BinaryReader, vtkVisItEnSightReader);
virtual void PrintSelf(ostream& os, vtkIndent indent);
protected:
vtkEnSight6BinaryReader();
~vtkEnSight6BinaryReader();
vtkVisItEnSight6BinaryReader();
~vtkVisItEnSight6BinaryReader();
// Returns 1 if successful. Sets file size as a side action.
int OpenFile(const char* filename);
......@@ -129,8 +127,8 @@ protected:
// Description:
// Internal function to read in a single integer.
// Tries to determine the byte order of this file.
// Returns zero if there was an error.
// This also tries to determine the byte order of this file.
int ReadIntNumber(int *result);
// Description:
......@@ -145,7 +143,7 @@ protected:
// Description:
// Read to the next time step in the geometry file.
void SkipTimeStep();
int SkipTimeStep();
int SkipStructuredGrid(char line[256]);
int SkipUnstructuredGrid(char line[256]);
......@@ -161,8 +159,8 @@ protected:
ifstream *IFile;
private:
vtkEnSight6BinaryReader(const vtkEnSight6BinaryReader&); // Not implemented.
void operator=(const vtkEnSight6BinaryReader&); // Not implemented.
vtkVisItEnSight6BinaryReader(const vtkVisItEnSight6BinaryReader&); // Not implemented.
void operator=(const vtkVisItEnSight6BinaryReader&); // Not implemented.
};
#endif
......
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkEnSight6Reader.h,v $
Module: $RCSfile: vtkVisItEnSight6Reader.h,v $
Language: C++
Date: $Date: 2003/06/02 20:43:58 $
Version: $Revision: 1.15 $
......@@ -15,9 +15,9 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkEnSight6Reader - class to read EnSight6 files
// .NAME vtkVisItEnSight6Reader - class to read EnSight6 files
// .SECTION Description
// vtkEnSight6Reader is a class to read EnSight6 files into vtk.
// vtkVisItEnSight6Reader is a class to read EnSight6 files into vtk.
// Because the different parts of the EnSight data can be of various data
// types, this reader produces multiple outputs, one per part in the input
// file.
......@@ -35,25 +35,26 @@
// This reader can only handle static EnSight datasets (both static geometry
// and variables).
#ifndef __vtkEnSight6Reader_h
#define __vtkEnSight6Reader_h
#ifndef __vtkVisItEnSight6Reader_h
#define __vtkVisItEnSight6Reader_h
#include <database_exports.h>
#include "vtkEnSightReader.h"
#include <vtk_sl_io_exports.h>
#include "vtkVisItEnSightReader.h"
class vtkIdTypeArray;
class vtkPoints;
class VTK_SL_IO_API vtkEnSight6Reader : public vtkEnSightReader
class DATABASE_API VTK_IO_EXPORT vtkVisItEnSight6Reader :
public vtkVisItEnSightReader
{
public:
static vtkEnSight6Reader *New();
vtkTypeRevisionMacro(vtkEnSight6Reader, vtkEnSightReader);
static vtkVisItEnSight6Reader *New();
vtkTypeRevisionMacro(vtkVisItEnSight6Reader, vtkVisItEnSightReader);
virtual void PrintSelf(ostream& os, vtkIndent indent);
protected:
vtkEnSight6Reader();
~vtkEnSight6Reader();
vtkVisItEnSight6Reader();
~vtkVisItEnSight6Reader();
// Description:
// Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
......@@ -124,8 +125,8 @@ protected:
vtkPoints* UnstructuredPoints;
vtkIdTypeArray* UnstructuredNodeIds; // matching of node ids to point ids
private:
vtkEnSight6Reader(const vtkEnSight6Reader&); // Not implemented.
void operator=(const vtkEnSight6Reader&); // Not implemented.
vtkVisItEnSight6Reader(const vtkVisItEnSight6Reader&); // Not implemented.
void operator=(const vtkVisItEnSight6Reader&); // Not implemented.
};
#endif
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkEnSightGoldBinaryReader.h,v $
Language: C++
Date: $Date: 2003/10/26 01:11:48 $
Version: $Revision: 1.14 $
Module: $RCSfile: vtkVisItEnSightGoldBinaryReader.h,v $
Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkEnSightGoldBinaryReader - class to read binary EnSight Gold files
// .NAME vtkVisItEnSightGoldBinaryReader - class to read binary EnSight Gold files
// .SECTION Description
// vtkEnSightGoldBinaryReader is a class to read EnSight Gold files into vtk.
// vtkVisItEnSightGoldBinaryReader is a class to read EnSight Gold files into vtk.
// Because the different parts of the EnSight data can be of various data
// types, this reader produces multiple outputs, one per part in the input
// file.
......@@ -35,22 +32,24 @@
// This reader can only handle static EnSight datasets (both static geometry
// and variables).
#ifndef __vtkEnSightGoldBinaryReader_h
#define __vtkEnSightGoldBinaryReader_h
#ifndef __vtkVisItEnSightGoldBinaryReader_h
#define __vtkVisItEnSightGoldBinaryReader_h
#include "vtkEnSightReader.h"
#include <vtk_sl_io_exports.h>
#include <database_exports.h>
class VTK_SL_IO_API vtkEnSightGoldBinaryReader : public vtkEnSightReader
#include "vtkVisItEnSightReader.h"
class DATABASE_API VTK_IO_EXPORT vtkVisItEnSightGoldBinaryReader :
public vtkVisItEnSightReader
{
public:
static vtkEnSightGoldBinaryReader *New();
vtkTypeRevisionMacro(vtkEnSightGoldBinaryReader, vtkEnSightReader);
static vtkVisItEnSightGoldBinaryReader *New();
vtkTypeRevisionMacro(vtkVisItEnSightGoldBinaryReader, vtkVisItEnSightReader);
virtual void PrintSelf(ostream& os, vtkIndent indent);
protected:
vtkEnSightGoldBinaryReader();
~vtkEnSightGoldBinaryReader();
vtkVisItEnSightGoldBinaryReader();
~vtkVisItEnSightGoldBinaryReader();
// Returns 1 if successful. Sets file size as a side action.
int OpenFile(const char* filename);
......@@ -153,7 +152,7 @@ protected:
// Description:
// Read to the next time step in the geometry file.
void SkipTimeStep();
int SkipTimeStep();
int SkipStructuredGrid(char line[256]);
int SkipUnstructuredGrid(char line[256]);
int SkipRectilinearGrid(char line[256]);
......@@ -167,8 +166,8 @@ protected:
int FileSize;
private:
vtkEnSightGoldBinaryReader(const vtkEnSightGoldBinaryReader&); // Not implemented.
void operator=(const vtkEnSightGoldBinaryReader&); // Not implemented.
vtkVisItEnSightGoldBinaryReader(const vtkVisItEnSightGoldBinaryReader&); // Not implemented.
void operator=(const vtkVisItEnSightGoldBinaryReader&); // Not implemented.
};
#endif
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkEnSightGoldReader.cxx,v $
Module: $RCSfile: vtkVisItEnSightGoldReader.cxx,v $
Language: C++
Date: $Date: 2003/06/02 20:43:58 $
Version: $Revision: 1.38 $
......@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkEnSightGoldReader.h"
#include "vtkVisItEnSightGoldReader.h"
#include "vtkCellData.h"
#include "vtkCharArray.h"
......@@ -32,11 +32,11 @@
#include <ctype.h>
#include <string>
vtkCxxRevisionMacro(vtkEnSightGoldReader, "$Revision: 1.38 $");
vtkStandardNewMacro(vtkEnSightGoldReader);
vtkCxxRevisionMacro(vtkVisItEnSightGoldReader, "$Revision: 1.38 $");
vtkStandardNewMacro(vtkVisItEnSightGoldReader);
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadGeometryFile(char* fileName, int timeStep)
int vtkVisItEnSightGoldReader::ReadGeometryFile(char* fileName, int timeStep)
{
char line[256], subLine[256];
int partId, i;
......@@ -75,7 +75,7 @@ int vtkEnSightGoldReader::ReadGeometryFile(char* fileName, int timeStep)
if (strcmp(subLine, "Binary") == 0)
{
vtkErrorMacro("This is a binary data set. Try "
<<"vtkEnSightGoldBinaryReader.");
<<"vtkVisItEnSightGoldBinaryReader.");
return 0;
}
......@@ -170,7 +170,7 @@ int vtkEnSightGoldReader::ReadGeometryFile(char* fileName, int timeStep)
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadMeasuredGeometryFile(char* fileName,
int vtkVisItEnSightGoldReader::ReadMeasuredGeometryFile(char* fileName,
int timeStep)
{
char line[256], subLine[256];
......@@ -218,7 +218,7 @@ int vtkEnSightGoldReader::ReadMeasuredGeometryFile(char* fileName,
if (strcmp(subLine, "Binary") == 0)
{
vtkErrorMacro("This is a binary data set. Try "
<< "vtkEnSight6BinaryReader.");
<< "vtkVisItEnSight6BinaryReader.");
return 0;
}
}
......@@ -288,7 +288,7 @@ int vtkEnSightGoldReader::ReadMeasuredGeometryFile(char* fileName,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadScalarsPerNode(char* fileName, char* description,
int vtkVisItEnSightGoldReader::ReadScalarsPerNode(char* fileName, char* description,
int timeStep, int measured,
int numberOfComponents,
int component)
......@@ -442,7 +442,7 @@ int vtkEnSightGoldReader::ReadScalarsPerNode(char* fileName, char* description,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadVectorsPerNode(char* fileName, char* description,
int vtkVisItEnSightGoldReader::ReadVectorsPerNode(char* fileName, char* description,
int timeStep, int measured)
{
char line[256], formatLine[256], tempLine[256];
......@@ -575,7 +575,7 @@ int vtkEnSightGoldReader::ReadVectorsPerNode(char* fileName, char* description,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadTensorsPerNode(char* fileName, char* description,
int vtkVisItEnSightGoldReader::ReadTensorsPerNode(char* fileName, char* description,
int timeStep)
{
char line[256];
......@@ -662,7 +662,7 @@ int vtkEnSightGoldReader::ReadTensorsPerNode(char* fileName, char* description,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadScalarsPerElement(char* fileName,
int vtkVisItEnSightGoldReader::ReadScalarsPerElement(char* fileName,
char* description,
int timeStep,
int numberOfComponents,
......@@ -805,7 +805,7 @@ int vtkEnSightGoldReader::ReadScalarsPerElement(char* fileName,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadVectorsPerElement(char* fileName,
int vtkVisItEnSightGoldReader::ReadVectorsPerElement(char* fileName,
char* description,
int timeStep)
{
......@@ -936,7 +936,7 @@ int vtkEnSightGoldReader::ReadVectorsPerElement(char* fileName,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::ReadTensorsPerElement(char* fileName,
int vtkVisItEnSightGoldReader::ReadTensorsPerElement(char* fileName,
char* description,
int timeStep)
{
......@@ -1063,7 +1063,7 @@ int vtkEnSightGoldReader::ReadTensorsPerElement(char* fileName,
}
//----------------------------------------------------------------------------
int vtkEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
int vtkVisItEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
char line[256],
const char* name)
{
......@@ -1187,7 +1187,7 @@ int vtkEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
{
nodeIds[0] = atoi(line) - 1; // because EnSight ids start at 1
cellId = output->InsertNextCell(VTK_VERTEX, 1, nodeIds);
this->GetCellIds(idx, vtkEnSightReader::POINT)->InsertNextId(cellId);
this->GetCellIds(idx, vtkVisItEnSightReader::POINT)->InsertNextId(cellId);
lineRead = this->ReadNextDataLine(line);
}