Commit 4af547c3 authored by pugmire's avatar pugmire

Merge pathlines disablement from 1.12RC.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7899 18c085ea-50e0-402c-830e-de6fd14e8384
parent e4870ac0
......@@ -197,9 +197,11 @@ QvisStreamlinePlotWindow::CreateWindowContents()
mainLayout->addWidget(directionType, 3,1);
pathlineFlag = new QCheckBox(tr("Pathlines"), central);
/*
connect(pathlineFlag, SIGNAL(toggled(bool)),
this, SLOT(pathlineFlagChanged(bool)));
mainLayout->addWidget(pathlineFlag, 4,0);
*/
// Add some space....
mainLayout->addWidget(new QLabel(tr(""), central), 5,0);
......@@ -865,9 +867,11 @@ QvisStreamlinePlotWindow::UpdateWindow(bool doAll)
workGroupSize->blockSignals(false);
break;
case StreamlineAttributes::ID_pathlines:
/*
pathlineFlag->blockSignals(true);
pathlineFlag->setChecked(streamAtts->GetPathlines());
pathlineFlag->blockSignals(false);
*/
break;
}
}
......
......@@ -367,7 +367,7 @@ avtStreamlinePlot::SetAtts(const AttributeGroup *a)
//
streamlineFilter->SetSourceType(atts.GetSourceType());
streamlineFilter->SetIntegrationType(atts.GetIntegrationType());
streamlineFilter->SetPathlines(atts.GetPathlines());
streamlineFilter->SetPathlines(false);//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