Commit 179f060a authored by allens's avatar allens

clean up for velocity field

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21607 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1ff0e888
......@@ -668,19 +668,19 @@ QvisStreamlinePlotWindow::CreateWindowContents()
this, SLOT(maxStepsProcessText()));
terminationLayout->addWidget(maxSteps, 0,1);
limitMaxDistance = new QCheckBox(tr("Limit maximum distance traveled by particles"), terminationGroup);
connect(limitMaxDistance, SIGNAL(toggled(bool)), this, SLOT(limitMaxDistanceChanged(bool)));
terminationLayout->addWidget(limitMaxDistance, 1,0);
maxDistance = new QLineEdit(central);
connect(maxDistance, SIGNAL(returnPressed()), this, SLOT(maxDistanceProcessText()));
terminationLayout->addWidget(maxDistance, 1,1);
limitMaxTime = new QCheckBox(tr("Limit maximum time elapsed for particles"), terminationGroup);
connect(limitMaxTime, SIGNAL(toggled(bool)), this, SLOT(limitMaxTimeChanged(bool)));
terminationLayout->addWidget(limitMaxTime, 2,0);
terminationLayout->addWidget(limitMaxTime, 1,0);
maxTime = new QLineEdit(central);
connect(maxTime, SIGNAL(returnPressed()), this, SLOT(maxTimeProcessText()));
terminationLayout->addWidget(maxTime, 2,1);
terminationLayout->addWidget(maxTime, 1,1);
limitMaxDistance = new QCheckBox(tr("Limit maximum distance traveled by particles"), terminationGroup);
connect(limitMaxDistance, SIGNAL(toggled(bool)), this, SLOT(limitMaxDistanceChanged(bool)));
terminationLayout->addWidget(limitMaxDistance, 2,0);
maxDistance = new QLineEdit(central);
connect(maxDistance, SIGNAL(returnPressed()), this, SLOT(maxDistanceProcessText()));
terminationLayout->addWidget(maxDistance, 2,1);
// ----------------------------------------------------------------------
// Appearance tab
......
......@@ -275,7 +275,8 @@ StreamlineAttributes::ChangesRequireRecalculation(const StreamlineAttributes &ob
if (lightingFlag != obj.lightingFlag && obj.lightingFlag == true)
return true;
if (POINT_DIFFERS(velocitySource, obj.velocitySource))
if (fieldType == FlashField &&
POINT_DIFFERS(velocitySource, obj.velocitySource))
{
return true;
}
......
......@@ -5456,7 +5456,8 @@ StreamlineAttributes::ChangesRequireRecalculation(const StreamlineAttributes &ob
if (lightingFlag != obj.lightingFlag && obj.lightingFlag == true)
return true;
if (POINT_DIFFERS(velocitySource, obj.velocitySource))
if (fieldType == FlashField &&
POINT_DIFFERS(velocitySource, obj.velocitySource))
{
return true;
}
......
......@@ -446,8 +446,6 @@ avtStreamlinePlot::SetAtts(const AttributeGroup *a)
//
// Set the filter's attributes based on the plot attributes.
//
streamlineFilter->SetVelocitySource(atts.GetVelocitySource());
switch (atts.GetSourceType())
{
case StreamlineAttributes::SpecifiedPoint:
......@@ -503,10 +501,17 @@ avtStreamlinePlot::SetAtts(const AttributeGroup *a)
int CMFEType = (atts.GetPathlinesCMFE() == StreamlineAttributes::CONN_CMFE
? PICS_CONN_CMFE : PICS_POS_CMFE);
streamlineFilter->SetPathlines(atts.GetPathlines(), atts.GetPathlinesOverrideStartingTimeFlag(), atts.GetPathlinesOverrideStartingTime(), CMFEType);
streamlineFilter->SetPathlines(atts.GetPathlines(),
atts.GetPathlinesOverrideStartingTimeFlag(),
atts.GetPathlinesOverrideStartingTime(),
CMFEType);
streamlineFilter->SetIntegrationDirection(atts.GetStreamlineDirection());
streamlineFilter->SetFieldType(atts.GetFieldType());
streamlineFilter->SetFieldConstant(atts.GetFieldConstant());
streamlineFilter->SetVelocitySource(atts.GetVelocitySource());
streamlineFilter->SetIntegrationType(atts.GetIntegrationType());
streamlineFilter->SetStreamlineAlgorithm(atts.GetStreamlineAlgorithmType(),
......@@ -541,8 +546,6 @@ avtStreamlinePlot::SetAtts(const AttributeGroup *a)
streamlineFilter->IssueWarningForStiffness(atts.GetIssueStiffnessWarnings());
streamlineFilter->IssueWarningForCriticalPoints(atts.GetIssueCriticalPointsWarnings(), atts.GetCriticalPointThreshold());
streamlineFilter->SetIntegrationDirection(atts.GetStreamlineDirection());
streamlineFilter->SetColoringMethod(int(atts.GetColoringMethod()),
atts.GetColoringVariable());
if (atts.GetColoringMethod() == StreamlineAttributes::ColorByCorrelationDistance)
......@@ -766,5 +769,3 @@ avtStreamlinePlot::ReleaseData(void)
if(removeGhostZonesFilter != NULL)
removeGhostZonesFilter->ReleaseData();
}
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