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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 7c2ff2d..599a262 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -78,6 +78,8 @@ wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView
 	_Author			= "Author ??";
 	_Category		= "<VOID>";
 	_Description		= "Description ??";
+	_MessageKind = " ";
+	_MessageLevel = " ";
 
 	_bugTextActor_text 	= "void";
 	_bugTextActor_status 	= 0;
@@ -1352,6 +1354,7 @@ bool wxVtkSceneManager::MakeBoxExecutable() {
 //=========================================================================
 
 std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
+	std::cout << "wxVtkSceneManager::getDiagramBBS" << std::endl;
 	bool existsExec = false;
 
 	std::vector<std::string> packages;
@@ -1409,7 +1412,7 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
 		script += "\n";
 
 		//ups2
-
+		
 		script += LineNumber(wln, lnNmbr);
 		script += "author \"";
 		script += _Author;
@@ -1434,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();
@@ -1500,6 +1504,7 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
 			}
 			else
 			{
+					script += LineNumber(wln, lnNmbr);
 					script += "connect ";
 					script += startBox->getBBTKName();
 					script += ".";
@@ -1515,16 +1520,29 @@ 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;
 
+		if((_MessageKind!=" ")&&(_MessageLevel!=" ")){
+			script += LineNumber(wln, lnNmbr);
+			script += "message ";
+			script += _MessageKind;
+			script += " ";
+			script += _MessageLevel;
+			script += "\n";
+		}
+
 		for (i = 0; i < (int) execBoxes.size(); i++) {
 			script += LineNumber(wln, lnNmbr);
 			script += "exec ";
@@ -1544,6 +1562,7 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) {
 //=========================================================================
 
 std::string wxVtkSceneManager::saveComplexBoxBBS() {
+	std::cout<<"wxVtkSceneManager::saveComplexBoxBBS"<<std::endl;
 	std::vector<std::string> packages;
 	std::vector<int> boxes;
 	std::vector<int> connections;
@@ -1617,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();
@@ -1710,6 +1730,12 @@ std::string wxVtkSceneManager::saveComplexBoxBBS() {
 
 	script += "\n";
 
+	script += "message ";
+	script += _MessageKind;
+	script += " ";
+	script += _MessageLevel;
+	script += "\n";
+
 	for (i = 0; i < (int) execBoxes.size(); i++) {
 		script += "exec ";
 		int id = execBoxes[i];
@@ -1849,10 +1875,17 @@ void wxVtkSceneManager::saveDiagram(std::string &content) {
 	sprintf(buffer, "%d", bsize);
 	content += buffer;
 	content += "\n";
-
+	
 	for (int i = 0; i < bsize; i++) {
 		int id = boxes[i];
+//		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
 		cont->getModel()->save(content);
 	}
 
@@ -2933,6 +2966,31 @@ std::string wxVtkSceneManager::GetDescription() {
 
 //=========================================================================
 
+void wxVtkSceneManager::SetMessageKind(std::string kind) {
+		_MessageKind = kind;
+	
+}
+				
+//=========================================================================
+
+std::string wxVtkSceneManager::GetMessageKind(){
+		return _MessageKind;
+}
+
+//=========================================================================
+
+void wxVtkSceneManager::SetMessageLevel(std::string Level){
+		_MessageLevel = Level;
+}
+
+//=========================================================================
+
+std::string wxVtkSceneManager::GetMessageLevel(){
+		return _MessageLevel;
+}
+
+//=========================================================================
+
 std::vector< std::string> wxVtkSceneManager::GetExternalInputsNames()
 {