Skip to content
Snippets Groups Projects
Commit ba7a1dad authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

avoid confusion v/view

parent 4434c659
No related branches found
No related tags found
No related merge requests found
......@@ -101,7 +101,7 @@ StringXString *GMSH_EvaluatePlugin::getOptionStr(int iopt)
return &EvaluateOptions_String[iopt];
}
PView *GMSH_EvaluatePlugin::execute(PView *v)
PView *GMSH_EvaluatePlugin::execute(PView *view)
{
int component = (int)EvaluateOptions_Number[0].def;
int timeStep = (int)EvaluateOptions_Number[1].def;
......@@ -110,8 +110,8 @@ PView *GMSH_EvaluatePlugin::execute(PView *v)
int iView = (int)EvaluateOptions_Number[4].def;
const char *expr = EvaluateOptions_String[0].def.c_str();
PView *v1 = getView(iView, v);
if(!v1) return v;
PView *v1 = getView(iView, view);
if(!v1) return view;
PViewData *data1 = v1->getData();
......@@ -146,7 +146,7 @@ PView *GMSH_EvaluatePlugin::execute(PView *v)
void *f = evaluator_create((char*)expr);
if(!f){
Msg::Error("Invalid expression '%s'", expr);
return v;
return view;
}
OctreePost *octree = 0;
......
......@@ -133,7 +133,7 @@ static std::vector<double> *incrementList(PViewDataList *data, int numComp,
return 0;
}
PView *GMSH_ExtractPlugin::execute(PView *v)
PView *GMSH_ExtractPlugin::execute(PView *view)
{
int timeStep = (int)ExtractOptions_Number[0].def;
int iView = (int)ExtractOptions_Number[1].def;
......@@ -147,13 +147,13 @@ PView *GMSH_ExtractPlugin::execute(PView *v)
ExtractOptions_String[7].def.c_str(),
ExtractOptions_String[8].def.c_str() };
PView *v1 = getView(iView, v);
if(!v1) return v;
PView *v1 = getView(iView, view);
if(!v1) return view;
PViewData *data1 = v1->getData();
if(data1->hasMultipleMeshes()){
Msg::Error("Extract plugin cannot be applied to multi-mesh views");
return v;
return view;
}
int numComp2;
......@@ -182,7 +182,7 @@ PView *GMSH_ExtractPlugin::execute(PView *v)
Msg::Error("Invalid expression '%s'", expr[i]);
for(int j = 0; j < i; j++)
if(f[j]) evaluator_destroy(f[j]);
return v;
return view;
}
}
#else
......@@ -199,7 +199,7 @@ PView *GMSH_ExtractPlugin::execute(PView *v)
else if(!strcmp(expr[i], "v8")) comp2[i] = 8;
else{
Msg::Error("Invalid expression '%s'", expr[i]);
return v;
return view;
}
}
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment