X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.cxx;h=599a26214478143bcc477bcf45d5b0cb87c0f804;hb=3cf9e69646c27f2c77bbf4ddb657d34deffbe386;hp=f29a4e8f3cd33b1a4ec76cd6f8058ca05634b88d;hpb=6175f5e27f2597deedac398b27df03418e4e3478;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index f29a4e8..599a262 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -1437,9 +1437,10 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
 			script += LineNumber(wln, lnNmbr);
 			script += "new ";
 			int id = boxes[i];
-			GObjectController *control = _controllers[id];
-			GBlackBoxModel *model = (GBlackBoxModel*) control->getModel();
+			GObjectController *control 	= _controllers[id];
+			GBlackBoxModel *model 		= (GBlackBoxModel*) control->getModel();
 
+			script += model->getBBTKPackage()+":";
 			script += model->getBBTKType();
 			script += " ";
 			script += model->getBBTKName();
@@ -1503,6 +1504,7 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
 			}
 			else
 			{
+					script += LineNumber(wln, lnNmbr);
 					script += "connect ";
 					script += startBox->getBBTKName();
 					script += ".";
@@ -1518,13 +1520,17 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
 					script += "\n";
 			}
 
+			script += LineNumber(wln, lnNmbr);
 			script += "\n";
 		}
 
 		script += LineNumber(wln, lnNmbr);
 		script += "\n";
 
+		script += LineNumber(wln, lnNmbr);
 		script += "\n";
+
+		script += LineNumber(wln, lnNmbr);
 		script += "# Complex input ports\n";
 		script += complexInputs;
 
@@ -1630,6 +1636,7 @@ std::string wxVtkSceneManager::saveComplexBoxBBS() {
 		GObjectController *control = _controllers[id];
 		GBlackBoxModel *model = (GBlackBoxModel*) control->getModel();
 
+		script += model->getBBTKPackage()+":";
 		script += model->getBBTKType();
 		script += " ";
 		script += model->getBBTKName();
@@ -1871,14 +1878,14 @@ void wxVtkSceneManager::saveDiagram(std::string &content) {
 	
 	for (int i = 0; i < bsize; i++) {
 		int id = boxes[i];
-		std::cout<<"id "<<id<<std::endl;//CFT
+//		std::cout<<"id "<<id<<std::endl;//CFT
 		GObjectController *cont = _controllers[id];
-		std::cout<<"nombre: "<<cont->getStatusText()<<std::endl;//CFT
-		std::cout<<"tipo: "<<cont->getModel()->getBBTKType()<<std::endl;//CFT
-		//boxesDiagram[i] = cont->getModel()->getBBTKType();//CFT
-		std::cout<<"nname: "<<cont->getModel()->getBBTKName()<<std::endl;//CFT
-		std::cout<<"categorie: "<<GetCategory()<<std::endl;//CFT
-		std::cout<<"type: "<<cont->getModel()->getGObjectType()<<std::endl;//CFT
+//		std::cout<<"nombre: "<<cont->getStatusText()<<std::endl;//CFT
+//		std::cout<<"tipo: "<<cont->getModel()->getBBTKType()<<std::endl;//CFT
+//		//boxesDiagram[i] = cont->getModel()->getBBTKType();//CFT
+//		std::cout<<"nname: "<<cont->getModel()->getBBTKName()<<std::endl;//CFT
+//		std::cout<<"categorie: "<<GetCategory()<<std::endl;//CFT
+//		std::cout<<"type: "<<cont->getModel()->getGObjectType()<<std::endl;//CFT
 		cont->getModel()->save(content);
 	}