X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=a1a0fd10793034b4745c4196f39cf6050833be00;hb=7a86b21a88862240b2b56d165433cbcbb50ab316;hp=04dcfdf1403a55048857b5f9e3a3cc05d1f233d4;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 04dcfdf..a1a0fd1 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -97,23 +97,16 @@ namespace bbtk //======================================================================= void Interpreter::Init(VirtualExec::Pointer e, const std::string& cpp_file) { - if (e) - { - mVirtualExecuter = e; - } - else if (cpp_file.size()!=0) - { - mVirtualExecuter = boost::static_pointer_cast(bbtk::Transcriptor::New(cpp_file)); - } - else - { - bbtk::Executer::Pointer exe = bbtk::Executer::New(); - mRealExecuter = exe; - mVirtualExecuter = boost::static_pointer_cast(exe); + if (e) { + mVirtualExecuter = e; + } else if (cpp_file.size()!=0){ + mVirtualExecuter = boost::static_pointer_cast(bbtk::Transcriptor::New(cpp_file)); + } else { + bbtk::Executer::Pointer exe = bbtk::Executer::New(); + mRealExecuter = exe; + mVirtualExecuter = boost::static_pointer_cast(exe); } - - // Lock this pointer or will auto-destruct !! if (!e) mVirtualExecuter->SetInterpreter(MakePointer(this,true)); @@ -1577,7 +1570,11 @@ void Interpreter::commandHelp(const std::vector& words) CommandDictType::iterator c; c = mCommandDict.find(s); if ( c == mCommandDict.end() ) { - bbtkError(s<<" : Unknown command"); + +//EED 2016-12-22 +// bbtkError(s<<" : Unknown command"); + std::string tmpSS=s+" : Unknown command"; + bbtkError(tmpSS); } // std::cout << " " << s << " : "<< std::endl; // CommandParamDictType::iterator i; @@ -2020,8 +2017,21 @@ void Interpreter::commandNewGUI(const std::string& boxname, ( d->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) ) continue; #else +// JFGA 12/12/2014 Adding WT options for compile with it. + +/*#if USE_WT + + if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) || + ( d->GetCreatorTypeInfo() == typeid(WtBlackBoxDescriptor)) ) + continue; + + +#else +*/ if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) ) continue; +//#endif + #endif bool widok = true; std::string widget,adaptor;