From: davila <>
Date: Fri, 1 Jun 2012 07:58:06 +0000 (+0000)
Subject: v1.1.0
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=bbtkGEditor.git;a=commitdiff_plain;h=713c6f1f54a2114c6e495aa6974d33b5718b46b5

v1.1.0
 - Doxygen Documentation
 - Add/Remove Colons
 - Add/Remove DoubleQoutes
---

diff --git a/cmake/UserBuildDoxygenDoc.cmake b/cmake/UserBuildDoxygenDoc.cmake
index 2446671..bf461ae 100644
--- 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 9fab474..19da900 100644
--- 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 a806ea8..704ca1e 100644
--- 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 c7b2c0c..46deada 100644
--- 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 646ee5b..8ee617b 100644
--- 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);
 			}
 		}