Commit fb96316c authored by ghweber's avatar ghweber

Merged 2.9RC Lineout fix for RectilinearProject2D into trunk

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25676 18c085ea-50e0-402c-830e-de6fd14e8384
parent b79a8a44
......@@ -9,7 +9,7 @@
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /Users/ghweber/devel/visit_3rdparty)
SET(VISITARCH i386-apple-darwin13_clang)
SET(VISITARCH i386-apple-darwin14_clang)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/local/visit)
SET(CMAKE_BUILD_TYPE Release CACHE STRING "")
......@@ -107,9 +107,8 @@ VISIT_OPTION_DEFAULT(SZIP_DIR /opt/local)
##
## Silo
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.10/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP /usr/lib z TYPE STRING)
#VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP})
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR /opt/local)
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} /usr/lib z TYPE STRING)
##
## PySide
......
......@@ -56,6 +56,7 @@
#include <vtkStructuredData.h>
#include <vtkStructuredGrid.h>
#include <avtDatasetExaminer.h>
// ****************************************************************************
// Method: avtRectilinearProject2DFilter constructor
......@@ -446,6 +447,8 @@ avtRectilinearProject2DFilter::Execute()
// Creation: June 6, 2013
//
// Modifications:
// Gunther H. Weber, Mon Feb 9 17:51:33 PST 2015
// Update spatial extents so that Lineout wokrs properly
//
// ****************************************************************************
......@@ -453,7 +456,9 @@ void
avtRectilinearProject2DFilter::PostExecute(void)
{
avtPluginDataTreeIterator::PostExecute();
avtDataAttributes &dataAtts = GetOutput()->GetInfo().GetAttributes();
if (atts.GetMapGrid())
{
dataAtts.SetActiveVariable(pipelineVariable);
......@@ -466,6 +471,15 @@ avtRectilinearProject2DFilter::PostExecute(void)
dataAtts.GetThisProcsOriginalDataExtents(pipelineVariable)->Set(range);
dataAtts.GetThisProcsActualDataExtents(pipelineVariable)->Set(range);
}
// get the outputs's spatial extents
double se[6];
avtDataset_p output = GetTypedOutput();
avtDatasetExaminer::GetSpatialExtents(output, se);
// over-write spatial extents
dataAtts.GetOriginalSpatialExtents()->Clear();
dataAtts.GetThisProcsOriginalSpatialExtents()->Set(se);
}
......@@ -479,6 +493,10 @@ avtRectilinearProject2DFilter::PostExecute(void)
// Programmer: ghweber -- generated by xml2avt
// Creation: Thu Jun 6 15:24:16 PST 2013
//
// Modifications:
// Gunther H. Weber, Mon Feb 9 17:52:02 PST 2015
// Turn on zone and node numbers if necessary
//
// ****************************************************************************
avtContract_p
......@@ -492,6 +510,14 @@ avtRectilinearProject2DFilter::ModifyContract(avtContract_p in_contract)
dataRequest->AddSecondaryVariable("_mapping_ycoord");
}
if (out_contract->GetDataRequest()->MayRequireZones())
{
out_contract->GetDataRequest()->TurnZoneNumbersOn();
}
if (out_contract->GetDataRequest()->MayRequireNodes())
{
out_contract->GetDataRequest()->TurnNodeNumbersOn();
}
return out_contract;
}
......@@ -510,6 +536,9 @@ avtRectilinearProject2DFilter::ModifyContract(avtContract_p in_contract)
// Add filter metadata used in export.
// Work partially supported by DOE Grant SC0007548.
//
// Gunther H. Weber, Mon Feb 9 17:52:35 PST 2015
// Set information about transform to get Lineout to work
//
// ****************************************************************************
void
......@@ -519,6 +548,10 @@ avtRectilinearProject2DFilter::UpdateDataObjectInfo(void)
datts.SetSpatialDimension(2);
datts.SetTopologicalDimension(2);
datts.AddFilterMetaData("RectilinearProject2D");
GetOutput()->GetInfo().GetValidity().SetPointsWereTransformed(true);
GetOutput()->GetInfo().GetAttributes().SetCanUseTransform(false);
GetOutput()->GetInfo().GetAttributes().SetCanUseInvTransform(false);
GetOutput()->GetInfo().GetValidity().InvalidateSpatialMetaData();
GetOutput()->GetInfo().GetValidity().InvalidateDataMetaData();
}
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