From 5297095fb571736759ff9da1f6f574c4791acb35 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 23 Jan 2013 10:27:17 +0000
Subject: [PATCH] fix bugs with sparse steps
---
Fltk/pluginWindow.cpp | 2 +-
Plugin/Levelset.cpp | 4 ++--
Post/PViewDataGModel.cpp | 6 ++++--
Post/PViewDataGModelIO.cpp | 4 +---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index de72d20db0..14996aef48 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -315,7 +315,7 @@ pluginWindow::pluginWindow(int deltaFontSize)
browser->box(FL_FLAT_BOX);
browser->has_scrollbar(Fl_Browser_::VERTICAL);
- view_browser = new Fl_Multi_Browser(L1, 0, L2, height);
+ view_browser = new Fl_Multi_Browser(L1 + 1, 0, L2 - 1, height);
view_browser->has_scrollbar(Fl_Browser_::VERTICAL);
view_browser->callback(plugin_browser_cb);
view_browser->box(FL_FLAT_BOX);
diff --git a/Plugin/Levelset.cpp b/Plugin/Levelset.cpp
index 00acafbabd..55241452e1 100644
--- a/Plugin/Levelset.cpp
+++ b/Plugin/Levelset.cpp
@@ -291,7 +291,7 @@ void GMSH_LevelsetPlugin::_cutAndAddElements(PViewData *vdata, PViewData *wdata,
// check which edges cut the iso and interpolate the value
if(wstep < 0) otherstep = step;
- //if(!wdata->hasTimeStep(otherstep)) continue;
+ if(!wdata->hasTimeStep(otherstep)) continue;
int np = 0;
double xp[12], yp[12], zp[12], valp[12][9];
@@ -488,7 +488,7 @@ PView *GMSH_LevelsetPlugin::execute(PView *v)
else{
// create one view per timestep
for(int step = 0; step < vdata->getNumTimeSteps(); step++){
- //if(!vdata->hasTimeStep(step)) continue;
+ if(!vdata->hasTimeStep(step)) continue;
PViewDataList *out = getDataList(new PView());
for(int ent = 0; ent < vdata->getNumEntities(step); ent++){
for(int ele = 0; ele < vdata->getNumElements(step, ent); ele++){
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index 1c9a9be207..ac659434bd 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -292,8 +292,10 @@ SBoundingBox3d PViewDataGModel::getBoundingBox(int step)
{
if(step < 0 || _steps.empty()){
SBoundingBox3d tmp;
- for(unsigned int i = 0; i < _steps.size(); i++)
- tmp += _steps[i]->getBoundingBox();
+ for(unsigned int i = 0; i < _steps.size(); i++){
+ if(!_steps[i]->getBoundingBox().empty())
+ tmp += _steps[i]->getBoundingBox();
+ }
return tmp;
}
return _steps[step]->getBoundingBox();
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 275b21cfe6..c4b5d60c14 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -48,10 +48,8 @@ bool PViewDataGModel::addData(GModel *model, std::map<int, std::vector<double> >
void PViewDataGModel::destroyData()
{
- for(unsigned int i=0;i<_steps.size();i++)
- {
+ for(unsigned int i = 0; i < _steps.size(); i++)
_steps[i]->destroyData();
- }
}
bool PViewDataGModel::readMSH(const std::string &viewName, const std::string &fileName,
--
GitLab