Commit db14f313 authored by bonnell's avatar bonnell

Fix some code files to match changes Mark made to source

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31099 18c085ea-50e0-402c-830e-de6fd14e8384
parent 32df0f32
...@@ -3,7 +3,7 @@ Function: AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions ...@@ -3,7 +3,7 @@ Function: AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions
Declaration: virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMetaData *); Declaration: virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMetaData *);
Definition: Definition:
ExpressionList * ExpressionList *
AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
char name[1024]; char name[1024];
char defn[1024]; char defn[1024];
...@@ -11,8 +11,13 @@ AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaD ...@@ -11,8 +11,13 @@ AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaD
for (int i = 0 ; i < md->GetNumArrays() ; i++) for (int i = 0 ; i < md->GetNumArrays() ; i++)
{ {
const char *array = md->GetArrays(i).name.c_str(); avtArrayMetaData const &amd = md->GetArrays(i);
const char *mesh = md->GetArrays(i).meshName.c_str();
if (amd.hideFromGUI || !amd.validVariable)
continue;
const char *array = amd.name.c_str();
const char *mesh = amd.meshName.c_str();
Expression e; Expression e;
sprintf(name, "operators/AxisAlignedSlice4D/%s", array); sprintf(name, "operators/AxisAlignedSlice4D/%s", array);
...@@ -32,7 +37,7 @@ AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaD ...@@ -32,7 +37,7 @@ AxisAlignedSlice4DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaD
if (e.GetType() == Expression::ArrayMeshVar) if (e.GetType() == Expression::ArrayMeshVar)
{ {
{ {
if (e.GetFromOperator()) if (e.GetFromOperator() || e.GetAutoExpression())
continue; // weird ordering behavior otherwise continue; // weird ordering behavior otherwise
Expression e2; Expression e2;
sprintf(name, "operators/AxisAlignedSlice4D/%s", e.GetName().c_str()); sprintf(name, "operators/AxisAlignedSlice4D/%s", e.GetName().c_str());
......
...@@ -87,14 +87,12 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight ...@@ -87,14 +87,12 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
${EAVL_INCLUDE_DIR} ${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR} ${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${PYINCLUDES} ${PYINCLUDES}
) )
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${QT_LIBRARY_DIR} ${QWT_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ) LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${QT_LIBRARY_DIR} ${QWT_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IAxisAlignedSlice4DOperator ${LIBI_SOURCES}) ADD_LIBRARY(IAxisAlignedSlice4DOperator ${LIBI_SOURCES})
......
...@@ -122,16 +122,17 @@ ChannelCommCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md ...@@ -122,16 +122,17 @@ ChannelCommCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md
const avtMeshMetaData *mmd = md->GetMesh(i); const avtMeshMetaData *mmd = md->GetMesh(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{
Expression e2; Expression e2;
sprintf(name, "operators/ChannelComm/%s", mmd->name.c_str()); sprintf(name, "operators/ChannelComm/%s", mmd->name.c_str());
e2.SetName(name); e2.SetName(name);
e2.SetType(Expression::ScalarMeshVar); e2.SetType(Expression::ScalarMeshVar);
e2.SetFromOperator(true); e2.SetFromOperator(true);
e2.SetOperatorName("ChannelComm"); e2.SetOperatorName("ChannelComm");
sprintf(defn, "cell_constant(<%s>, 0.)", mmd->name.c_str()); sprintf(defn, "cell_constant(<%s>, 0.)", mmd->name.c_str());
e2.SetDefinition(defn); e2.SetDefinition(defn);
el->AddExpressions(e2); el->AddExpressions(e2);
}
} }
return el; return el;
} }
......
...@@ -35,7 +35,7 @@ Definition: ...@@ -35,7 +35,7 @@ Definition:
// *************************************************************************** // ***************************************************************************
ExpressionList * ExpressionList *
CracksClipperCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) CracksClipperCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
int i; int i;
char name[1024], defn[1024]; char name[1024], defn[1024];
...@@ -44,6 +44,8 @@ CracksClipperCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData * ...@@ -44,6 +44,8 @@ CracksClipperCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *
for (i = 0 ; i < numMeshes ; i++) for (i = 0 ; i < numMeshes ; i++)
{ {
const avtMeshMetaData *mmd = md->GetMesh(i); const avtMeshMetaData *mmd = md->GetMesh(i);
if (mmd->hideFromGUI || !mmd->validVariable)
continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/CracksClipper/%s/den", mmd->name.c_str()); sprintf(name, "operators/CracksClipper/%s/den", mmd->name.c_str());
......
...@@ -106,7 +106,7 @@ Declaration: virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMeta ...@@ -106,7 +106,7 @@ Declaration: virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMeta
Definition: Definition:
ExpressionList * ExpressionList *
DataBinningCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) DataBinningCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
char name[1024]; char name[1024];
char defn[1024]; char defn[1024];
...@@ -116,6 +116,9 @@ DataBinningCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md ...@@ -116,6 +116,9 @@ DataBinningCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md
{ {
const char *mesh = md->GetMeshes(i).name.c_str(); const char *mesh = md->GetMeshes(i).name.c_str();
if (md->GetMeshes(i).hideFromGUI || !md->GetMeshes(i).validVariable)
continue;
Expression e2; Expression e2;
sprintf(name, "operators/DataBinning/1D/%s", mesh); sprintf(name, "operators/DataBinning/1D/%s", mesh);
e2.SetName(name); e2.SetName(name);
......
...@@ -3,7 +3,7 @@ Function: ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions ...@@ -3,7 +3,7 @@ Function: ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions
Declaration: virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMetaData *); Declaration: virtual ExpressionList *GetCreatedExpressions(const avtDatabaseMetaData *);
Definition: Definition:
ExpressionList * ExpressionList *
ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
char name[1024]; char name[1024];
char defn[1024]; char defn[1024];
...@@ -14,6 +14,9 @@ ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseM ...@@ -14,6 +14,9 @@ ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseM
const char *array = md->GetArrays(i).name.c_str(); const char *array = md->GetArrays(i).name.c_str();
const char *mesh = md->GetArrays(i).meshName.c_str(); const char *mesh = md->GetArrays(i).meshName.c_str();
if (md->GetArrays(i).hideFromGUI || !md->GetArrays(i).validVariable)
continue;
Expression e; Expression e;
sprintf(name, "operators/ExtractPointFunction2D/%s", array); sprintf(name, "operators/ExtractPointFunction2D/%s", array);
e.SetName(name); e.SetName(name);
...@@ -32,7 +35,7 @@ ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseM ...@@ -32,7 +35,7 @@ ExtractPointFunction2DCommonPluginInfo::GetCreatedExpressions(const avtDatabaseM
if (e.GetType() == Expression::ArrayMeshVar) if (e.GetType() == Expression::ArrayMeshVar)
{ {
{ {
if (e.GetFromOperator()) if (e.GetFromOperator() || e.GetAutoExpression())
continue; // weird ordering behavior otherwise continue; // weird ordering behavior otherwise
Expression e2; Expression e2;
sprintf(name, "operators/ExtractPointFunction2D/%s", e.GetName().c_str()); sprintf(name, "operators/ExtractPointFunction2D/%s", e.GetName().c_str());
......
...@@ -122,7 +122,6 @@ FluxCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const ...@@ -122,7 +122,6 @@ FluxCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
const avtMeshMetaData *mmd = md->GetMesh(i); const avtMeshMetaData *mmd = md->GetMesh(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/Flux/%s", mmd->name.c_str()); sprintf(name, "operators/Flux/%s", mmd->name.c_str());
......
...@@ -122,7 +122,6 @@ IntegralCurveCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData * ...@@ -122,7 +122,6 @@ IntegralCurveCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *
const avtVectorMetaData *mmd = md->GetVector(i); const avtVectorMetaData *mmd = md->GetVector(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/IntegralCurve/%s", mmd->name.c_str()); sprintf(name, "operators/IntegralCurve/%s", mmd->name.c_str());
......
...@@ -122,7 +122,6 @@ LCSCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const ...@@ -122,7 +122,6 @@ LCSCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
const avtVectorMetaData *mmd = md->GetVector(i); const avtVectorMetaData *mmd = md->GetVector(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/LCS/%s", mmd->name.c_str()); sprintf(name, "operators/LCS/%s", mmd->name.c_str());
...@@ -166,7 +165,7 @@ LCSCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const ...@@ -166,7 +165,7 @@ LCSCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
el->AddExpressions(e2); el->AddExpressions(e2);
} }
{ {
if (e.GetFromOperator()) if (e.GetFromOperator() || e.GetAutoExpression())
continue; // weird ordering behavior otherwise continue; // weird ordering behavior otherwise
Expression e2; Expression e2;
sprintf(name, "operators/LCS/%s", e.GetName().c_str()); sprintf(name, "operators/LCS/%s", e.GetName().c_str());
......
...@@ -122,7 +122,6 @@ LagrangianCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) ...@@ -122,7 +122,6 @@ LagrangianCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md)
const avtVectorMetaData *mmd = md->GetVector(i); const avtVectorMetaData *mmd = md->GetVector(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/Lagrangian/%s", mmd->name.c_str()); sprintf(name, "operators/Lagrangian/%s", mmd->name.c_str());
......
...@@ -122,7 +122,6 @@ LimitCycleCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) ...@@ -122,7 +122,6 @@ LimitCycleCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md)
const avtVectorMetaData *mmd = md->GetVector(i); const avtVectorMetaData *mmd = md->GetVector(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/LimitCycle/%s", mmd->name.c_str()); sprintf(name, "operators/LimitCycle/%s", mmd->name.c_str());
......
...@@ -264,7 +264,7 @@ Definition: ...@@ -264,7 +264,7 @@ Definition:
// **************************************************************************** // ****************************************************************************
ExpressionList * ExpressionList *
LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
std::string opLineout("operators/Lineout/"), std::string opLineout("operators/Lineout/"),
exPrefix("cell_constant("), exSuffix(", 0.)"), exPrefix("cell_constant("), exSuffix(", 0.)"),
...@@ -274,6 +274,8 @@ LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) ...@@ -274,6 +274,8 @@ LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md)
for (int i = 0 ; i < numScalars ; i++) for (int i = 0 ; i < numScalars ; i++)
{ {
const avtScalarMetaData *mmd = md->GetScalar(i); const avtScalarMetaData *mmd = md->GetScalar(i);
if (mmd->hideFromGUI || !mmd->validVariable)
continue;
{ {
Expression e2; Expression e2;
e2.SetName(opLineout + mmd->name); e2.SetName(opLineout + mmd->name);
...@@ -288,6 +290,8 @@ LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) ...@@ -288,6 +290,8 @@ LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md)
for (int i = 0 ; i < oldEL.GetNumExpressions() ; i++) for (int i = 0 ; i < oldEL.GetNumExpressions() ; i++)
{ {
const Expression &e = oldEL.GetExpressions(i); const Expression &e = oldEL.GetExpressions(i);
if (e.GetFromOperator() || e.GetAutoExpression())
continue;
if (e.GetType() == Expression::ScalarMeshVar) if (e.GetType() == Expression::ScalarMeshVar)
{ {
{ {
......
...@@ -127,7 +127,6 @@ LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) co ...@@ -127,7 +127,6 @@ LineoutCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) co
const avtScalarMetaData *mmd = md->GetScalar(i); const avtScalarMetaData *mmd = md->GetScalar(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
e2.SetName(opLineout + mmd->name); e2.SetName(opLineout + mmd->name);
......
...@@ -23,7 +23,7 @@ Definition: ...@@ -23,7 +23,7 @@ Definition:
#include <string.h> #include <string.h>
ExpressionList * ExpressionList *
ModelFitCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) ModelFitCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
int numMeshes = md->GetNumMeshes(); int numMeshes = md->GetNumMeshes();
if (numMeshes == 0) if (numMeshes == 0)
......
...@@ -4269,3 +4269,4 @@ PoincareAttributes::PoincareAttsRequireRecalculation(const PoincareAttributes &o ...@@ -4269,3 +4269,4 @@ PoincareAttributes::PoincareAttsRequireRecalculation(const PoincareAttributes &o
showLines != obj.showLines || showLines != obj.showLines ||
showPoints != obj.showPoints; showPoints != obj.showPoints;
} }
...@@ -122,7 +122,6 @@ PoincareCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) c ...@@ -122,7 +122,6 @@ PoincareCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) c
const avtVectorMetaData *mmd = md->GetVector(i); const avtVectorMetaData *mmd = md->GetVector(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/Poincare/%s", mmd->name.c_str()); sprintf(name, "operators/Poincare/%s", mmd->name.c_str());
......
...@@ -15,7 +15,7 @@ Definition: ...@@ -15,7 +15,7 @@ Definition:
// **************************************************************************** // ****************************************************************************
ExpressionList * ExpressionList *
StatisticalTrendsCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) StatisticalTrendsCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *md) const
{ {
int t, i; int t, i;
char name[1024], defn[1024]; char name[1024], defn[1024];
...@@ -31,6 +31,9 @@ StatisticalTrendsCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaDa ...@@ -31,6 +31,9 @@ StatisticalTrendsCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaDa
for (i = 0 ; i < numScalars ; i++) for (i = 0 ; i < numScalars ; i++)
{ {
const avtScalarMetaData *mmd = md->GetScalar(i); const avtScalarMetaData *mmd = md->GetScalar(i);
if (mmd->hideFromGUI || !mmd->validVariable)
continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/StatisticalTrends/%s/%s", sprintf(name, "operators/StatisticalTrends/%s/%s",
...@@ -55,7 +58,7 @@ StatisticalTrendsCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaDa ...@@ -55,7 +58,7 @@ StatisticalTrendsCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaDa
const Expression &e = oldEL.GetExpressions(i); const Expression &e = oldEL.GetExpressions(i);
if (e.GetType() == Expression::ScalarMeshVar) if (e.GetType() == Expression::ScalarMeshVar)
{ {
if (e.GetFromOperator()) if (e.GetFromOperator() || e.GetAutoExpression())
continue; // weird ordering behavior otherwise continue; // weird ordering behavior otherwise
Expression e2; Expression e2;
sprintf(name, "operators/StatisticalTrends/%s/%s", sprintf(name, "operators/StatisticalTrends/%s/%s",
......
...@@ -122,7 +122,6 @@ SurfaceNormalCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData * ...@@ -122,7 +122,6 @@ SurfaceNormalCommonPluginInfo::GetCreatedExpressions(const avtDatabaseMetaData *
const avtMeshMetaData *mmd = md->GetMesh(i); const avtMeshMetaData *mmd = md->GetMesh(i);
if (mmd->hideFromGUI || !mmd->validVariable) if (mmd->hideFromGUI || !mmd->validVariable)
continue; continue;
{ {
Expression e2; Expression e2;
sprintf(name, "operators/SurfaceNormal/%s", mmd->name.c_str()); sprintf(name, "operators/SurfaceNormal/%s", mmd->name.c_str());
......
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