Commit c8ed01af authored by cyrush's avatar cyrush
Browse files

added 'zonal_constant' & 'nodal_constant' aliases for existing 'cell_constant'...

added 'zonal_constant' & 'nodal_constant' aliases for existing 'cell_constant' & 'point_constant' expressions

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11823 18c085ea-50e0-402c-830e-de6fd14e8384
parent d425f8c3
...@@ -463,6 +463,10 @@ avtVectorExpr::CreateFilters(ExprPipelineState *state) ...@@ -463,6 +463,10 @@ avtVectorExpr::CreateFilters(ExprPipelineState *state)
// Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010 // Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010
// Added the "resample" expression. // Added the "resample" expression.
// //
// Cyrus Harrison, Wed Jul 7 09:13:09 PDT 2010
// Added 'zonal_constant' & 'nodal_constant' as aliases for the
// existing 'cell_constant' & 'point_constant' expressions.
//
// **************************************************************************** // ****************************************************************************
avtExpressionFilter * avtExpressionFilter *
...@@ -588,9 +592,13 @@ avtFunctionExpr::CreateFilters(string functionName) ...@@ -588,9 +592,13 @@ avtFunctionExpr::CreateFilters(string functionName)
return new avtHSVColorComposeExpression; return new avtHSVColorComposeExpression;
if (functionName == "colorlookup") if (functionName == "colorlookup")
return new avtPerformColorTableLookupExpression; return new avtPerformColorTableLookupExpression;
if (functionName == "cell_constant") if (functionName == "cell_constant" ||
functionName == "zonal_constant" ||
functionName == "zone_constant")
return new avtConstantFunctionExpression(false); return new avtConstantFunctionExpression(false);
if (functionName == "point_constant") if (functionName == "point_constant" ||
functionName == "nodal_constant" ||
functionName == "node_constant" )
return new avtConstantFunctionExpression(true); return new avtConstantFunctionExpression(true);
if (functionName == "curve_domain") if (functionName == "curve_domain")
return new avtCurveDomainExpression(); return new avtCurveDomainExpression();
......
...@@ -162,6 +162,9 @@ ...@@ -162,6 +162,9 @@
// Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010 // Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010
// Add resample expression. // Add resample expression.
// //
// Cyrus Harrison, Wed Jul 7 09:34:00 PDT 2010
// Added 'zonal_constant' and 'nodal_constant'
//
// **************************************************************************** // ****************************************************************************
struct ExprNameList struct ExprNameList
...@@ -349,6 +352,7 @@ const char *expr_misc[] = { ...@@ -349,6 +352,7 @@ const char *expr_misc[] = {
"ijk_gradient", "ijk_gradient",
"Laplacian", "Laplacian",
"mean_curvature", "mean_curvature",
"nodal_constant",
"point_constant", "point_constant",
"recenter", "recenter",
"resample", "resample",
...@@ -358,6 +362,7 @@ const char *expr_misc[] = { ...@@ -358,6 +362,7 @@ const char *expr_misc[] = {
" cell_surface_normal", " cell_surface_normal",
"time", "time",
"timestep", "timestep",
"zonal_constant",
NULL NULL
}; };
...@@ -1558,6 +1563,9 @@ QvisExpressionsWindow::UpdateStandardExpressionEditor(const QString &expr_def) ...@@ -1558,6 +1563,9 @@ QvisExpressionsWindow::UpdateStandardExpressionEditor(const QString &expr_def)
// Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010 // Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010
// Add resample expression. // Add resample expression.
// //
// Dave Pugmire, Fri Jul 2 14:22:34 EDT 2010
// Added 'zonal_constant' & 'nodal_constant'.
//
// **************************************************************************** // ****************************************************************************
QString QString
...@@ -1670,7 +1678,10 @@ QvisExpressionsWindow::ExpandFunction(const QString &func_name) ...@@ -1670,7 +1678,10 @@ QvisExpressionsWindow::ExpandFunction(const QString &func_name)
res += QString("(<var>, [<val-if-0>, <val-if-1>, ...])"); res += QString("(<var>, [<val-if-0>, <val-if-1>, ...])");
doParens = false; doParens = false;
} }
else if (func_name == "cell_constant" || func_name == "point_constant") else if (func_name == "cell_constant" ||
func_name == "zonal_constant" ||
func_name == "point_constant" ||
func_name == "nodal_constant" )
{ {
res += QString("(<meshvar>, <constantvalue>)"); res += QString("(<meshvar>, <constantvalue>)");
doParens = false; doParens = false;
......
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