Commit 32243c49 authored by pugmire's avatar pugmire

Fix for poincare plots to use point glypher.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11852 18c085ea-50e0-402c-830e-de6fd14e8384
parent a1df4c0c
......@@ -101,6 +101,9 @@ avtVariablePointGlyphMapper::~avtVariablePointGlyphMapper()
// Brad Whitlock, Thu Aug 25 15:18:17 PST 2005
// Added support for point texturing.
//
// Dave Pugmire, Mon Jul 12 15:34:29 EDT 2010
// Glyph if topological dimension is <= 1.
//
// ****************************************************************************
void
......@@ -137,7 +140,7 @@ avtVariablePointGlyphMapper::CustomizeMappers(void)
}
}
}
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() == 0)
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() <= 1)
{
CustomizeGlyphs(GetInput()->GetInfo().GetAttributes().GetSpatialDimension());
......@@ -189,12 +192,15 @@ avtVariablePointGlyphMapper::CustomizeMappers(void)
//
// Modifications:
//
// Dave Pugmire, Mon Jul 12 15:34:29 EDT 2010
// Glyph if topological dimension is <= 1.
//
// ****************************************************************************
void
avtVariablePointGlyphMapper::SetUpFilters(int nDoms)
{
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() == 0)
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() <= 1)
{
SetUpGlyphs(nDoms);
}
......@@ -218,17 +224,19 @@ avtVariablePointGlyphMapper::SetUpFilters(int nDoms)
//
// Modifications:
//
// Dave Pugmire, Mon Jul 12 15:34:29 EDT 2010
// Glyph if topological dimension is <= 1.
//
// ****************************************************************************
vtkDataSet *
avtVariablePointGlyphMapper::InsertFilters(vtkDataSet *ds, int dom)
{
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() != 0)
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() <= 1)
return InsertGlyphs(ds, dom,
GetInput()->GetInfo().GetAttributes().GetSpatialDimension());
else
return ds;
return InsertGlyphs(ds, dom,
GetInput()->GetInfo().GetAttributes().GetSpatialDimension());
}
......
......@@ -1582,12 +1582,13 @@ FieldlineLib::fieldlineProperties( vector< Point > &ptList,
Point lastPt, currPt = ptList[0];
Vector planePt( 0, 0, 0 );
cerr << "-----------------------------------------------------------------" << endl;
if( verboseFlag )
{
cerr << "-----------------------------------------------------------------" << endl;
cerr << "Analyzing " << ptList[0] << " "
<< "with " << ptList.size() << " fieldline points"
<< endl;
}
// Set up the Y plane equation as the base analysis takes place in
// the X-Z plane.
......
......@@ -71,9 +71,6 @@ using namespace std;
#define SIGN(x) ((x) < 0.0 ? -1 : 1)
//#define RADIUS 0.0075
#define RADIUS 0.0010
static const int DATA_None = 0;
static const int DATA_OriginalValue = 1;
static const int DATA_InputOrder = 2;
......@@ -98,11 +95,14 @@ static const int DATA_RidgelineVariance = 12;
//
// Dave Pugmire, Thu Jul 1 13:55:28 EDT 2010
// Create a vertex instead of a sphere.
//
//
// Dave Pugmire, Mon Jul 12 15:34:29 EDT 2010
// Remove rad argument.
//
// ****************************************************************************
static vtkPolyData *
CreateSphere(float val, double rad, double p[3])
CreateSphere(float val, double p[3])
{
vtkPoints *pt = vtkPoints::New();
pt->SetNumberOfPoints(1);
......@@ -1495,8 +1495,6 @@ avtPoincareFilter::loadCurve( avtDataTree *dt,
double pt[3] =
{ nodes[p][j][i].x, nodes[p][j][i].y, nodes[p][j][i].z };
double rad = RADIUS*pointScale;
if( color == DATA_PointIndex )
color_value = (i*toroidalWindings+j)*nplanes + p;
else if( color == DATA_WindingPointOrder )
......@@ -1504,7 +1502,7 @@ avtPoincareFilter::loadCurve( avtDataTree *dt,
else if( color == DATA_WindingPointOrderModulo )
color_value = i % nnodes;
vtkPolyData *ball = CreateSphere(color_value, rad, pt);
vtkPolyData *ball = CreateSphere(color_value, pt);
append->AddInput(ball);
ball->Delete();
......@@ -1532,8 +1530,6 @@ avtPoincareFilter::loadCurve( avtDataTree *dt,
double pt[3] =
{ nodes[p][j][i].x, nodes[p][j][i].y, nodes[p][j][i].z };
double rad = RADIUS*pointScale;
if( color == DATA_PointIndex )
color_value = (i*toroidalWindings+j)*nplanes + p;
else if( color == DATA_WindingPointOrder )
......@@ -1541,7 +1537,7 @@ avtPoincareFilter::loadCurve( avtDataTree *dt,
else if( color == DATA_WindingPointOrderModulo )
color_value = i % nnodes;
vtkPolyData *ball = CreateSphere(color_value, rad, pt);
vtkPolyData *ball = CreateSphere(color_value, pt);
append->AddInput(ball);
ball->Delete();
......@@ -1786,8 +1782,6 @@ avtPoincareFilter::loadCurve( avtDataTree *dt,
double pt[3] =
{ nodes[p][j][i].x, nodes[p][j][i].y, nodes[p][j][i].z };
double rad = RADIUS*pointScale;
if( color == DATA_PointIndex )
color_value = (i*toroidalWindings+j)*nplanes + p;
else if( color == DATA_WindingPointOrder )
......@@ -1795,7 +1789,7 @@ avtPoincareFilter::loadCurve( avtDataTree *dt,
else if( color == DATA_WindingPointOrderModulo )
color_value = i % nnodes;
vtkPolyData *ball = CreateSphere(color_value, rad, pt);
vtkPolyData *ball = CreateSphere(color_value, pt);
append->AddInput(ball);
ball->Delete();
......@@ -2207,9 +2201,7 @@ avtPoincareFilter::findIslandCenter( avtDataTree *dt,
0,
(*SL).lower.vertex->point.y };
double rad = RADIUS*pointScale;
vtkPolyData *ball = CreateSphere(nlines, rad, pt);
vtkPolyData *ball = CreateSphere(nlines, pt);
append->AddInput(ball);
ball->Delete();
......@@ -2273,9 +2265,7 @@ avtPoincareFilter::findIslandCenter( avtDataTree *dt,
<< lastpt[0] << " " << lastpt[1] << " " << lastpt[2]
<< endl;
double rad = 0.005;
vtkPolyData *ball = CreateSphere(nlines, rad, lastpt);
vtkPolyData *ball = CreateSphere(nlines, lastpt);
append->AddInput(ball);
ball->Delete();
......@@ -2652,8 +2642,6 @@ avtPoincareFilter::loadPoints( avtDataTree *dt,
else
pt[0] = nodes[i].x;
double rad = RADIUS*pointScale;
if( color == DATA_PointIndex )
color_value = i;
else if( color == DATA_WindingOrder )
......@@ -2666,7 +2654,7 @@ avtPoincareFilter::loadPoints( avtDataTree *dt,
if( colorMax < color_value )
colorMax = color_value;
vtkPolyData *ball = CreateSphere(color_value, rad, pt);
vtkPolyData *ball = CreateSphere(color_value, pt);
append->AddInput(ball);
ball->Delete();
}
......
......@@ -182,6 +182,9 @@ QvisStreamlinePlotWindow::~QvisStreamlinePlotWindow()
// Dave Pugmire, Thu Jun 10 10:44:02 EDT 2010
// New seed sources.
//
// Dave Pugmire, Mon Jul 12 15:34:29 EDT 2010
// Rename Exterior to Boundary.
//
// ****************************************************************************
void
......@@ -379,7 +382,7 @@ QvisStreamlinePlotWindow::CreateWindowContents()
fillLabel = new QLabel(tr("Sampling along:"), samplingGroup);
samplingLayout->addWidget(fillLabel, sRow, 0);
fillButtonGroup = new QButtonGroup(samplingGroup);
fillButtons[0] = new QRadioButton(tr("Exterior"), samplingGroup);
fillButtons[0] = new QRadioButton(tr("Boundary"), samplingGroup);
fillButtons[1] = new QRadioButton(tr("Interior"), samplingGroup);
fillButtons[0]->setChecked(true);
fillButtonGroup->addButton(fillButtons[0], 0);
......
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