From: davila <> Date: Fri, 17 Sep 2010 16:00:27 +0000 (+0000) Subject: no message X-Git-Tag: v1_0_0~45 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=aa99bb93c420e8cbd5ed491a3a4480e4b9e4e919;p=bbtkGEditor.git no message --- diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/ExecuterBBSG.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/ExecuterBBSG.cxx deleted file mode 100644 index 39df179..0000000 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/ExecuterBBSG.cxx +++ /dev/null @@ -1,296 +0,0 @@ -/*========================================================================= -Program: bbtk -Module: $RCSfile$ -Language: C++ -Date: $Date$ -Version: $Revision$ -=========================================================================*/ - -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -* or in the file LICENSE.txt. -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited -* liability. -* -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ - -/** -* \file -* \brief Class bbtk::GConnectorModel -*/ - - -#include "ExecuterBBSG.h" - -#include "bbtkExecuter.h" -#include "bbtkMessageManager.h" -#include "bbtkFactory.h" -#include "bbtkUtilities.h" - - - -namespace bbtk -{ - - - - EExecuterBBSG::Pointer EExecuterBBSG::New( wxVtkSceneManager* sceneManager, Factory::Pointer factory ) - { - return MakePointer( new EExecuterBBSG( sceneManager, factory) ); - } - - - //========================================================================= - - EExecuterBBSG::EExecuterBBSG( wxVtkSceneManager* sceneManager, Factory::Pointer factory ) - { - _factory = factory; - _sceneManager = sceneManager; - - _xGeneral = 10; - _yGeneral = 10; - _zGeneral = 900; // ????? - - } - - //========================================================================= - - EExecuterBBSG::~EExecuterBBSG() - { - } - - //========================================================================= - - - -//--EED - /// Sets the inputs of the workspace : - void EExecuterBBSG::SetInputs(const std::map& m) - { - } - - /// Puts the executer in "no exec" mode, - /// which creates but does not execute pipelines - void EExecuterBBSG::SetNoExecMode(bool b) - { - } - - bool EExecuterBBSG::GetNoExecMode() const - { - return true; - } - - /// Sets the mode of dialog of the executer for Root inputs - void EExecuterBBSG::SetDialogMode(DialogModeType t) - { - } - - /// Puts the executer in "no error" mode, - /// Errors do not stop execution (but warnings are produced) - void EExecuterBBSG::SetNoErrorMode(bool b) - { - } - - bool EExecuterBBSG::GetNoErrorMode() const - { - return true; - } - - //================================================================= - /// Loads a package - void EExecuterBBSG::LoadPackage(const std::string &name ) - { - } - - /// Unloads a package - void EExecuterBBSG::UnLoadPackage(const std::string &name ) - { - } - - /// Starts a package block - void EExecuterBBSG::BeginPackage (const std::string &name ) - { - } - - /// Ends a package block - void EExecuterBBSG::EndPackage () - { - } - - /// Starts the definition of a new ComplexBlackBox in package pack - /// scriptfilename is the file from which the def is read - void EExecuterBBSG::Define (const std::string &name, - const std::string& pack, - const std::string &scriptfilename) - { - } - - /// Sets the file name to use for the current definition - /// (Used to set it after the Define command) - void EExecuterBBSG::SetCurrentFileName (const std::string &name ) - { - } - - /// End the definition of a ComplexBlackBox - void EExecuterBBSG::EndDefine () - { - } - - /// Sets the kind of the currently defined ComplexBlackBox - void EExecuterBBSG::Kind(const std::string& kind) - { - } - - /// Creates a new black box in current complex box - void EExecuterBBSG::Create ( const std::string& boxType, const std::string& boxName) - { - std::string packagename = _factory->GetPackageNameOfaBlackBox(boxType); -// int idBox = _sceneManager->createGBlackBox( 0,0, packagename ,boxType); -// _sceneManager->configGBlackBox(idBox, _xGeneral,_yGeneral,_zGeneral,boxName, false , _xGeneral+100, _yGeneral-10 , _zGeneral ); - _yGeneral = _yGeneral + 30; - printf("EED EExecuterBBSG::Create packagename=%s boxtype=%s boxname=%s \n", packagename.c_str(), boxType.c_str(), boxName.c_str() ); - } - - /// Destroys a black box - void EExecuterBBSG::Destroy (const std::string &boxName) - { - } - - /// Clears the currently defined ComplexBlackBox - void EExecuterBBSG::Clear() - { - } - - /// Connects the output boxOutput to the input boxInput - void EExecuterBBSG::Connect (const std::string &boxfrom, - const std::string &output, - const std::string &boxto, - const std::string &input) - { - printf("EED EExecuterBBSG::Connect\n"); - } - - /// Executes the box - void EExecuterBBSG::Execute (const std::string &box) - { - } - - /// Defines an input of the current complex box - void EExecuterBBSG::DefineInput (const std::string &name, - const std::string &box, - const std::string &input, - const std::string &help) - { - } - - /// Defines an output of the current complex box - void EExecuterBBSG::DefineOutput (const std::string &name, - const std::string &box, - const std::string &output, - const std::string &help) - { - } - - /// sets the input of the box with the value - void EExecuterBBSG::Set (const std::string &box, - const std::string &input, - const std::string &value) - { - printf("EED EExecuterBBSG::Set\n"); - } - - /// gets the output of the box - std::string EExecuterBBSG::Get (const std::string &box, - const std::string &output) - { - return ""; - } - - /// changes the workspace name - void EExecuterBBSG::SetWorkspaceName( const std::string& n ) - { - } - - ///Adds the authorName to the Box author list - void EExecuterBBSG::Author(const std::string &authorName) - { - } - - ///Adds the categories to the Box categoris list - void EExecuterBBSG::Category(const std::string &categories) - { - } - - /// The description string which explains what does the ComplexBox - void EExecuterBBSG::Description(const std::string &d) - { - } - - /// prints the list of the boxes of the current box - void EExecuterBBSG::PrintHelpListBoxes() - { - } - - /// Generate a HTML file with a gif file with the actual pipeline (Graphviz-dot needed). Returns the file path - std::string EExecuterBBSG::ShowGraph(const std::string &nameblackbox, - const std::string &detailStr, - const std::string &levelStr, - const std::string &output_file, - const std::string &custom_header, - const std::string &custom_title, - bool system_display) - { - return ""; - } - - /// Generate a HTML with a gif file with the actual pipeline (Graphviz-dot needed). Returns the file path - std::string EExecuterBBSG::ShowGraphInstances(const std::string &nameblackbox, int detail, int level, bool system_display) - { - return ""; - } - - /// Prints help on a black box - void EExecuterBBSG::PrintHelpBlackBox(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr) - { - } - - void EExecuterBBSG::Reset() - { - } - - /// Sets the level of message for kind - void EExecuterBBSG::SetMessageLevel(const std::string &kind, int level) - { - } - - /// Prints help on the messages - void EExecuterBBSG::HelpMessages() - { - } - - /// Prints the string ... MORE : TO EXPLAIN - void EExecuterBBSG::Print(const std::string & message) - { - } - -//--EED - - -} // EO namespace bbtk - -// EOF - diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/ExecuterBBSG.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/ExecuterBBSG.h deleted file mode 100644 index 80e2c10..0000000 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/ExecuterBBSG.h +++ /dev/null @@ -1,223 +0,0 @@ -/*========================================================================= -Program: bbtk -Module: $RCSfile$ -Language: C++ -Date: $Date$ -Version: $Revision$ -=========================================================================*/ - -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -* or in the file LICENSE.txt. -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited -* liability. -* -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ - - -/**** -* Design and Developpement of BBTK GEditor -* Ricardo A Corredor J -* RaC - 2010 -****/ - -#ifndef __ExecuterBBSG_h__ -#define __ExecuterBBSG_h__ - -//Includes same project -#include "wxVtkSceneManager.h" - -//Includes bbtk -#include "bbtkVirtualExec.h" - -//Includes std -#include - - -#include "bbtkSystem.h" -#include "bbtkComplexBlackBox.h" -#include "bbtkFactory.h" - - - -namespace bbtk -{ - - class EExecuterBBSG : public VirtualExec - { - public: - static Pointer New( wxVtkSceneManager* sceneManager, Factory::Pointer factory ); - EExecuterBBSG( wxVtkSceneManager* sceneManager, Factory::Pointer factory ); - ~EExecuterBBSG(); - - //Public methods - -//--EED - - /// Sets the inputs of the workspace : - virtual void SetInputs(const std::map& m); - - /// Puts the executer in "no exec" mode, - /// which creates but does not execute pipelines - virtual void SetNoExecMode(bool b); - - virtual bool GetNoExecMode() const; - - /// Sets the mode of dialog of the executer for Root inputs - virtual void SetDialogMode(DialogModeType t); - - /// Puts the executer in "no error" mode, - /// Errors do not stop execution (but warnings are produced) - virtual void SetNoErrorMode(bool b) ; - virtual bool GetNoErrorMode() const ; - //================================================================= - /// Loads a package - virtual void LoadPackage(const std::string &name ) ; - - /// Unloads a package - virtual void UnLoadPackage(const std::string &name ); - - /// Starts a package block - virtual void BeginPackage (const std::string &name ); - - /// Ends a package block - virtual void EndPackage (); - - /// Starts the definition of a new ComplexBlackBox in package pack - /// scriptfilename is the file from which the def is read - virtual void Define (const std::string &name, - const std::string& pack, - const std::string &scriptfilename); - - /// Sets the file name to use for the current definition - /// (Used to set it after the Define command) - virtual void SetCurrentFileName (const std::string &name ); - - /// End the definition of a ComplexBlackBox - virtual void EndDefine () ; - - /// Sets the kind of the currently defined ComplexBlackBox - virtual void Kind(const std::string& kind); - - /// Creates a new black box in current complex box - virtual void Create ( const std::string& boxType, const std::string& - boxName); - - /// Destroys a black box - virtual void Destroy (const std::string &boxName); - - /// Clears the currently defined ComplexBlackBox - virtual void Clear() ; - - /// Connects the output boxOutput to the input boxInput - virtual void Connect (const std::string &boxfrom, - const std::string &output, - const std::string &boxto, - const std::string &input) ; - - /// Executes the box - virtual void Execute (const std::string &box) ; - - /// Defines an input of the current complex box - virtual void DefineInput (const std::string &name, - const std::string &box, - const std::string &input, - const std::string &help) ; - - /// Defines an output of the current complex box - virtual void DefineOutput (const std::string &name, - const std::string &box, - const std::string &output, - const std::string &help); - - /// sets the input of the box with the value - virtual void Set (const std::string &box, - const std::string &input, - const std::string &value); - - /// gets the output of the box - virtual std::string Get (const std::string &box, - const std::string &output) ; - - /// changes the workspace name - virtual void SetWorkspaceName( const std::string& n ); - - ///Adds the authorName to the Box author list - virtual void Author(const std::string &authorName); - - ///Adds the categories to the Box categoris list - virtual void Category(const std::string &categories); - - /// The description string which explains what does the ComplexBox - virtual void Description(const std::string &d); - - /// prints the list of the boxes of the current box - virtual void PrintHelpListBoxes(); - - /// Generate a HTML file with a gif file with the actual pipeline (Graphviz-dot needed). Returns the file path - virtual std::string ShowGraph(const std::string &nameblackbox, - const std::string &detailStr, - const std::string &levelStr, - const std::string &output_file, - const std::string &custom_header, - const std::string &custom_title, - bool system_display = true); - - /// Generate a HTML with a gif file with the actual pipeline (Graphviz-dot needed). Returns the file path - virtual std::string ShowGraphInstances(const std::string &nameblackbox, int detail, int level, bool system_display=true) ; - - /// Prints help on a black box - virtual void PrintHelpBlackBox(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr); - - virtual void Reset(); - - /// Sets the level of message for kind - virtual void SetMessageLevel(const std::string &kind, int level); - - /// Prints help on the messages - virtual void HelpMessages(); - - /// Prints the string ... MORE : TO EXPLAIN - virtual void Print(const std::string & message); - -//--EED - double _xGeneral; - double _yGeneral; - double _zGeneral; - wxVtkSceneManager *_sceneManager; - Factory::Pointer _factory; - - private: - - //Private Attributes - - - //Private Methods - - protected: - - //Protected Attributes - - //Protected methods - - }; - - -} -// namespace bbtk -#endif - diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx index c120cf6..a8b5302 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx @@ -57,7 +57,6 @@ namespace bbtk //========================================================================= InterpreterBBS::InterpreterBBS( wxVtkSceneManager* sceneManager, Factory::Pointer factory ) - : Interpreter("") { _factory = factory; _sceneManager = sceneManager; @@ -66,6 +65,8 @@ namespace bbtk _yGeneral = 10; _zGeneral = 900; // ????? + bbtk::InterpreterVirtual::Init(); + } //========================================================================= diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h index cb592de..af26265 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h @@ -42,7 +42,7 @@ Version: $Revision$ #include "wxVtkSceneManager.h" //Includes bbtk -#include "bbtkInterpreter.h" +#include "bbtkInterpreterVirtual.h" //Includes std #include @@ -54,7 +54,7 @@ Version: $Revision$ namespace bbtk { - class InterpreterBBS : public Interpreter + class InterpreterBBS : public InterpreterVirtual { public: static Pointer New( wxVtkSceneManager* sceneManager, Factory::Pointer factory ); diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index e939b32..4cc563c 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -36,8 +36,7 @@ Version: $Revision$ #include "bbtkwxGUIEditorGraphicBBS.h" #include "creaWx.h" -#include -#include +#include @@ -417,8 +416,8 @@ printf("EED wxGUIEditorGraphicBBS::OnOpenBBS file=%s\n", (const char*) (fileNam _tabsMgr->addNewTab(); - bbtk::EExecuterBBSG::Pointer exe = bbtk::EExecuterBBSG::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory() ); - bbtk::Interpreter::Pointer I = bbtk::Interpreter::New( boost::static_pointer_cast(exe) ); +// bbtk::EExecuterBBSG::Pointer exe = bbtk::EExecuterBBSG::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory() ); + bbtk::InterpreterBBS::Pointer I = bbtk::InterpreterBBS::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory()); // We tell the interpreter to throw exceptions on error I->SetThrow(true);