Commit c0ed71f9 authored by allens's avatar allens

aaded code to handle Pseudocolor plot requests

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23509 18c085ea-50e0-402c-830e-de6fd14e8384
parent f4c9dd1d
......@@ -825,26 +825,6 @@ QvisIntegralCurveWindow::CreateAppearanceTab(QWidget *pageAppearance)
displayLayout->addWidget(showPoints, 0, 1);
geometryLabel = new QLabel(tr("Line geometry"), central);
displayLayout->addWidget(geometryLabel, 1, 0);
geometryButtonGroup = new QButtonGroup(central);
QRadioButton *rb = new QRadioButton(tr("Line"), central);
geometryButtonGroup->addButton(rb, 0);
displayLayout->addWidget(rb, 1, 1);
rb = new QRadioButton(tr("Tubes"), central);
geometryButtonGroup->addButton(rb, 1);
displayLayout->addWidget(rb, 1, 2);
rb = new QRadioButton(tr("Ribbons"), central);
displayLayout->addWidget(rb, 1, 3);
geometryButtonGroup->addButton(rb, 2);
connect(geometryButtonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(geometryButtonGroupChanged(int)));
// Create the coordinate group
QGroupBox *coordinateGrp = new QGroupBox(central);
coordinateGrp->setTitle(tr("Coordinate transform"));
......@@ -1355,22 +1335,12 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
showLines->setChecked(atts->GetShowLines());
showLines->blockSignals(false);
geometryLabel->setEnabled(atts->GetShowLines());
geometryButtonGroup->button(0)->setEnabled(atts->GetShowLines());
geometryButtonGroup->button(1)->setEnabled(atts->GetShowLines());
geometryButtonGroup->button(2)->setEnabled(atts->GetShowLines());
break;
case IntegralCurveAttributes::ID_showPoints:
showPoints->blockSignals(true);
showPoints->setChecked(atts->GetShowPoints());
showPoints->blockSignals(false);
break;
case IntegralCurveAttributes::ID_displayGeometry:
geometryButtonGroup->blockSignals(true);
geometryButtonGroup->button(atts->GetDisplayGeometry())->setChecked(true);
geometryButtonGroup->blockSignals(false);
break;
case IntegralCurveAttributes::ID_integrationDirection:
directionType->blockSignals(true);
directionType->setCurrentIndex(int(atts->GetIntegrationDirection()) );
......@@ -2889,13 +2859,6 @@ QvisIntegralCurveWindow::showPointsChanged(bool val)
Apply();
}
void
QvisIntegralCurveWindow::geometryButtonGroupChanged(int val)
{
atts->SetDisplayGeometry((IntegralCurveAttributes::DisplayGeometry) val);
Apply();
}
void
QvisIntegralCurveWindow::useWholeBoxChanged(bool val)
{
......@@ -2903,7 +2866,6 @@ QvisIntegralCurveWindow::useWholeBoxChanged(bool val)
Apply();
}
void
QvisIntegralCurveWindow::boxExtentsProcessText()
{
......
......@@ -251,7 +251,6 @@ class QvisIntegralCurveWindow : public QvisOperatorWindow
void showLinesChanged(bool val);
void showPointsChanged(bool val);
void geometryButtonGroupChanged(int val);
void coordinateButtonGroupChanged(int val);
void phiScalingToggled(bool);
......@@ -356,9 +355,6 @@ class QvisIntegralCurveWindow : public QvisOperatorWindow
QCheckBox *showLines;
QCheckBox *showPoints;
QLabel *geometryLabel;
QButtonGroup *geometryButtonGroup;
QButtonGroup *coordinateButtonGroup;
QLineEdit *phiScaling;
QCheckBox *phiScalingToggle;
......
......@@ -162,8 +162,6 @@ class avtIntegralCurveFilter : public virtual avtPluginFilter,
}
void SetVelocitiesForLighting(bool v) { storeVelocitiesForLighting = v; };
void SetOpacityVariable(const std::string &var);
void SetScaleTubeRadiusVariable(const std::string &var);
void SetReferenceTypeForDisplay(int d)
{ referenceTypeForDisplay = d; };
......@@ -211,7 +209,7 @@ class avtIntegralCurveFilter : public virtual avtPluginFilter,
void GenerateSeedPointsFromPointList(std::vector<avtVector> &pts);
void GenerateSeedPointsFromSelection(std::vector<avtVector> &pts);
unsigned char GenerateAttributeFields() const;
unsigned int GenerateAttributeFields() const;
virtual std::vector<avtVector> GetInitialLocations(void);
virtual std::vector<avtVector> GetInitialVelocities(void);
......@@ -234,10 +232,13 @@ class avtIntegralCurveFilter : public virtual avtPluginFilter,
int displayGeometry;
int dataValue;
int referenceTypeForDisplay;
std::string dataVariable, opacityVariable, scaleTubeRadiusVariable;
std::string dataVariable;
int tubeVariableIndex;
double correlationDistanceAngTol, correlationDistanceMinDist;
bool correlationDistanceDoBBox;
std::vector< std::string > secondaryVariables;
int maxSteps;
bool doDistance;
double maxDistance;
......
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