Commit 7cd73ce9 authored by hrchilds's avatar hrchilds
Browse files

Merge fix for ray-casting + log + min set.

Also (trunk only) fix problem with handling singletons.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12607 18c085ea-50e0-402c-830e-de6fd14e8384
parent 52ae0f57
......@@ -105,6 +105,11 @@ avtBase10LogWithMinExpression::~avtBase10LogWithMinExpression()
// Programmer: Hank Childs
// Creation: May 20, 2010
//
// Modifications:
//
// Hank Childs, Thu Sep 23 14:10:45 PDT 2010
// Correct minimum test.
//
// ****************************************************************************
void
......@@ -130,7 +135,7 @@ avtBase10LogWithMinExpression::DoOperation(vtkDataArray *in1,vtkDataArray *in2,
{
int tup1 = (var1IsSingleton ? 0 : i);
float f1 = in1->GetComponent(tup1, j);
float f = (f2 < f1 ? f2 : f1);
float f = (f1 < f2 ? f2 : f1);
out->SetComponent(i, j, log10(f));
}
}
......
......@@ -62,6 +62,11 @@ class ExprPipelineState;
// Programmer: Hank Childs
// Creation: May 20, 2010
//
// Modifications:
//
// Hank Childs, Thu Sep 23 14:10:45 PDT 2010
// Indicate this expression can deal with singletons (improves performance).
//
// ****************************************************************************
class EXPRESSION_API avtBase10LogWithMinExpression
......@@ -78,6 +83,7 @@ class EXPRESSION_API avtBase10LogWithMinExpression
protected:
virtual void DoOperation(vtkDataArray *in1, vtkDataArray *in2,
vtkDataArray *out, int ncomps,int ntups);
virtual bool CanHandleSingleton(void) { return true; };
};
......
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