v1.1.0

 - Doxygen Documentation
 - Add/Remove Colons
 - Add/Remove DoubleQoutes

diff --git a/cmake/UserBuildDoxygenDoc.cmake b/cmake/UserBuildDoxygenDoc.cmake
index 24466711448ca6c14ac112214c1911fe05cb639b..bf461ae01195dcfd8284ecf4504c899f0c6a9a7e 100644 (file)
--- a/cmake/UserBuildDoxygenDoc.cmake
+++ b/cmake/UserBuildDoxygenDoc.cmake
@@ -9,7 +9,7 @@ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
   SET(DOXYGEN_PROJECT_NAME "${NAME}")
 
   # Inputs
-  #STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
+  STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
 
   # Output dirs
   SET(DOXYGEN_HTML_OUTPUT ".")

diff --git a/doc/UserDoxygen/CMakeLists.txt b/doc/UserDoxygen/CMakeLists.txt
index 9fab474d25767b720c0f5088b2e1d00cfac650d4..19da900f0a3e074bda2a4df480ba13da06b575cb 100644 (file)
--- a/doc/UserDoxygen/CMakeLists.txt
+++ b/doc/UserDoxygen/CMakeLists.txt
@@ -19,6 +19,11 @@ SET(INPUT
   ${PROJECT_SOURCE_DIR}/appli
   )
 
+message( "EED --->>>>>${PROJECT_NAME} ")
+message( "EED --->>>>>${INPUT} ")
+message( "EED --->>>>>${PROJECT_NAME} ")
+message( "EED --->>>>>${DOXYGEN_DOC_PREDEFINED} ")
+
 INCLUDE(../../cmake/UserBuildDoxygenDoc.cmake)
 USER_BUILD_DOXYGEN_DOC(
   "${PROJECT_NAME}" 

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx
index a806ea8d347e44aea9fa3c9a7ce371f6ffc53eaa..704ca1efb7d0c8b44b7f65a00ddbfc5a4290093a 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx
@@ -177,7 +177,9 @@ namespace bbtk
 
        std::string GBlackBoxModel::getValueInputPort(int pos)
        {
-               return _inputs[pos]->getValue();
+               std::string text = _inputs[pos]->getValue();
+               addColons(text);
+               return text;
        }
 
        //=========================================================================

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
index c7b2c0caa47cf23b1483173f07f1a6680c9ee728..46deada9ca5bdc2d9decfb46f48206bd998131b7 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
@@ -199,8 +199,12 @@ namespace bbtk
                }
        }
 
+       
+       //=========================================================================
+       //JPR
        void GBoxModel::addColons(std::string &text)
        {
+               printf("EED JPR >>>>>>>>>>>>>>> %s\n",text.c_str() );
                std::string character("&&2P&&");                                
                size_t pos;
                pos = text.find(character);
@@ -212,6 +216,8 @@ namespace bbtk
                }
        }
 
+       //=========================================================================
+       //JPR
        void GBoxModel::removeColons(std::string &text)
        {
                std::string character(":");                             

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index 646ee5b6d4c933c7835eefcc77b7688fad41a342..8ee617b4c8e51891aee2c8add70c2406c25395fa 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -192,6 +192,11 @@ namespace bbtk
                        //TOFIX Search a better alternative
                        if(text!="--No editable--" && text!="--Port Connected--")
                        {
+                               //JPRG: When executing, add double quotes if necessary
+                               if(text.length()>0)
+                               {
+                                       addDoubleQuotes(text);
+                               }
                                _model->setValueToInputPort(i,text);
                        }
                }