From: ctorres Date: Mon, 12 May 2014 07:49:47 +0000 (+0200) Subject: Display of the tree obtained in the information dialog window in BBEditor. 12/05... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=bbtkGEditor.git;a=commitdiff_plain;h=f99b8e7dd7cede66856ede057976906de775dccc Display of the tree obtained in the information dialog window in BBEditor. 12/05/2014 9:49am --- 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 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] << " " < mapDesc; + k = _pkgBrowser->GetFactory()->GetPackage(packageName); + std::vector 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(); } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h index 3fb1cca..0c070fa 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h @@ -98,6 +98,7 @@ #include #include #include +#include #include #include #include @@ -118,6 +119,7 @@ //Includes std #include #include +#include namespace bbtk { @@ -260,7 +262,8 @@ namespace bbtk // VERY IMPORTANT FOR SAVE&LOAD PROCESSES // RaC 2012 2nd HackFest std::string _currentBBGversion; - + + NodeTreeC tree; protected: diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx index 02b8a58..0e07133 100755 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx @@ -61,13 +61,15 @@ Version: $Revision$ #include "wxDiagramPropertiesEditionDialog.h" #include "creaWx.h" + namespace bbtk { //========================================================================= - wxDiagramPropertiesEditionDialog::wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent):wxDialog(parent,wxID_ANY,_T("Diagram Properties"), wxDefaultPosition, wxSize(320, 280),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + wxDiagramPropertiesEditionDialog::wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent, NodeTreeC tree):wxDialog(parent,wxID_ANY,_T("Diagram Properties"), wxDefaultPosition, wxSize(450, 580),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { _parent = parent; + _tree = tree; constructDiagramPropertiesEditionDialog(); } @@ -80,6 +82,21 @@ namespace bbtk } //========================================================================= + + void wxDiagramPropertiesEditionDialog::constructBoxTree(NodeTreeC nodeTree, wxTreeItemId itemId) + { + + for(int i = 0 ; i < nodeTree.childs.size() ; i++) + { + string spc = nodeTree.childs[i].data; + const char* ccc = spc.c_str(); + wxString pc = wxString::FromUTF8 (ccc); + wxTreeItemId iId = _treeBox->AppendItem(itemId, pc, -1, -1, NULL); + constructBoxTree(nodeTree.childs[i], iId ); + } + } + + //================================================================================== void wxDiagramPropertiesEditionDialog::constructDiagramPropertiesEditionDialog() { @@ -89,6 +106,23 @@ namespace bbtk wxFlexGridSizer *fgsizer = new wxFlexGridSizer(5, 2, 9, 25); + //CFT + + wxStaticText *tree = new wxStaticText(panel, -1, wxT("Tree of Box")); + + string sp = _tree.data; + const char* cc = sp.c_str(); + wxString p = wxString::FromUTF8 (cc); + + _treeBox = new wxTreeCtrl (this, wxID_ANY, wxPoint(0,0), wxSize(320,300), wxTR_HAS_BUTTONS | wxTR_SINGLE ); + wxTreeItemId itemId = _treeBox->AddRoot(p, -1,-1,NULL); + + constructBoxTree(_tree, itemId); + _treeBox->ExpandAll(); + _tree.treeTour(); + //CFT end + + // SELECTION CONSTANTS // 0 - Application // 1 - Complex box @@ -133,7 +167,11 @@ namespace bbtk fgsizer->Add(_txtCategory, 1, wxEXPAND); fgsizer->Add(description, 1, wxEXPAND); fgsizer->Add(_txtDescription, 1, wxEXPAND); - fgsizer->Add(okButton, 1, wxEXPAND); +//cft + fgsizer->Add(tree); + fgsizer->Add(_treeBox, 1, wxEXPAND); +//cft end + fgsizer->Add(okButton, 1, wxEXPAND); fgsizer->Add(closeButton, 1, wxEXPAND); fgsizer->AddGrowableRow(3, 1); diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.h index 20e1a54..ceebbf5 100755 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.h @@ -71,12 +71,14 @@ Version: $Revision$ //Includes same project #include "bbtkwxGUIEditorGraphicBBS.h" +#include #include "wxVtkSceneManager.h" //Includes wxWidgets #include #include #include +#include //Includes creaMaracasVisu @@ -95,9 +97,10 @@ namespace bbtk class wxDiagramPropertiesEditionDialog : public wxDialog { public: - wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent); + wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent, NodeTreeC tree); ~wxDiagramPropertiesEditionDialog(); - + + void constructBoxTree(NodeTreeC nodeTree, wxTreeItemId itemId); //CFT void constructDiagramPropertiesEditionDialog(); void onClickOk(wxCommandEvent& event); @@ -112,8 +115,8 @@ namespace bbtk wxTextCtrl *_txtCategory; wxTextCtrl *_txtDescription; wxComboBox *_diagramType; - - + wxTreeCtrl *_treeBox; + NodeTreeC _tree; protected: };