X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FGBoxModel.cxx;h=cb7b9116be6dac37e80c1ecefd2b6fab72c7f4dd;hb=36a0d24cb1d01a0f0c6010a18ec09874e6331fd5;hp=0801e54007526b00185d2a8e86ef24c1df879b60;hpb=343ecf790a799b8089a6d13fec0192fd9ad71da1;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
index 0801e54..cb7b911 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
@@ -1,3 +1,28 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  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.
+# ------------------------------------------------------------------------  
+*/
+
 /*=========================================================================                                                                               
 Program:   bbtk
 Module:    $RCSfile$
@@ -96,13 +121,13 @@ namespace bbtk
 
 		//Refresh inputs position
 		int i;
-		for(i=0;i<_inputs.size();i++)
+		for(i=0;i<(int)_inputs.size();i++)
 		{
 			_inputs[i]->updatePortPosition();
 		}
 		
 		//Refresh outputs position
-		for(i=0;i<_outputs.size();i++)
+		for(i=0;i<(int)_outputs.size();i++)
 		{
 			_outputs[i]->updatePortPosition();
 		}
@@ -144,7 +169,7 @@ namespace bbtk
 
 	GPortModel* GBoxModel::getInputPort(std::string name)
 	{
-		for(int i = 0; i<_inputs.size();i++)
+		for(int i = 0; i<(int)_inputs.size();i++)
 		{
 			if(_inputs[i]->getBBTKName()==name)
 			{
@@ -158,7 +183,7 @@ namespace bbtk
 	
 	GPortModel* GBoxModel::getOutputPort(std::string name)
 	{
-		for(int i = 0; i<_outputs.size();i++)
+		for(int i = 0; i<(int)_outputs.size();i++)
 		{
 			if(_outputs[i]->getBBTKName()==name)
 			{
@@ -170,9 +195,23 @@ namespace bbtk
 
 	//=========================================================================
 
+	GPortModel* GBoxModel::getInputPort(int pos)
+	{
+		return _inputs[pos];
+	}
+
+	//=========================================================================
+	
+	GPortModel* GBoxModel::getOutputPort(int pos)
+	{
+		return _outputs[pos];
+	}
+
+	//=========================================================================
+
 	void GBoxModel::updatePorts()
 	{
-		for(int i = 0; i<_inputs.size();i++)
+		for(int i = 0; i<(int)_inputs.size();i++)
 		{	
 			_inputs[i]->updatePortPosition();
 			_inputs[i]->notifyObservers(_objectId);
@@ -185,6 +224,37 @@ namespace bbtk
 		}
 	}
 
+	
+	//=========================================================================
+	//JPR
+	void GBoxModel::addColons(std::string &text)
+	{
+		std::string character("&&2P&&");				
+		size_t pos;
+		pos = text.find(character);
+		while(pos != std::string::npos)
+		{
+		//We replace the character "&&2P&&" with ":" for all the string
+			text.replace(pos, character.length(),":");
+			pos = text.find(character, pos);
+		}
+	}
+
+	//=========================================================================
+	//JPR
+	void GBoxModel::removeColons(std::string &text)
+	{
+		std::string character(":");				
+		size_t pos;
+		pos = text.find(character);
+		while(pos != std::string::npos)
+		{
+			//We replace the character ":" with "&&2P&&" for all the string
+			text.replace(pos, character.length(),"&&2P&&");
+			pos = text.find(character, pos);
+			}
+	}
+
 	//=========================================================================