diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp index de72d20db034b3d3d4b8dbb5954a5ccb0be71b02..14996aef484f6e9ce424c9a2bb1965186f9b1172 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 00acafbabd02f53f2dbdba0dcd1c763b88faabcd..55241452e13f9094576003c2ec108d1f8b8d5c9e 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 1c9a9be207c79ef0a215223775c9f3d3f16b182a..ac659434bdc35247f0c6c9f9d9b4093c998797bd 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 275b21cfe66433c87f9a51c8802fcbca582f83bf..c4b5d60c14f97817d599a552960e406a3f2eb0fb 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,