From 08eebd19e2e0576453d18c70809246da0b53e61a Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Mon, 2 Apr 2012 16:37:01 +0000 Subject: [PATCH] initial 3M import --- Common/OpenFile.cpp | 9 +++++++++ Fltk/onelabWindow.cpp | 13 ++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp index c5a413311e..3c43c589ef 100644 --- a/Common/OpenFile.cpp +++ b/Common/OpenFile.cpp @@ -41,6 +41,10 @@ #include "drawContext.h" #endif +#if defined(HAVE_3M) +#include "3M.h" +#endif + #define SQU(a) ((a)*(a)) static void FinishUpBoundingBox() @@ -362,6 +366,11 @@ int MergeFile(std::string fileName, bool warnIfMissing) else if(ext == ".cgns" || ext == ".CGNS"){ status = GModel::current()->readCGNS(fileName); } +#endif +#if defined(HAVE_3M) + else if(ext == ".csv"){ + status = readFile3M(fileName); + } #endif else { CTX::instance()->geom.draw = 1; diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp index 55f2ab7cb9..afa6f8ab26 100644 --- a/Fltk/onelabWindow.cpp +++ b/Fltk/onelabWindow.cpp @@ -457,20 +457,19 @@ static void initializeLoop(const std::string &level) onelab::server::instance()->get(numbers); for(unsigned int i = 0; i < numbers.size(); i++){ if(numbers[i].getAttribute("Loop") == level){ - if(numbers[i].getChoices().size() > 1){ numbers[i].setValue(numbers[i].getChoices()[0]); onelab::server::instance()->set(numbers[i]); changed = true; } - else if(numbers[i].getStep()>0){ + else if(numbers[i].getStep() > 0){ if(numbers[i].getMin() != -onelab::parameter::maxNumber()){ numbers[i].setValue(numbers[i].getMin()); onelab::server::instance()->set(numbers[i]); changed = true; } } - else if(numbers[i].getStep()<0){ + else if(numbers[i].getStep() < 0){ if(numbers[i].getMax() != onelab::parameter::maxNumber()){ numbers[i].setValue(numbers[i].getMax()); onelab::server::instance()->set(numbers[i]); @@ -511,7 +510,7 @@ static bool incrementLoop(const std::string &level) } } } - else if(numbers[i].getStep()>0){ + else if(numbers[i].getStep() > 0){ if(numbers[i].getMax() != onelab::parameter::maxNumber() && numbers[i].getValue() < numbers[i].getMax()){ numbers[i].setValue(numbers[i].getValue() + numbers[i].getStep()); @@ -521,7 +520,7 @@ static bool incrementLoop(const std::string &level) recompute = true; } } - else if(numbers[i].getStep()<0){ + else if(numbers[i].getStep() < 0){ if(numbers[i].getMin() != -onelab::parameter::maxNumber() && numbers[i].getValue() > numbers[i].getMin()){ numbers[i].setValue(numbers[i].getValue() + numbers[i].getStep()); @@ -572,11 +571,11 @@ static std::vector<double> getRange(onelab::number &p) } else if(p.getMin() != -onelab::parameter::maxNumber() && p.getMax() != onelab::parameter::maxNumber()){ - if(p.getStep()>0){ + if(p.getStep() > 0){ for(double d = p.getMin(); d <= p.getMax(); d += p.getStep()) v.push_back(d); } - else if(p.getStep()<0){ + else if(p.getStep() < 0){ for(double d = p.getMin(); d <= p.getMax(); d -= p.getStep()) v.push_back(d); } -- GitLab