Commit 8a45aac5 authored by hrchilds's avatar hrchilds

Update from May 29, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@675 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5b41df36
......@@ -17,7 +17,7 @@ shell prompt.
Python 2.1.2 Scripting Language http://www.python.org
Qt 3.3.2 GUI Toolkit http://www.trolltech.com
Silo 4.5 File I/O library http://www.llnl.gov/bdiv/meshtv
VTK 20040323a Visualization Toolkit http://www.kitware.com
VTK 5.0.0a Visualization Toolkit http://www.kitware.com
The public version of VisIt has been built with the above listed versions
......@@ -197,9 +197,9 @@ VTK/README.html file included in the VTK distribution for more information.
#
# Build CMake which is used by VTK to configure its distribution
#
gunzip cmake-1.8.1.tar.gz
tar xf cmake-1.8.1.tar
cd cmake-1.8.1
gunzip cmake-2.2.3.tar.gz
tar xf cmake-2.2.3.tar
cd cmake-2.2.3
#
# We have experienced problems building CMake on aix with g++/gcc.
# so for aix use the native compilers to build CMake:
......@@ -212,20 +212,20 @@ make
# Build VTK
#
cd ..
gunzip vtk_cvs_2004.03.23a.tar.gz
tar xf vtk_cvs_2004.03.23a.tar
gunzip vtk_cvs_5.0.0a.tar.gz
tar xf vtk_cvs_5.0.0a.tar
cd VTK
#
# On irix systems we have experienced problems with CMake not using the
# -LANG:std for all the tests, so you will need to add it manually.
#
# env CXXFLAGS="-LANG:std" ../cmake-1.8.1/bin/cmake .
# env CXXFLAGS="-LANG:std" ../cmake-2.2.3/bin/cmake .
#
../cmake-1.8.1/bin/cmake .
../cmake-2.2.3/bin/cmake .
#
# Edit CMakeCache.txt. Turn BUILD_SHARED_LIBS, VTK_USE_HYBRID,
# VTK_USE_MANGLED_MESA, VTK_USE_ANSI_STDLIB, and CMAKE_SKIP_RPATH on,
# Turn BUILD_TESTING off.
# VTK_USE_MANGLED_MESA, and VTK_USE_ANSI_STDLIB on. Turn VTK_USE_RPATH
# and BUILD_TESTING off.
#
# If you want to change the compilers you should modify CMAKE_CXX_COMPILER
# and CMAKE_C_COMPILER. If you want to change the compiler flags you should
......@@ -249,7 +249,7 @@ cd VTK
# If this should lead to errors related to standard C++ headers (e.g. stdio),
# remove the CMAKE_X_CFLAGS string and re-run cmake.
#
../cmake-1.8.1/bin/cmake .
../cmake-2.2.3/bin/cmake .
#
# Edit CMakeCache.txt, setting MANGLED_MESA_INCLUDE_DIR, MANGLED_MESA_LIBRARY,
# MANGLED_OSMESA_INCLUDE_DIR, MANGLED_OSMESA_LIBRARY, to point to the
......@@ -264,7 +264,7 @@ cd VTK
# Note that you need to be very careful in setting the above variables so
# that you provide the appropriate filename or path.
#
../cmake-1.8.1/bin/cmake .
../cmake-2.2.3/bin/cmake .
#
# On tru64 systems using g++ 3.0.4, several files in the Imaging directory
......@@ -291,32 +291,34 @@ make
# Install it in the visit directory under the vtk directory.
#
mkdir $VISITDIR/vtk
mkdir $VISITDIR/vtk/2004.03.23a
mkdir $VISITDIR/vtk/2004.03.23a/$VISITARCH
mkdir $VISITDIR/vtk/2004.03.23a/$VISITARCH/{Common,Filtering,Graphics,Hybrid,IO,Imaging,Rendering,MangleMesaInclude,lib,vtkstd}
cp vtkConfigure.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp vtkToolkits.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp vtk*Instantiator.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/expat/expat.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/expat/expatDllConfig.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/zlib/zlib.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/zlib/zconf.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/zlib/zlibDllConfig.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiffio.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiff.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiffvers.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tconf.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiffDllConfig.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Common/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Common
cp Filtering/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Filtering
cp Graphics/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Graphics
cp Hybrid/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Hybrid
cp IO/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/IO
cp Imaging/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Imaging
cp Rendering/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Rendering
cp MangleMesaInclude/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/MangleMesaInclude
cp bin/*.so $VISITDIR/vtk/2004.03.23a/$VISITARCH/lib
cp vtkstd/* $VISITDIR/vtk/2004.03.23a/$VISITARCH/vtkstd
mkdir $VISITDIR/vtk/5.0.0a
mkdir $VISITDIR/vtk/5.0.0a/$VISITARCH
mkdir $VISITDIR/vtk/5.0.0a/$VISITARCH/{Common,Filtering,GenericFiltering,Graphics,Hybrid,IO,Imaging,MangleMesaInclude,Rendering,Utilities,VolumeRendering,lib,vtkstd,Utilities/vtktiff,Utilities/vtkexpat,Utilities/vtkzlib}
cp vtkConfigure.h $VISITDIR/vtk/5.0.0a/$VISITARCH
cp vtkToolkits.h $VISITDIR/vtk/5.0.0a/$VISITARCH
cp vtk*Instantiator.h $VISITDIR/vtk/5.0.0a/$VISITARCH
cp Common/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Common
cp Common/*.txx $VISITDIR/vtk/5.0.0a/$VISITARCH/Common
cp Filtering/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Filtering
cp Filtering/*.txx $VISITDIR/vtk/5.0.0a/$VISITARCH/Filtering
cp GenericFiltering/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/GenericFiltering
cp Graphics/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Graphics
cp Hybrid/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Hybrid
cp IO/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/IO
cp Imaging/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Imaging
cp Rendering/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Rendering
cp Utilities/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Utilities
cp Utilities/vtktiff/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Utilities/vtktiff
cp Utilities/vtkexpat/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Utilities/vtkexpat
cp Utilities/vtkzlib/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/Utilities/vtkzlib
cp VolumeRendering/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/VolumeRendering
cp MangleMesaInclude/*.h $VISITDIR/vtk/5.0.0a/$VISITARCH/MangleMesaInclude
cp vtkstd/* $VISITDIR/vtk/5.0.0a/$VISITARCH/vtkstd
cp -d bin/*.so* $VISITDIR/vtk/5.0.0a/$VISITARCH/lib
# For IRIX, solaris
# cp -R bin/*.so* $VISITDIR/vtk/5.0.0a/$VISITARCH/lib
# For true64,
# cp bin/*.so $VISITDIR/vtk/5.0.0a/$VISITARCH/lib
cd ..
#
......
......@@ -4114,6 +4114,10 @@ avtGenericDatabase::AddOriginalNodesArray(vtkDataSet *ds, const int domain)
// Hank Childs, Thu Jan 12 14:49:44 PST 2006
// Make warning also include domain number.
//
// Kathleen Bonnell, Tue May 16 09:41:46 PDT 2006
// Removed call to SetSource(NULL), with new vtk pipeline, it also removes
// necessary information from the dataset.
//
// ****************************************************************************
avtDataTree_p
......@@ -4258,7 +4262,8 @@ avtGenericDatabase::MaterialSelect(vtkDataSet *ds, avtMaterial *mat,
bf->Update();
out_ds[d]->Register(NULL);
out_ds[d]->SetSource(NULL);
// Using SetSource(NULL) on vtkDataSets no longer a good idea.
//out_ds[d]->SetSource(NULL);
bf->Delete();
if (out_ds != NULL && out_ds[d]->GetNumberOfCells() == 0)
......
......@@ -1528,6 +1528,12 @@ avtPosCMFEAlgorithm::FastLookupGrouping::GetValueUsingList(vector<int> &list,
// Programmer: Hank Childs
// Creation: October 12, 2005
//
// Modifications:
// Kathleen Bonnell, Tue May 16 09:41:46 PDT 2006
// Changed GetNumberOfInputs to GetTotalNumberOfInputConnections, due to
// VTK api changes. Removed call to SetSource(NULL) as it also removes
// necessary information from the dataset.
//
// ****************************************************************************
void
......@@ -1637,7 +1643,7 @@ avtPosCMFEAlgorithm::FastLookupGrouping::RelocateDataUsingPartition(
char **msg_tmp = new char *[nProcs];
for (j = 0 ; j < nProcs ; j++)
{
if (appenders[j]->GetNumberOfInputs() == 0)
if (appenders[j]->GetTotalNumberOfInputConnections() == 0)
{
sendcount[j] = 0;
msg_tmp[j] = NULL;
......@@ -1711,7 +1717,8 @@ avtPosCMFEAlgorithm::FastLookupGrouping::RelocateDataUsingPartition(
vtkUnstructuredGrid *ugrid = reader->GetOutput();
ugrid->Update();
AddMesh(ugrid);
ugrid->SetSource(NULL);
// using SetSource(NULL) on vtkDataSets is no longer a good idea.
//ugrid->SetSource(NULL);
reader->Delete();
charArray->Delete();
}
......
......@@ -105,6 +105,10 @@ avtRevolvedSurfaceArea::PreExecute(void)
// Kathleen Bonnell, Tue Feb 7 14:14:33 PST 2006
// Changed GetLineArea call to GetCellArea.
//
// Kathleen Bonnell, Tue May 16 09:41:46 PDT 2006
// Removed call to SetSource(NULL), with new vtk pipeline, it also removes
// necessary information from the dataset.
//
// ****************************************************************************
vtkDataArray *
......@@ -149,7 +153,8 @@ avtRevolvedSurfaceArea::DeriveVariable(vtkDataSet *in_ds)
boundaryFilter->GetOutput()->Update();
allLines = boundaryFilter->GetOutput();
allLines->SetSource(NULL);
// using SetSource(NULL) for vtkDataSets no longer a good idea.
//allLines->SetSource(NULL);
}
else if (tmp_ds->GetDataObjectType() == VTK_POLY_DATA)
{
......@@ -159,7 +164,8 @@ avtRevolvedSurfaceArea::DeriveVariable(vtkDataSet *in_ds)
{
geomFilter->SetInput(tmp_ds);
allLines = geomFilter->GetOutput();
allLines->SetSource(NULL);
// using SetSource(NULL) for vtkDataSets no longer a good idea.
//allLines->SetSource(NULL);
}
//
......
......@@ -12,6 +12,7 @@
#include <vtkCellData.h>
#include <vtkCellDataToPointData.h>
#include <vtkDataSetWriter.h>
#include <vtkInformation.h>
#include <vtkFloatArray.h>
#include <vtkOBJWriter.h>
#include <vtkPointData.h>
......@@ -710,6 +711,12 @@ avtDatasetFileWriter::CreateFilename(const char *base, bool family,
// Programmer: Hank Childs
// Creation: May 26, 2002
//
// Modificatons:
// Kathleen Bonnell, Wed May 17 14:44:08 PDT 2006
// Changed GetNumberOfInputs to GetTotalNumberOfInputConnections. Can
// no longer call 'GetInputs' on vtkAppendFillter, must get individual port
// info, then the dataset from the info.
//
// ****************************************************************************
vtkDataSet *
......@@ -732,17 +739,20 @@ avtDatasetFileWriter::GetSingleDataset(void)
dt->Traverse(CAddInputToAppendFilter, &pmap, dummy);
}
if (pmap.af->GetNumberOfInputs() > 1 && pmap.pf->GetNumberOfInputs() > 1)
if (pmap.af->GetTotalNumberOfInputConnections() > 1 &&
pmap.pf->GetTotalNumberOfInputConnections() > 1)
{
//
// We have inputs that are unstructured and poly data. Put them all
// into the unstructured grid.
//
int numInputs = pmap.pf->GetNumberOfInputs();
vtkDataObject **list = pmap.pf->GetInputs();
int numInputs = pmap.pf->GetTotalNumberOfInputConnections();
vtkInformation *inInfo;
for (int i = 0 ; i < numInputs ; i++)
{
pmap.af->AddInput((vtkDataSet *) list[i]);
inInfo = pmap.pf->GetInputPortInformation(i);
pmap.af->AddInput(vtkPolyData::SafeDownCast(
inInfo->Get(vtkDataObject::DATA_OBJECT())));
}
pmap.pf->RemoveAllInputs();
}
......@@ -752,9 +762,9 @@ avtDatasetFileWriter::GetSingleDataset(void)
// or in the poly data append filter (from logic above).
//
vtkDataSet *rv = NULL;
if (pmap.af->GetNumberOfInputs() > 1)
if (pmap.af->GetTotalNumberOfInputConnections() > 1)
{
if (pmap.af->GetNumberOfInputs() == 1)
if (pmap.af->GetTotalNumberOfInputConnections() == 1)
{
rv = pmap.af->GetInput();
}
......@@ -765,7 +775,7 @@ avtDatasetFileWriter::GetSingleDataset(void)
}
else
{
if (pmap.pf->GetNumberOfInputs() == 1)
if (pmap.pf->GetTotalNumberOfInputConnections() == 1)
{
rv = pmap.pf->GetInput();
}
......
......@@ -5,6 +5,7 @@
#include <avtImageFileWriter.h>
#include <vtkBMPWriter.h>
#include <vtkImageData.h>
#include <vtkJPEGWriter.h>
#include <vtkVisItTIFFWriter.h>
#include <vtkPostScriptWriter.h>
......
......@@ -10,6 +10,8 @@
#include <vtkCellData.h>
#include <vtkCellDataToPointData.h>
#include <vtkDataSet.h>
#include <vtkExecutive.h>
#include <vtkFloatArray.h>
#include <vtkPointData.h>
#include <vtkPolyData.h>
......@@ -474,6 +476,10 @@ avtContourFilter::PreExecute(void)
// Instantiate cd2pd here inside this routine rather than using a data
// member.
//
// Kathleen Bonnell, Tue May 16 09:57:29 PDT 2006
// VTK pipeline changes: no more SetOutput method for filters, instead
// SetOutputData for the filter's Executive.
//
// ****************************************************************************
avtDataTree_p
......@@ -517,7 +523,7 @@ avtContourFilter::ExecuteDataTree(vtkDataSet *in_ds, int domain, string label)
new_in_ds->GetCellData()->AddArray(cellVar);
vtkCellDataToPointData *cd2pd = vtkCellDataToPointData::New();
cd2pd->SetInput(new_in_ds);
cd2pd->SetOutput(toBeContoured);
cd2pd->GetExecutive()->SetOutputData(0, toBeContoured);
cd2pd->Update();
for (i = 0 ; i < in_ds->GetPointData()->GetNumberOfArrays() ; i++)
{
......
......@@ -499,6 +499,10 @@ avtFacelistFilter::Take3DFaces(vtkDataSet *in_ds, int domain)
// Hank Childs, Fri Mar 11 08:11:03 PST 2005
// Instantiate VTK filters on the fly.
//
// Kathleen Bonnell, Wed May 17 14:44:08 PDT 2006
// Remove call to SetSource(NULL) as it now removes information necessary
// for the dataset.
//
// ****************************************************************************
vtkDataSet *
......@@ -537,7 +541,7 @@ avtFacelistFilter::Take2DFaces(vtkDataSet *in_ds)
rf->SetOutput(out_ds);
out_ds->Update();
rf->SetOutput(NULL);
out_ds->SetSource(NULL);
//out_ds->SetSource(NULL);
rf->Delete();
}
else if (dstype == VTK_STRUCTURED_GRID)
......
......@@ -9,6 +9,7 @@
#include <vtkCellData.h>
#include <vtkCellDataToPointData.h>
#include <vtkDataSet.h>
#include <vtkExecutive.h>
#include <vtkPointData.h>
#include <vtkPointDataToCellData.h>
#include <vtkPolyData.h>
......@@ -107,6 +108,10 @@ avtShiftCenteringFilter::~avtShiftCenteringFilter()
// Hank Childs, Fri Aug 27 16:02:58 PDT 2004
// Rename ghost data array. Also add support for ghost nodes.
//
// Kathleen Bonnell, Wed May 17 15:08:39 PDT 2006
// Can no longer use SetOutput on a vtk filter, must grab the filters'
// executive and SetOuputData.
//
// ****************************************************************************
vtkDataSet *
......@@ -126,7 +131,7 @@ avtShiftCenteringFilter::ExecuteData(vtkDataSet *inDS, int, std::string)
//
vtkCellDataToPointData *cd2pd = vtkCellDataToPointData::New();
cd2pd->SetInput(inDS);
cd2pd->SetOutput(outDS);
cd2pd->GetExecutive()->SetOutputData(0, outDS);
cd2pd->Update();
cd2pd->Delete();
......@@ -162,7 +167,7 @@ avtShiftCenteringFilter::ExecuteData(vtkDataSet *inDS, int, std::string)
vtkPointDataToCellData *pd2cd = vtkPointDataToCellData::New();
pd2cd->SetInput(inDS);
pd2cd->SetOutput(outDS);
pd2cd->GetExecutive()->SetOutputData(0, outDS);
pd2cd->Update();
pd2cd->Delete();
......
......@@ -109,6 +109,10 @@ avtVertexNormalsFilter::~avtVertexNormalsFilter()
// Break all memory references. I didn't think this was necessary, but
// the data wouldn't delete until I did this.
//
// Kathleen Bonnell, Tue May 16 09:41:46 PDT 2006
// Removed call to SetSource(NULL), with new vtk pipeline, it also removes
// necessary information from the dataset.
//
// ****************************************************************************
vtkDataSet *
......@@ -157,7 +161,7 @@ avtVertexNormalsFilter::ExecuteData(vtkDataSet *in_ds, int, std::string)
vtkPolyData *out_ds = normals->GetOutput();
out_ds->Register(NULL);
out_ds->SetSource(NULL);
//out_ds->SetSource(NULL);
ManageMemory(out_ds);
out_ds->Delete();
normals->Delete();
......
......@@ -485,6 +485,10 @@ CUpdateData(avtDataRepresentation &data, void *, bool &modified)
// Hank Childs, Tue Sep 25 09:32:26 PDT 2001
// Add check for no cells.
//
// Kathleen Bonnell, Wed May 17 14:51:16 PDT 2006
// Remove call to SetSource(NULL) as it now removes information necessary
// to the dataset.
//
// ****************************************************************************
void
......@@ -513,7 +517,8 @@ CAddInputToAppendFilter(avtDataRepresentation & data, void *arg, bool &)
pmap = (struct map *) arg;
ds->SetSource(NULL);
// using SetSource(NULL) no longer a good idea.
//ds->SetSource(NULL);
//
// We only want to use the append filters on poly data or
......
......@@ -558,6 +558,11 @@ avtDataRepresentation::GetDataString(int &length, DataSetType &dst, bool compres
//
// Mark C. Miller, Wed Nov 16 14:17:01 PST 2005
// Added compression
//
// Kathleen Bonnell, Wed May 17 14:51:16 PDT 2006
// Removed call to SetSource(NULL) as it now removes information necessary
// to the dataset.
//
// ****************************************************************************
vtkDataSet *
......@@ -662,7 +667,7 @@ avtDataRepresentation::GetDataVTK(void)
}
asVTK->Register(NULL);
asVTK->SetSource(NULL);
//asVTK->SetSource(NULL);
reader->Delete();
charArray->Delete();
originalString = NULL;
......
......@@ -444,7 +444,6 @@ avtImageRepresentation::GetImageVTK(void)
{
EXCEPTION0(NoInputException);
}
GetImageFromString(asChar, asCharLength, asVTK, zbuffer);
if (zbuffer != NULL)
{
......@@ -690,6 +689,11 @@ CreateStringFromVTKInput(vtkImageData *img, unsigned char *&str, int &len)
//
// Mark C. Miller, Wed Nov 16 14:17:01 PST 2005
// Changed to use common data function for compression
//
// Kathleen Bonnell, Wed May 17 14:51:16 PDT 2006
// Removed call to SetSource(NULL) as it now removes information necessary
// for the dataset.
//
// ****************************************************************************
void avtImageRepresentation::GetImageFromString(unsigned char *str,
......@@ -720,8 +724,12 @@ void avtImageRepresentation::GetImageFromString(unsigned char *str,
reader->SetInputArray(charArray);
img = reader->GetOutput();
img->Update();
img->SetScalarType(VTK_UNSIGNED_CHAR);
img->Register(NULL);
img->SetSource(NULL);
// calling SetSource sets' PipelineInformation to NULL, and then
// vtkImageData no longer knows its scalar data type, and who knows
// what else.
//img->SetSource(NULL);
reader->Delete();
charArray->Delete();
......
......@@ -96,6 +96,9 @@ avtCompactTreeFilter::avtCompactTreeFilter()
// Account for tolerance when cleaning poly data. Also add logic for doing
// a parallel merge.
//
// Kathleen Bonnell, Wed May 17 14:51:16 PDT 2006
// Changed GetNumberofInputs to GetTotalNumberOfInputConnections.
//
// ****************************************************************************
void
......@@ -205,8 +208,8 @@ avtCompactTreeFilter::Execute(void)
pmap->polyFilter = vtkAppendPolyData::New();
inTree->Traverse(CAddInputToAppendFilter, pmap, dummy);
vtkDataSet *ds;
int nPolyInput = pmap->polyFilter->GetNumberOfInputs();
int nUGridInput = pmap->filter->GetNumberOfInputs();
int nPolyInput = pmap->polyFilter->GetTotalNumberOfInputConnections();
int nUGridInput = pmap->filter->GetTotalNumberOfInputConnections();
//
// 2D datasets sometimes have sgrids and ugrids/pdata
// so don't use filter output unless we've accounted for
......@@ -306,14 +309,14 @@ avtCompactTreeFilter::Execute(void)
pmap->filter = filters[i];
pmap->polyFilter = polyFilters[i];
child->Traverse(CAddInputToAppendFilter, pmap, dummy);
if (filters[i]->GetNumberOfInputs() > 1)
if (filters[i]->GetTotalNumberOfInputConnections() > 1)
{
ds[i] = vtkUnstructuredGrid::New();
filters[i]->SetOutput((vtkUnstructuredGrid*)ds[i]);
filters[i]->Update();
temp[i] = new avtDataTree(ds[i], -1, newLabels[i]);
}
else if (polyFilters[i]->GetNumberOfInputs() > 1)
else if (polyFilters[i]->GetTotalNumberOfInputConnections() > 1)
{
ds[i] = vtkPolyData::New();
polyFilters[i]->SetOutput((vtkPolyData*)ds[i]);
......
......@@ -131,6 +131,10 @@ avtDataTreeStreamer::Execute(void)
// Hank Childs, Sat Jan 5 10:31:48 PST 2002
// Fix memory leak.
//
// Kathleen Bonnell, Tue May 16 09:41:46 PDT 2006
// Removed call to SetSource(NULL), with new vtk pipeline, it also removes
// necessary information from the dataset.
//
// ****************************************************************************
avtDataTree_p
......@@ -163,7 +167,8 @@ avtDataTreeStreamer::Execute(avtDataTree_p inDT)
// Setting the source to NULL for the input will break the
// pipeline.
//
in_ds->SetSource(NULL);
// NO LONGER A GOOD IDEA
//in_ds->SetSource(NULL);
//
// We own the returned dataset because you cannot delete it if
......
......@@ -159,6 +159,8 @@ avtGeometryDrawable::Add(vtkRenderer *ren)
// Added a trick/hack to allow actors to be removed from a window without
// affecting their display lists.
//
// Kathleen Bonnell, Wed May 17 15:08:39 PDT 2006
// GetProps->RemoveItem has been deprecated, use GetViewProps->RemoveItem.
// ****************************************************************************
void
......@@ -190,7 +192,7 @@ avtGeometryDrawable::Remove(vtkRenderer *ren)
//
ren->GetActors()->RemoveItem(actors[i]);
actors[i]->RemoveConsumer(ren);
ren->GetProps()->RemoveItem(actors[i]);
ren->GetViewProps()->RemoveItem(actors[i]);
}
}
renderer = NULL;
......
......@@ -689,6 +689,10 @@ avtTransparencyActor::AddToRenderer(vtkRenderer *ren)
// Programmer: Hank Childs
// Creation: July 9, 2002
//
// Modifications:
// Kathleen Bonnell, Wed May 17 15:08:39 PDT 2006
// GetProps->RemoveItem has been deprecated, use GetViewProps.
//
// ****************************************************************************
void
......@@ -711,7 +715,7 @@ avtTransparencyActor::RemoveFromRenderer(vtkRenderer *ren)
//
ren->GetActors()->RemoveItem(myActor);
myActor->RemoveConsumer(ren);
ren->GetProps()->RemoveItem(myActor);
ren->GetViewProps()->RemoveItem(myActor);
}
......@@ -744,6 +748,8 @@ avtTransparencyActor::RemoveFromRenderer(vtkRenderer *ren)
// needed an update, and it needed unification in parallel. Honor
// the suspension of transparent rendering for two-pass mode.
//
// Kathleen Bonnell, Wed May 17 15:08:39 PDT 2006
/// Ensure that appender has non-NULL input (can have empty input, not NULL).
// ****************************************************************************
void
......@@ -752,6 +758,7 @@ avtTransparencyActor::SetUpActor(void)
appender->RemoveAllInputs();
int numActors = datasets.size();
vtkActor *repActor = NULL;
bool addedInput = false;
for (int i = 0 ; i < numActors ; i++)
{
if (useActor[i] && visibility[i] == true)
......@@ -762,6 +769,7 @@ avtTransparencyActor::SetUpActor(void)
PrepareDataset(i, j);
if (preparedDataset[i][j] != NULL)
{
addedInput = true;
appender->AddInput(preparedDataset[i][j]);
repActor = actors[i][j];
}
......@@ -769,6 +777,17 @@ avtTransparencyActor::SetUpActor(void)
}
}
//
// VTK pipeline now requires its filters to have non-null inputs.
//
if (!addedInput)
{
// use empty input?
vtkPolyData *pd = vtkPolyData::New();
appender->AddInput(pd);
pd->Delete();
}
// Force the appender to update; this is needed in parallel SR mode
// because all processors need to re-execute the pipeline, and if
// not all processors have data then they might not re-execute.
......
......@@ -79,6 +79,11 @@ avtStreamerPreprocessor::Preprocess(void)
// Programmer: Hank Childs
// Creation: September 9, 2001
//
// Modifications:
// Kathleen Bonnell, Wed May 17 15:15:24 PDT 2006
// Remove call to SetSource(NULL) as it now removes information necessary
// for the dataset.
//
// ****************************************************************************
void
......@@ -107,7 +112,8 @@ avtStreamerPreprocessor::PreprocessTree(avtDataTree_p tree)
//
// Ensure that there is no funny business when we do an Update.
//
in_ds->SetSource(NULL);
// NO LONGER A GOOD IDEA
//in_ds->SetSource(NULL);
ProcessDomain(in_ds, dom);
}
......
......@@ -160,6 +160,11 @@ avtDatasetQuery::PerformQuery(QueryAttributes *qA)
// Programmer: Kathleen Bonnell
// Creation: November 15, 2002
//
// Modifications:
<