From: davila <>
Date: Tue, 21 Sep 2010 06:40:17 +0000 (+0000)
Subject: no message
X-Git-Tag: v1_0_0~42
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=227a0737f17511cbe4910c072efe2806286427ed;p=bbtkGEditor.git

no message
---

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
index 2008821..c6b5a78 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
@@ -61,11 +61,12 @@ namespace bbtk
 		_factory		= factory;
 		_sceneManager	= sceneManager;
 		
-		_xGeneral		= 10;
+		_xGeneral		= -100;
 		_yGeneral		= 10;
 		_zGeneral		= 900;   //  ?????
-
-		_complexbox = false;
+		_countBoxes		= 0;
+		
+		_complexbox		= false;
 		bbtk::InterpreterVirtual::Init();
 		
 	}
@@ -83,13 +84,14 @@ namespace bbtk
 	/// Creates a new black box in current complex box
     void InterpreterBBS::commandNew( const std::string& boxType, const std::string& boxName) // virtual
 	{
-		printf("EED InterpreterBBS::New\n");
 		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 );
+		_countBoxes++;
+		_yGeneral				= _yGeneral + 30;		
+		double px				= _xGeneral + (_countBoxes%2)*100;
+		double py				= _yGeneral;
 		
-		_yGeneral = _yGeneral + 30;
+		_sceneManager->configGBlackBox(idBox, px,py,_zGeneral,boxName, false , px+100, py-10 , _zGeneral );		
 	}
 	//=========================================================================
 
@@ -101,7 +103,6 @@ namespace bbtk
 								  const std::string &boxto,
 								  const std::string &input)			// virtual
 	{
-		printf("EED InterpreterBBS::Connect\n");
 		_sceneManager->configGConnetion(_complexbox, boxfrom,output,boxto,input);
 	}
 	//=========================================================================
@@ -111,7 +112,6 @@ namespace bbtk
 	/// sets the input of the box with the value
 	void InterpreterBBS::commandSet(const std::string &box,const std::string &input,const std::string &value) // virtual
 	{
-		printf("EED InterpreterBBS::Set\n");
 		GBlackBoxModel *bbMod = _sceneManager->findGBox(box);
 		bbMod->setValueToInput(input,"\""+value+"\"");					
 	}
@@ -142,6 +142,23 @@ namespace bbtk
 	}
 	//=========================================================================
 	
+
+	void InterpreterBBS::commandAuthor(const std::string &author)  // virtual 
+	{
+		printf("EED InterpreterBBS::commandAuthor   Warning !!!!!  method not implemented.. \n");
+	}
+	
+	void InterpreterBBS::commandCategory(const std::string &categorytype)  // virtual
+	{
+		printf("EED InterpreterBBS::commandCategory   Warning !!!!!  method not implemented.. \n");
+	}
+	
+	void InterpreterBBS::commandDescription(const std::string &description)  // virtual
+	{
+		printf("EED InterpreterBBS::commandDescription   Warning !!!!!  method not implemented.. \n");
+	}
+	
+	
 	
 	
 }  // EO namespace bbtk
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h
index 400c467..f31b8ff 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h
@@ -76,10 +76,16 @@ namespace bbtk
 		virtual void commandEndDefine();
 		
 		virtual void commandExec(const std::string &word);
+		
+		virtual void commandAuthor(const std::string &author);
+		virtual void commandCategory(const std::string &categorytype);
+		virtual void commandDescription(const std::string &description);
+		
 
 		double              _xGeneral;
 		double              _yGeneral;
 		double              _zGeneral;
+		int					_countBoxes;
 		wxVtkSceneManager   *_sceneManager;
 		Factory::Pointer    _factory;
 		
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 26deb14..3c88251 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -1096,7 +1096,7 @@ namespace bbtk
 				script+="\n";
 			}
 
-			for(i = 0; i<execBoxes.size();i++)
+			for(i = 0; i<(int)execBoxes.size();i++)
 			{
 				script+="exec ";
 				int id = execBoxes[i];
@@ -1171,11 +1171,13 @@ namespace bbtk
 			script+=packages[i];
 			script+="\n";
 		}
+		script+="\n";
 
 		// Definition of a complex box
 		script+="define ";
 		script+=cbName;
 		script+="\n";
+		script+="\n";
 
 		script+="author \" ";
 		script+=cbAuthor;
@@ -1184,9 +1186,10 @@ namespace bbtk
 		script+="description \" ";
 		script+=cbDescription;
 		script+="\"\n";
+		script+="\n";
 
 		// Create boxes
-		for(i = 0; i<boxes.size();i++)
+		for(i = 0; i<(int)boxes.size();i++)
 		{
 			script+="new ";
 			int id = boxes[i];
@@ -1204,7 +1207,7 @@ namespace bbtk
 					GPortModel* inputPort = inputs[j];
 					if(inputPort->isValueSet())
 					{
-						script+="set ";
+						script+="  set ";
 						script+=model->getBBTKName();
 						script+=".";
 						script+=inputPort->getBBTKName();
@@ -1213,6 +1216,7 @@ namespace bbtk
 						script+="\n";
 					}
 				}
+				script+="\n";
 
 			}
 
@@ -1220,6 +1224,7 @@ namespace bbtk
 
 			std::string complexInputs="";
 			std::string complexOutputs="";
+			script+="\n";
 
 			for(i = 0; i<(int)connections.size();i++)
 			{
@@ -1282,6 +1287,8 @@ namespace bbtk
 				}
 			}
 
+		    script+="\n";
+		
 			for(i = 0; i<(int)execBoxes.size();i++)
 			{
 				script+="exec ";