X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=c764296793200dfb68f9b2edfe258c903cf9121a;hb=f99b8e7dd7cede66856ede057976906de775dccc;hp=978202515800e80f31016afc4d9319792412b0b7;hpb=447f0466f545453283ac5593549ea0ce7224c693;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 9782025..c764296 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -459,12 +459,49 @@ void wxGUIEditorGraphicBBS::displayBlackBoxInfo(std::string packageName, std::st
 //EED 15 oct 2012		BlackBoxDescriptor::Pointer descriptor = GObjectsMVCFactory::getInstance()->getBlackBoxDescriptor(packageName, boxName);
 		
 		Package::Pointer k;
+//EED		ComplexBlackBoxDescriptor::Pointer descriptor;
 		BlackBoxDescriptor::Pointer descriptor;
+
 		std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc;
 		k			= _pkgBrowser->GetFactory()->GetPackage(packageName);
 		mapDesc		= k->GetDescriptorMap();		
 		descriptor	= mapDesc[boxName];
-		
+		std::vector<std::string> temp;
+		descriptor->GetBoxesInside(tree,temp,1);
+
+
+
+/*CFT
+		for(int i = 0 ; i < temp.size() ; i++){
+					std::cout<< "  "<< temp[i] << std::endl;
+		}	
+
+
+		if(temp.size()>=1){
+				std::cout<< "CAJAS # " << (temp.size()- 3) << std::endl;			
+				for(int i = 0 ; i < temp.size()-1 ; i++){
+					if(i<3){std::cout<< "  "<< temp[i] << std::endl;}
+					else{std::cout<< i+1 << "  "<< temp[i] << " " <<temp[i+1] << std::endl;}
+				}	
+			}		
+		if (temp.size()==0){
+				std::cout<< " Not Complex " << std::endl;
+			}
+*/
+		/*
+		Package::Pointer k;
+		BlackBoxDescriptor::Pointer descriptor;
+		std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc;
+		k			= _pkgBrowser->GetFactory()->GetPackage(packageName);
+		std::vector<std::string> temp;
+		_pkgBrowser->GetFactory()->GetPackagesList(temp);
+		for(int ii = 0 ; ii < temp.size() ; ii++)
+		{
+				std::cout << " packs "<< temp[ii]<< std::endl;
+		}
+		mapDesc		= k->GetDescriptorMap();		
+		descriptor	= mapDesc[boxName];
+		*/
 		_pkgBrowser->WxGUIBlackBoxListUserOnSelected(descriptor.get());
 	}
 }
@@ -596,7 +633,7 @@ void wxGUIEditorGraphicBBS::OnChangeName(wxCommandEvent& event){
 void wxGUIEditorGraphicBBS::OnEditDiagramProperties(wxCommandEvent& event)
 {
 	wxDiagramPropertiesEditionDialog* dialog =
-				new wxDiagramPropertiesEditionDialog(this);
+				new wxDiagramPropertiesEditionDialog(this, tree);
 	dialog->Show();
 }