Commit 753c2260 authored by hrchilds's avatar hrchilds

Update from January 24, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@162 18c085ea-50e0-402c-830e-de6fd14e8384
parent e2d2f7f3
......@@ -495,6 +495,9 @@ avtDatabase::GetMostRecentTimestep(void) const
// Hank Childs, Tue Nov 25 07:38:18 PST 2003
// Add mesh quality expressions.
//
// Hank Childs, Thu Jan 22 10:05:41 PST 2004
// Do not populate the I/O information if we are only getting meta-data.
//
// ****************************************************************************
void
......@@ -522,8 +525,11 @@ avtDatabase::GetNewMetaData(int timeState)
AddMeshQualityExpressions(md);
PopulateIOInformation(ioInfo);
gotIOInfo = true;
if (! OnlyServeUpMetaData())
{
PopulateIOInformation(ioInfo);
gotIOInfo = true;
}
// put the metadata at the front of the MRU cache
CachedMDEntry tmp = {md, timeState};
......
# Copyright 1991 - 2001
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#
# DISCLAIMER
#
# This software was prepared as an account of work sponsored by an agency of
# the United States Government. Neither the United States Government nor the
# University of California nor any of their employees, makes any warranty,
# express or implied, or assumes any liability or responsiblity for the
# accuracy, completeness, or usefullness of any information, apparatus,
# product, or process disclosed, or represents that its use would not infringe
# privately owned rights. Reference herein to any specific commercial
# products, process, or service by trade name, trademark, manufacturer, or
# otherwise, does not necessarily constitute or imply its endorsement,
# recommendation, or favoring by the United States Government or the
# University of California. The views and opinions of authors expressed herein
# do not necessarily state or reflect those of the United States Government or
# the University of California, and shall not be used for advertising or
# product endorsement purposes.
#
# Modifications:
#
# Hank Childs, Thu Jan 22 14:28:06 PST 2004
# Created.
#
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
##
## Files...
##
SRC=avtImageFileWriter.C avtDatasetFileWriter.C avtFileWriter.C
CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libavtwriter
LIBS=-ldbatts -lpipeline_ser -lavtexceptions -lvisit_vtk -lmisc -lstate -lutility @VTK_LIBS@ $(X_LIBS)
##
## Standard targets...
##
all: $(LIBSHARED)
clean:
$(RM) $(OBJ) $(LIBSHARED)
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
# Copyright 2001-2001
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#
# DISCLAIMER
#
# This software was prepared as an account of work sponsored by an agency of
# the United States Government. Neither the United States Government nor the
# University of California nor any of their employees, makes any warranty,
# express or implied, or assumes any liability or responsiblity for the
# accuracy, completeness, or usefullness of any information, apparatus,
# product, or process disclosed, or represents that its use would not infringe
# privately owned rights. Reference herein to any specific commercial
# products, process, or service by trade name, trademark, manufacturer, or
# otherwise, does not necessarily constitute or imply its endorsement,
# recommendation, or favoring by the United States Government or the
# University of California. The views and opinions of authors expressed herein
# do not necessarily state or reflect those of the United States Government or
# the University of California, and shall not be used for advertising or
# product endorsement purposes.
#
#
# Modifications:
#
# Hank Childs, Thu Jan 22 13:29:23 PST 2004
# Moved all files from the former Pipeline/PublicFilters to this directory.
#
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
@MPI_CC@
@MPI_CXX@
##
## Files...
##
SRC=avtCondenseDatasetFilter.C avtContourFilter.C \
avtCoordSystemConvert.C avtCurrentExtentFilter.C avtCurveConstructorFilter.C \
avtFacelistFilter.C avtFeatureEdgesFilter.C avtGhostZoneAndFacelistFilter.C \
avtGhostZoneFilter.C avtImageCommunicator.C avtImageCompositer.C \
avtPointToGlyphFilter.C avtRayCompositer.C avtRayTracer.C \
avtResampleFilter.C avtSamplePointCommunicator.C avtSamplePointExtractor.C \
avtSamplePointToSurfaceFilter.C avtShiftCenteringFilter.C \
avtSimilarityTransformFilter.C avtSmoothPolyDataFilter.C \
avtSummationFilter.C avtTransform.C avtVertexNormalsFilter.C \
avtWholeImageCompositer.C avtWorldSpaceToImageSpaceTransform.C
CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=_ser.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtfilters
##
## Standard targets...
##
all: $(LIBSHAREDSER) @LIBSHAREDPAR@
clean:
$(RM) $(SEROBJ) $(PAROBJ) $(LIBSHAREDSER) @LIBSHAREDPAR@
##
## Automatic dependency stuff
##
@TARGETS@
@PARLIBTARGETS@
......@@ -65,6 +65,9 @@
# Jeremy Meredith, Wed Aug 20 10:20:34 PDT 2003
# Added MIR library.
#
# Hank Childs, Thu Jan 22 13:42:41 PST 2004
# Added Filters, FileWriter, and View libraries.
#
##############################################################################
@SET_MAKE@
......@@ -72,7 +75,7 @@
@DIRTARGETS@
SUBDIRS=Exceptions DBAtts Math Pipeline MIR \
Expressions Queries Database Plotter \
Expressions Queries Database Plotter Filters FileWriter View \
@VISWINDOW@
message:
......
......@@ -644,54 +644,6 @@ CAddInputToAppendFilter(avtDataRepresentation & data, void *arg, bool &)
}
// ****************************************************************************
// Method: CSetMapperInput
//
// Purpose:
// Sets the input to vtkMappers.
//
// Arguments:
// data The data to use as input to the mappers.
// arg Mappers and other necessary info.
// <unused>
//
// Notes:
// This method is designed to be used as the function parameter of
// avtDataTree::Iterate.
//
// Programmer: Kathleen Bonnell
// Creation: April 18, 2001
//
// ****************************************************************************
void
CSetMapperInput(avtDataRepresentation & data, void *arg, bool &)
{
if (!data.Valid())
{
EXCEPTION0(NoInputException);
}
struct map
{
int index;
int nleaves;
int nmodes;
vtkDataSetMapper **mappers;
} *pmap;
pmap = (struct map *) arg;
vtkDataSet *ds = data.GetDataVTK();
for (int i = 0; i < pmap->nmodes; i++)
{
pmap->mappers[pmap->index + pmap->nleaves *i]->SetInput(ds);
}
pmap->index++;
}
// ****************************************************************************
// Method: CGetChunkByDomain
//
......
......@@ -40,6 +40,9 @@ class vtkDataArray;
// Brad Whitlock, Wed Dec 4 11:48:33 PDT 2002
// I added CGetDataMagnitudeExtents and GetDataMagnitudeRange.
//
// Hank Childs, Thu Jan 22 15:42:54 PST 2004
// Removed unused CSetMapperInput.
//
// ****************************************************************************
//
......@@ -53,7 +56,6 @@ PIPELINE_API void CGetNodeCenteredDataExtents(avtDataRepresentation &, void *, b
PIPELINE_API void CUpdateData(avtDataRepresentation &, void *, bool &);
PIPELINE_API void CAddInputToAppendFilter(avtDataRepresentation &, void *, bool &);
PIPELINE_API void CGetNumberOfZones(avtDataRepresentation &, void *, bool &);
PIPELINE_API void CSetMapperInput(avtDataRepresentation &, void *, bool &);
PIPELINE_API void CGetChunkByDomain(avtDataRepresentation &, void *, bool &);
PIPELINE_API void CGetChunkByLabel(avtDataRepresentation &, void *, bool &);
PIPELINE_API void CSetActiveVariable(avtDataRepresentation &, void *, bool &);
......
......@@ -4,7 +4,6 @@
#include <vtkCharArray.h>
#include <vtkFloatArray.h>
#include <vtkImageClip.h>
#include <vtkImageData.h>
#include <vtkPointData.h>
#include <vtkStructuredPoints.h>
......@@ -554,26 +553,26 @@ CreateStringFromInput(vtkImageData *img, float *zbuffer, unsigned char *&str,
// Programmer: Hank Childs
// Creation: February 13, 2001
//
// Modifications:
//
// Hank Childs, Thu Jan 22 15:57:19 PST 2004
// Remove image clip because it has a dependence on vtkImaging library.
//
// ****************************************************************************
void
CreateStringFromVTKInput(vtkImageData *img, unsigned char *&str, int &len)
{
//
// Technique for writing image to a string stolen from
// vtkMultiProcessController.
// Keep Update from propagating.
//
vtkImageData *tmp = vtkImageData::New();
vtkImageData *tmp = vtkImageData::New();
tmp->ShallowCopy(img);
vtkImageClip *clip = vtkImageClip::New();
clip->SetInput(tmp);
clip->SetOutputWholeExtent(img->GetExtent());
vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
writer->SetFileTypeToBinary();
writer->WriteToOutputStringOn();
writer->SetInput(clip->GetOutput());
writer->SetInput(tmp);
writer->SetFileTypeToBinary();
writer->Write();
......@@ -581,7 +580,6 @@ CreateStringFromVTKInput(vtkImageData *img, unsigned char *&str, int &len)
str = (unsigned char *) writer->RegisterAndGetOutputString();
writer->Delete();
clip->Delete();
tmp->Delete();
}
......
......@@ -162,14 +162,18 @@
# Hank Childs, Sun Dec 14 11:05:37 PST 2003
# Added avtMassVoxelExtractor.
#
# Hank Childs, Thu Jan 22 13:27:30 PST 2004
# Removed PublicFilters, which went one level up as "Filters".
# Also removed FileWriters and View objects.
#
##############################################################################
@SET_MAKE@
@VARIABLES@
SUBDIRS=Data Pipeline PrivateFilters PublicFilters Sinks Sources
SUBDIRS=Data Pipeline PrivateFilters Sinks Sources
SRC=$(Data_src) $(MeshQuality_src) $(Pipeline_src) $(PrivateFilters_src) \
$(PublicFilters_src) $(Sinks_src) $(Sources_src)
$(Sinks_src) $(Sources_src)
Data_src= \
Data/avtAverageValueRF.C \
......@@ -219,10 +223,6 @@ Data_src= \
Data/avtSpecies.C \
Data/avtTetrahedronExtractor.C \
Data/avtVariablePixelizer.C \
Data/avtView2D.C \
Data/avtView3D.C \
Data/avtViewCurve.C \
Data/avtViewInfo.C \
Data/avtVolume.C \
Data/avtWedgeExtractor.C
......@@ -241,6 +241,7 @@ Pipeline_src= \
Pipeline/avtPipelineSpecification.C
PrivateFilters_src= \
PrivateFilters/avtCompactTreeFilter.C \
PrivateFilters/avtDataObjectToDatasetFilter.C \
PrivateFilters/avtDataTreeStreamer.C \
PrivateFilters/avtDatasetToDataObjectFilter.C \
......@@ -254,42 +255,10 @@ PrivateFilters_src= \
PrivateFilters/avtSingleFilterFacade.C \
PrivateFilters/avtStreamer.C
PublicFilters_src= \
PublicFilters/avtCompactTreeFilter.C \
PublicFilters/avtCondenseDatasetFilter.C \
PublicFilters/avtContourFilter.C \
PublicFilters/avtCoordSystemConvert.C \
PublicFilters/avtCurrentExtentFilter.C \
PublicFilters/avtCurveConstructorFilter.C \
PublicFilters/avtFacelistFilter.C \
PublicFilters/avtFeatureEdgesFilter.C \
PublicFilters/avtGhostZoneAndFacelistFilter.C \
PublicFilters/avtGhostZoneFilter.C \
PublicFilters/avtImageCommunicator.C \
PublicFilters/avtImageCompositer.C \
PublicFilters/avtPointToGlyphFilter.C \
PublicFilters/avtRayCompositer.C \
PublicFilters/avtRayTracer.C \
PublicFilters/avtResampleFilter.C \
PublicFilters/avtSamplePointCommunicator.C \
PublicFilters/avtSamplePointExtractor.C \
PublicFilters/avtSamplePointToSurfaceFilter.C \
PublicFilters/avtShiftCenteringFilter.C \
PublicFilters/avtSimilarityTransformFilter.C \
PublicFilters/avtSmoothPolyDataFilter.C \
PublicFilters/avtSummationFilter.C \
PublicFilters/avtTransform.C \
PublicFilters/avtVertexNormalsFilter.C \
PublicFilters/avtWholeImageCompositer.C \
PublicFilters/avtWorldSpaceToImageSpaceTransform.C
Sinks_src= \
Sinks/avtDataObjectSink.C \
Sinks/avtDatabaseWriter.C \
Sinks/avtDatasetSink.C \
Sinks/avtDatasetFileWriter.C \
Sinks/avtFileWriter.C \
Sinks/avtImageFileWriter.C \
Sinks/avtImageSink.C \
Sinks/avtMultipleInputSink.C \
Sinks/avtNullDataSink.C \
......
# This is the makefile for a subdirectory of a library which is built
# from source files split across multiple subdirectories
#
# Modified:
# Jeremy Meredith, Wed Jul 3 14:05:25 PDT 2002
# Made it use braces for the PWD environment variable, helping portability.
#
DIR=`basename ${PWD}`
all:
(cd .. && $(MAKE) $(DIR)_obj)
(cd .. && $(MAKE) all)
# Copyright 1991 - 2001
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#
# DISCLAIMER
#
# This software was prepared as an account of work sponsored by an agency of
# the United States Government. Neither the United States Government nor the
# University of California nor any of their employees, makes any warranty,
# express or implied, or assumes any liability or responsiblity for the
# accuracy, completeness, or usefullness of any information, apparatus,
# product, or process disclosed, or represents that its use would not infringe
# privately owned rights. Reference herein to any specific commercial
# products, process, or service by trade name, trademark, manufacturer, or
# otherwise, does not necessarily constitute or imply its endorsement,
# recommendation, or favoring by the United States Government or the
# University of California. The views and opinions of authors expressed herein
# do not necessarily state or reflect those of the United States Government or
# the University of California, and shall not be used for advertising or
# product endorsement purposes.
#
# Modifications:
#
# Hank Childs, Thu Jan 22 16:28:06 PST 2004
# Created.
#
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
##
## Files...
##
SRC=avtView2D.C avtView3D.C avtViewCurve.C avtViewInfo.C
CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libavtview
LIBS=-lavtexceptions -lvisit_vtk @VTK_LIBS@
##
## Standard targets...
##
all: $(LIBSHARED)
clean:
$(RM) $(OBJ) $(LIBSHARED)
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
......@@ -2403,6 +2403,7 @@ echo "${ECHO_T}found" >&6
VTK_INCROOT="$""(TOPDIR)/include/vtk"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/Common -I$VTK_INCROOT/Filtering -I$VTK_INCROOT/Graphics -I$VTK_INCROOT/Hybrid -I$VTK_INCROOT/IO -I$VTK_INCROOT/Imaging -I$VTK_INCROOT/Rendering"
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype $GL_LIBS $MESA_LIBS"
VTK_LIGHTWEIGHT_LIBS="-lvtkCommon -lvtkFiltering -lvtkzlib"
# If we're on Darwin, we took VisIt's vtkCamera and built it into the VTK library so
# we don't want to put it into the visit_vtk library or else we'll get duplicate
......@@ -2418,6 +2419,7 @@ echo "${ECHO_T}not found" >&6
VTK_DIR=""
VTK_INCLUDES=""
VTK_LIBS=""
VTK_LIGHTWEIGHT_LIBS=""
VTK_CAMERA_SRC=""
fi
......@@ -2425,6 +2427,7 @@ fi
#
# Check for the common directory
#
......@@ -8060,7 +8063,7 @@ else
HDF4_FLAGS="-I$DEFAULT_HDF4_FLAGS $HDF4_FLAGS"