From 1086db478b85f22bc81050a32ac30788a94fd68f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 23 May 2011 16:11:39 +0000
Subject: [PATCH] forgot to update finalize prototype (fixes bug with missing
recomp of min/max in plugins on list-based views)
---
Plugin/ModifyComponent.cpp | 3 +--
Post/PViewDataList.cpp | 2 +-
Post/PViewDataList.h | 2 +-
Post/PViewDataRemote.h | 5 ++++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Plugin/ModifyComponent.cpp b/Plugin/ModifyComponent.cpp
index 94e2a57ed9..7a918f41fc 100644
--- a/Plugin/ModifyComponent.cpp
+++ b/Plugin/ModifyComponent.cpp
@@ -148,8 +148,6 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
octree = new OctreePost(v2);
}
- v1->setChanged(true);
-
for(int step = 0; step < data1->getNumTimeSteps(); step++){
if(timeStep >= 0 && timeStep != step) continue;
@@ -207,6 +205,7 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
if(octree) delete octree;
data1->finalize();
+ v1->setChanged(true);
return v1;
}
diff --git a/Post/PViewDataList.cpp b/Post/PViewDataList.cpp
index 9635e70916..27eb8ae3d1 100644
--- a/Post/PViewDataList.cpp
+++ b/Post/PViewDataList.cpp
@@ -25,7 +25,7 @@ PViewDataList::PViewDataList()
for(int i = 0; i < 24; i++) _index[i] = 0;
}
-bool PViewDataList::finalize(bool computeMinMax)
+bool PViewDataList::finalize(bool computeMinMax, const std::string &interpolationScheme)
{
BBox.reset();
Min = VAL_INF;
diff --git a/Post/PViewDataList.h b/Post/PViewDataList.h
index 8b72653d93..bfa4df8e28 100644
--- a/Post/PViewDataList.h
+++ b/Post/PViewDataList.h
@@ -58,7 +58,7 @@ class PViewDataList : public PViewData {
public:
PViewDataList();
~PViewDataList(){}
- bool finalize(bool computeMinMax=true);
+ bool finalize(bool computeMinMax=true, const std::string &interpolationScheme="");
int getNumTimeSteps(){ return NbTimeStep; }
double getTime(int step);
double getMin(int step=-1, bool onlyVisible=false);
diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h
index b4b9287b87..6f2230682c 100644
--- a/Post/PViewDataRemote.h
+++ b/Post/PViewDataRemote.h
@@ -29,7 +29,10 @@ class PViewDataRemote : public PViewData {
: _remote(remote), _min(min), _max(max), _numTimeSteps(numsteps),
_time(time), _bbox(bbox) {}
~PViewDataRemote(){}
- bool finalize(){ return true; }
+ bool finalize(bool computeMinMax=true, const std::string &interpolationScheme="")
+ {
+ return true;
+ }
int getNumTimeSteps(){ return _numTimeSteps; }
double getMin(int step=-1, bool onlyVisible=false){ return _min; }
double getMax(int step=-1, bool onlyVisible=false){ return _max; }
--
GitLab