Commit 22ca50e1 authored by hrchilds's avatar hrchilds
Browse files

Update from June 10, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@482 18c085ea-50e0-402c-830e-de6fd14e8384
parent d612512a
......@@ -111,6 +111,9 @@ avtPseudocolorFilter::RefashionDataObjectInfo(void)
// Creation: October 29, 2004
//
// Modifications:
// Kathleen Bonnell, Fri Jun 10 13:37:09 PDT 2005
// Verify the existence of a valid variable before attempting to retrieve
// its centering.
//
// ****************************************************************************
......@@ -141,12 +144,22 @@ avtPseudocolorFilter::PerformRestriction(avtPipelineSpecification_p pspec)
if (pspec->GetDataSpecification()->MayRequireZones())
{
keepNodeZone = true;
if (data.GetCentering() == AVT_NODECENT)
if (data.ValidActiveVariable())
{
rv->GetDataSpecification()->TurnNodeNumbersOn();
if (data.GetCentering() == AVT_NODECENT)
{
rv->GetDataSpecification()->TurnNodeNumbersOn();
}
else if (data.GetCentering() == AVT_ZONECENT)
{
rv->GetDataSpecification()->TurnZoneNumbersOn();
}
}
else if (data.GetCentering() == AVT_ZONECENT)
else
{
// canot determine variable centering, so turn on both
// node numbers and zone numbers.
rv->GetDataSpecification()->TurnNodeNumbersOn();
rv->GetDataSpecification()->TurnZoneNumbersOn();
}
}
......@@ -155,6 +168,5 @@ avtPseudocolorFilter::PerformRestriction(avtPipelineSpecification_p pspec)
keepNodeZone = false;
}
return rv;
}
......@@ -309,6 +309,10 @@ avtVectorFilter::SetMagVarName(const string &mname)
// Kathleen Bonnell, Wed Dec 1 09:19:31 PST 2004
// Turn on Node/Zone numbers when 'MayRequireNodes' is true.
//
// Kathleen Bonnell, Fri Jun 10 13:37:09 PDT 2005
// Verify the existence of a valid variable before attempting to retrieve
// its centering.
//
// ****************************************************************************
avtPipelineSpecification_p
......@@ -316,11 +320,13 @@ avtVectorFilter::PerformRestriction(avtPipelineSpecification_p pspec)
{
avtPipelineSpecification_p rv = pspec;
avtDataSpecification_p ds = pspec->GetDataSpecification();
//
// Create the expression definition
//
string edef = string("magnitude(") + ds->GetVariable() + string(")");
ExpressionList *elist = ParsingExprList::Instance()->GetList();
Expression *e = new Expression();
......@@ -342,12 +348,22 @@ avtVectorFilter::PerformRestriction(avtPipelineSpecification_p pspec)
pspec->GetDataSpecification()->MayRequireNodes())
{
keepNodeZone = true;
if (data.GetCentering() == AVT_NODECENT)
if (data.ValidActiveVariable())
{
rv->GetDataSpecification()->TurnNodeNumbersOn();
if (data.GetCentering() == AVT_NODECENT)
{
rv->GetDataSpecification()->TurnNodeNumbersOn();
}
else if (data.GetCentering() == AVT_ZONECENT)
{
rv->GetDataSpecification()->TurnZoneNumbersOn();
}
}
else if (data.GetCentering() == AVT_ZONECENT)
else
{
// canot determine variable centering, so turn on both
// node numbers and zone numbers.
rv->GetDataSpecification()->TurnNodeNumbersOn();
rv->GetDataSpecification()->TurnZoneNumbersOn();
}
}
......
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