Commit b9492d7f authored by hrchilds's avatar hrchilds
Browse files

If a Threshold operator is applied to a vector plot, but if the

vector isn't part of the Threshold, then don't issue a warning.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9574 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6e82c512
......@@ -793,6 +793,10 @@ avtThresholdFilter::UpdateDataObjectInfo(void)
// Hank Childs, Thu Oct 9 09:24:26 PDT 2008
// Issue a better error message for non-scalars.
//
// Hank Childs, Thu Jan 21 19:50:58 PST 2010
// Don't issue an error message if the default vector is a vector, but it
// isn't actually used.
//
// *****************************************************************************
void
......@@ -816,13 +820,19 @@ avtThresholdFilter::PreExecute(void)
}
inputVarCount = inputVarNames.size();
for (inputVarNum = 0; inputVarNum < inputVarCount; inputVarNum++)
bool allScalars = true;
stringVector curListedVarNames = atts.GetListedVarNames();
for (int i = 0 ; i < curListedVarNames.size() ; i++)
{
if (inputVarNames[inputVarNum] == atts.GetDefaultVarName()) break;
bool foundMatch = false;
for (int j = 0 ; j < inputVarNames.size() ; j++)
if (inputVarNames[j] == curListedVarNames[i])
foundMatch = true;
if (! foundMatch)
allScalars = false;
}
if (inputVarNum >= inputVarCount)
if (! allScalars)
{
atts.SetDefaultVarIsScalar(false);
static bool issuedWarning = false;
......@@ -839,7 +849,6 @@ avtThresholdFilter::PreExecute(void)
}
}
stringVector curListedVarNames = atts.GetListedVarNames();
intVector curZonePortions = atts.GetZonePortions();
doubleVector curLowerBounds = atts.GetLowerBounds();
doubleVector curUpperBounds = atts.GetUpperBounds();
......
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