Commit 36a9c989 authored by pugmire's avatar pugmire

Merge from 1.12RC


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7987 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3bece470
......@@ -1777,9 +1777,6 @@ avtStreamlineFilter::DomainToRank(DomainType &domain)
//
// Dave Pugmire, Mon Jun 8 2009, 11:44:01 EDT 2009
// Added color by secondary variable. Remove vorticity/ghostzones flags.
//
// Dave Pugmire, Thu Jul 30 20:47:08 PDT 2009
// Move cell centering back to avtStreamlinePlot
//
// ****************************************************************************
......@@ -1796,9 +1793,20 @@ avtStreamlineFilter::IntegrateDomain(avtStreamlineWrapper *slSeg,
// prepare streamline integration ingredients
vtkVisItInterpolatedVelocityField* velocity1 = vtkVisItInterpolatedVelocityField::New();
velocity1->SetDataSet(ds);
// See if we have cell cenetered data...
vtkCellDataToPointData *cellToPt1 = NULL;
if (ds->GetPointData()->GetVectors() == NULL)
{
cellToPt1 = vtkCellDataToPointData::New();
cellToPt1->SetInput(ds);
cellToPt1->Update();
velocity1->SetDataSet(cellToPt1->GetOutput());
}
else
velocity1->SetDataSet(ds);
if (coloringMethod == STREAMLINE_COLOR_VARIABLE)
ds->GetPointData()->SetActiveScalars(coloringVariable.c_str());
......@@ -1888,6 +1896,8 @@ avtStreamlineFilter::IntegrateDomain(avtStreamlineWrapper *slSeg,
slSeg->status = avtStreamlineWrapper::TERMINATE;
velocity1->Delete();
if (cellToPt1)
cellToPt1->Delete();
if (DebugStream::Level5())
debug5<<"::IntegrateDomain() result= "<<result<<endl;
......
......@@ -186,18 +186,14 @@ avtStreamlinePlot::GetMapper(void)
// Test to make sure we have a valid variable before asking for its
// centering.
//
// Dave Pugmire, Thu Jul 30 20:47:08 PDT 2009
// Move cell centering back to here. (Moved from avtStreamlineFilter).
// Also, fixed a bug in the commented out code.
//
// ****************************************************************************
avtDataObject_p
avtStreamlinePlot::ApplyOperators(avtDataObject_p input)
{
#ifdef ENGINE
avtDataObject_p dob = input;
avtDataObject_p dob = input;
// Try to determine the centering. If we have an expression, we won't
// be able to. So be conservative and assume the worst.
avtCentering centering = AVT_ZONECENT;
......@@ -206,11 +202,12 @@ avtStreamlinePlot::ApplyOperators(avtDataObject_p input)
// If the variable centering is zonal, convert it to nodal or the
// streamline filter will not play with it.
if(centering == AVT_ZONECENT)
//if(centering == AVT_ZONECENT)
if (0)
{
if(shiftCenteringFilter != NULL)
delete shiftCenteringFilter;
shiftCenteringFilter = new avtShiftCenteringFilter(AVT_NODECENT);
shiftCenteringFilter = new avtShiftCenteringFilter(AVT_ZONECENT);
shiftCenteringFilter->SetInput(input);
dob = shiftCenteringFilter->GetOutput();
}
......@@ -370,7 +367,7 @@ avtStreamlinePlot::SetAtts(const AttributeGroup *a)
//
streamlineFilter->SetSourceType(atts.GetSourceType());
streamlineFilter->SetIntegrationType(atts.GetIntegrationType());
streamlineFilter->SetPathlines(false);//atts.GetPathlines());
streamlineFilter->SetPathlines(atts.GetPathlines());
streamlineFilter->SetStreamlineAlgorithm(atts.GetStreamlineAlgorithmType(),
atts.GetMaxStreamlineProcessCount(),
atts.GetMaxDomainCacheSize(),
......
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