From 189807a797cb9f98120ec36183b63ed9b7402121 Mon Sep 17 00:00:00 2001 From: davila Date: Mon, 12 Jan 2015 11:02:00 +0100 Subject: [PATCH] #2495 BBTK Bug New Normal - Boost signals deprecated -> signals2 --- kernel/src/bbtkInterpreter.h | 254 +-------------------- kernel/src/bbtkInterpreterVirtual.cxx | 36 ++- kernel/src/bbtkKW.h | 6 +- kernel/src/bbtkQt.h | 4 +- kernel/src/bbtkWxGUIScriptingInterface.cxx | 2 +- 5 files changed, 26 insertions(+), 276 deletions(-) diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 8c0e144..e518cfd 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -54,9 +54,6 @@ #include #include -// Signal/slot mechanism for 'break' commands -//#include -//#include namespace bbtk { @@ -65,82 +62,10 @@ namespace bbtk class WxConsole; #endif -/* EED Borrame - //======================================================================= - class BBTK_EXPORT InterpreterUser - { - public: - InterpreterUser() {} - virtual ~InterpreterUser() {} - - virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; } - virtual void InterpreterUserViewHtmlPage(const std::string&) {} - }; - //======================================================================= -*/ -/* EED Borrame - //======================================================================= - class BBTK_EXPORT InterpreterException : public Exception - { - public: - InterpreterException( const std::string& message, - bool in_script_file, - const std::string& script_file, - int script_line - ); - InterpreterException( const Exception& excep, - bool in_script_file, - const std::string& script_file, - int script_line - ); - ~InterpreterException() throw() {} - - bool IsInScriptFile() const { return mInScriptFile; } - const std::string& GetScriptFile() const { return mScriptFile; } - int GetScriptLine() const { return mScriptLine; } - private: - bool mInScriptFile; - std::string mScriptFile; - int mScriptLine; - }; - //======================================================================= -*/ - - /* - //======================================================================= - // The "Quit" exception - class BBTK_EXPORT QuitException : public InterpreterError - { - public: - QuitException( bool in_script_file, - const std::string& script_file, - int script_line - ) - : InterpreterError("QUIT",in_script_file,script_file,script_line) - {} - ~QuitException() throw() {} - }; - //======================================================================= - const std::string BREAK("BREAK"); - //======================================================================= - // The "Break" exception - class BBTK_EXPORT BreakException : public InterpreterError - { - public: - BreakException( bool in_script_file, - std::string script_file, - int script_line - ) - : InterpreterError(BREAK,in_script_file,script_file,script_line) - { std::cout << "BUILDING BREAK"<SetDialogMode(t);} -/*EED Borrame - /// Sets the bool that indicates wether we are in command line context - void SetCommandLine(bool v = true) { mCommandLine = v; } - - void SetThrow(bool b) { mThrow = b; } - -#ifdef USE_WXWIDGETS - /// Sets the user of the interpreter (if any) - void SetUser(InterpreterUser* c) { mUser = c; } - /// Gets the InterpreterUser of this - InterpreterUser* GetUser() { return mUser; } - /// Gets the InterpreterUser of this (const) - const InterpreterUser* GetUser() const { return mUser; } - -#endif - */ /// Gets the Executer VirtualExec::Pointer GetExecuter() const { return mVirtualExecuter; } @@ -228,83 +111,6 @@ namespace bbtk protected: -/* EED Borrame - /// The enumeration of command codes == Command name - typedef enum - { - cBreak, // LG 12/12/08 : Stops the current script execution (if not exec frozen) - used in tutorial + debugging - cClear, // LG 12/12/08 : Clears the current complex black box (e.g. workspace) - used in tours - cNew, - cDelete, - cConnect, - cExec, - cPackage, - cEndPackage, - cDefine, - cEndDefine, - cInput, - cOutput, - cSet, - cConfig, // JPR - cReset, // EED - cAuthor, - cCategory, // JPR - cDescription, - cHelp, - cMessage, - cInclude, - cQuit, - cLoad, - cUnload, - cGraph, - cPrint, - cIndex, - cKind, // LG - cNewGUI, // LG - cWorkspace, // LG - cDebug // LG - } CommandCodeType; - - /// The structure storing the informations on a command - typedef struct - { - std::string keyword; - int argmin, argmax; - CommandCodeType code; - std::string syntax; - std::string help; - } CommandInfoType; - - /// The type of dictionnary of commands - typedef std::map CommandDictType; - - - /// Interprets a line - void DoInterpretLine( const std::string& line ); //, bool &insideComment ); - - /// Reads a line from prompt - void GetLineFromPrompt( std::string& line ); - - /// Splits a line into words - void SplitLine ( const std::string& line, - std::vector& words ); - - /// Executes the right action depending on the command name - void InterpretCommand( const std::vector& words, - CommandInfoType& info ); - - /// Switch to the interpretation of a file - void SwitchToFile( const std::string& filename, bool source = false ); - - /// Switch to the interpretation of a stringstream - void SwitchToStream( std::stringstream* stream ); - - /// Closes the currently open file - void CloseCurrentFile(); - - /// Closes all open files - void CloseAllFiles(); -*/ /// Resets all virtual void commandReset(); @@ -331,20 +137,14 @@ namespace bbtk virtual void commandIndex(const std::string& filename, const std::string& type = "Initials"); -/*EED Borrame - /// - void FindCommandsWithPrefix( char* buf, - int n, - std::vector& commands ); -*/ /// Creates and connects the piece of pipeline which defines a GUI /// for the box box. /// Define it as a complex box type with name instanceName+"Type" /// The instance is called instanceName /// and connected to the existing pipeline - virtual void commandNewGUI(const std::string& box,const std::string& instanceName); - virtual void commandDebug(const std::string& arg); + virtual void commandNewGUI(const std::string& box,const std::string& instanceName); + virtual void commandDebug(const std::string& arg); virtual void commandNew(const std::string &boxType,const std::string &boxName); virtual void commandDelete(const std::string &boxName); virtual void commandConnection(const std::string &nodeFrom,const std::string &outputLabel,const std::string &nodeTo,const std::string &inputLabel); @@ -383,12 +183,7 @@ namespace bbtk void Init(VirtualExec::Pointer, const std::string& cpp_file); -/*EED Borrame - /// Opens the file fullPathScriptName - /// includeScriptName is the name as given to the include command - void LoadScript( std::string fullPathScriptName, - std::string includeScriptName); -*/ + //================================================================== // ATTRIBUTES @@ -396,49 +191,6 @@ namespace bbtk bbtk::VirtualExec::Pointer mVirtualExecuter; bbtk::Executer::WeakPointer mRealExecuter; -/*EED Borrame - /// The user of the interpreter (0 if none) - bbtk::InterpreterUser* mUser; - /// Vector of open files / buffers (can be stringstream) - std::vector mFile; - - /// Vector of names of open files with full path (as open) - std::vector mFileName; - - /// Vector of names of files which have been open - /// before (and may closed then which are no more in mFileName) - /// with full path (as open) - std::vector mFileNameHistory; - - /// Vector of names of open files as given to the include command - std::vector mIncludeFileName; - - /// Stores the current line number in each open file - std::vector mLine; - - /// The dictionnary of commands - CommandDictType mCommandDict; - - /// Are we in a command line context ? - bool mCommandLine; - - /// Are we inside a commented-out zone ? - bool mInsideComment; - - /// The current interpreter status - ExitStatus mStatus; - - /// The history of commands - std::deque< char* > mHistory; - - int bufferNb; - - bool mThrow; - - /// The break signal - // BreakSignalType mBreakSignal; - - */ protected: ~Interpreter(); diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx index 2498e90..c1a6fac 100644 --- a/kernel/src/bbtkInterpreterVirtual.cxx +++ b/kernel/src/bbtkInterpreterVirtual.cxx @@ -892,19 +892,19 @@ namespace bbtk // break and quit commands if ((command.code==cBreak) || (command.code==cQuit)) - { - bool in_script = false; - std::string file(""); - int line = 0; - - if (mFileName.size()) - { - std::ifstream* fs = dynamic_cast(mFile.back()); - if (fs!=0) in_script = true; - file = mFileName.back(); - line = mLine.back(); - } - if (command.code==cBreak) + { +//EED-Borrame bool in_script = false; +//EED-Borrame std::string file(""); +//EED-Borrame int line = 0; + +//EED-Borrame if (mFileName.size()) +//EED-Borrame { +//EED-Borrame std::ifstream* fs = dynamic_cast(mFile.back()); +//EED-Borrame if (fs!=0) in_script = true; +//EED-Borrame file = mFileName.back(); +//EED-Borrame line = mLine.back(); +//EED-Borrame } + if (command.code==cBreak) { /* std::cout << "BreakException(" @@ -915,15 +915,13 @@ namespace bbtk commandBreak(); //EED Borrame bbtkError("break");//,in_script,file,line); // throw BreakException(in_script,file,line); - } - else - { + } else { commandQuit(); //EED Borrame bbtkError("quit");//,in_script,file,line); //throw QuitException(in_script,file,line); - } - return; - } + } // cBreak + return; + } // cBreak cQuit //std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "< +#include #include // \BBTKKWSIG //=========================================================================== @@ -81,8 +81,8 @@ namespace bbtk { public: // BBTKKWSIG - typedef boost::signals::trackable SignalObserver; - typedef boost::signal Signal_type; + typedef boost::signals2::signals::trackable SignalObserver; + typedef boost::signals2::signal Signal_type; typedef Signal_type::slot_function_type Slot_function_type; // \BBTKKWSIG diff --git a/kernel/src/bbtkQt.h b/kernel/src/bbtkQt.h index 0b6e948..08deb58 100644 --- a/kernel/src/bbtkQt.h +++ b/kernel/src/bbtkQt.h @@ -42,7 +42,7 @@ // SIGNAL/SLOT MECHANISM // FOR bbtk WINDOWS CREATION/DESTRUCTION OBSERVATION // BBTKWXSIG -#include +#include #include typedef boost::signals::trackable SignalObserver; // \BBTKWXSIG @@ -88,7 +88,7 @@ namespace bbtk // BBTKWXSIG // The keyword 'signals' is also a macro in qt // typedef boost::signals::trackable SignalObserver; - typedef boost::signal Signal_type; + typedef boost::signals2::signal Signal_type; typedef Signal_type::slot_function_type Slot_function_type; // \BBTKWXSIG diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index 9e8e57d..4425cc8 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -871,7 +871,7 @@ std::cout << "================================================================== printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked cc %s \n",commandPath.c_str() ); // cleanning path - while (commandPath.rfind("\\\\")!=-1 ) + while ((int)commandPath.rfind("\\\\")!=-1 ) { commandPath.erase( commandPath.rfind("\\\\") , 1 ); printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked cc %s \n",commandPath.c_str() ); -- 2.45.1