Commit 0baf355c authored by allens's avatar allens
Browse files

minor fix for teh corect range and vars

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28075 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5920ff2d
...@@ -149,11 +149,14 @@ avtPolylineAddEndPointsFilter::ExecuteData(avtDataRepresentation *inDR) ...@@ -149,11 +149,14 @@ avtPolylineAddEndPointsFilter::ExecuteData(avtDataRepresentation *inDR)
if( varyRadius && radiusVar != "" && radiusVar != "\0" ) if( varyRadius && radiusVar != "" && radiusVar != "\0" )
{ {
if (radiusVar != "default" && radiusVar != activeScalars->GetName() ) if (radiusVar != "default" && radiusVar != activeScalars->GetName() )
activeRadius = inDS->GetPointData()->GetArray( radiusVar.c_str() ); activeRadius = inDS->GetPointData()->GetArray( radiusVar.c_str() );
else else
activeRadius = activeScalars; activeRadius = activeScalars;
activeRadius->GetRange( range ); activeRadius->GetRange( range, 0 );
if( (range[1] - range[0]) == 0.0 )
range[1] = range[0] + 1.0;
scale = (radiusFactor-1) / (range[1]-range[0]); scale = (radiusFactor-1) / (range[1]-range[0]);
} }
...@@ -199,7 +202,8 @@ avtPolylineAddEndPointsFilter::ExecuteData(avtDataRepresentation *inDR) ...@@ -199,7 +202,8 @@ avtPolylineAddEndPointsFilter::ExecuteData(avtDataRepresentation *inDR)
if( varyRadius && radiusVar != "" && radiusVar != "\0" ) if( varyRadius && radiusVar != "" && radiusVar != "\0" )
{ {
scaledRadius *= scaledRadius *=
((activeScalars->GetTuple1( ptIndexs[tip] ) - range[0]) * scale + 1.0); (1.0 + (activeRadius->GetComponent( ptIndexs[tip], 0 ) -
range[0]) * scale);
} }
if( style == Spheres ) if( style == Spheres )
...@@ -260,7 +264,7 @@ avtPolylineAddEndPointsFilter::ExecuteData(avtDataRepresentation *inDR) ...@@ -260,7 +264,7 @@ avtPolylineAddEndPointsFilter::ExecuteData(avtDataRepresentation *inDR)
else else
outPD->GetPointData()->AddArray(scalars); outPD->GetPointData()->AddArray(scalars);
double scalar = array->GetTuple1( ptIndexs[tip] ); double scalar = array->GetComponent( ptIndexs[tip], 0 );
for( int k=0; k<npts; ++k ) for( int k=0; k<npts; ++k )
scalars->InsertTuple1(k, scalar); scalars->InsertTuple1(k, scalar);
......
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