X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMProjectsTreeCtrl.cxx;h=d0bbafb67534d17273a5a9bced6ca492631de45e;hb=bae167768b5d3ccae6ec9b04c844d80e0368a52d;hp=6f7e33354cbff7aeb8eb380e1b112a4aa345c81f;hpb=741b9c1d03c7984f7ac4a39188e2bb114471f579;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx index 6f7e333..d0bbafb 100755 --- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx +++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx @@ -44,7 +44,10 @@ #include "images/AIcon20.xpm" #include "images/ApIcon20.xpm" #include "images/BBIcon20.xpm" +#include "images/BBSIcon20.xpm" +#include "images/BBGIcon20.xpm" #include "images/CIcon20.xpm" +#include "images/CFIcon20.xpm" #include "images/CMIcon20.xpm" #include "images/FdIcon20.xpm" #include "images/FlIcon20.xpm" @@ -88,10 +91,13 @@ bool wxCDMProjectsTreeCtrl::Create( this->ID_AIcon = images->Add(wxIcon(AIcon20)); this->ID_ApIcon = images->Add(wxIcon(ApIcon20)); this->ID_BBIcon = images->Add(wxIcon(BBIcon20)); + this->ID_BBGIcon = images->Add(wxIcon(BBGIcon20)); + this->ID_BBSIcon = images->Add(wxIcon(BBSIcon20)); this->ID_Cicon = images->Add(wxIcon(CIcon20)); this->ID_CMIcon = images->Add(wxIcon(CMIcon20)); this->ID_FdIcon = images->Add(wxIcon(FdIcon20)); this->ID_FlIcon = images->Add(wxIcon(FlIcon20)); + this->ID_CFIcon = images->Add(wxIcon(CFIcon20)); this->ID_LbIcon = images->Add(wxIcon(LbIcon20)); this->ID_LIcon = images->Add(wxIcon(LIcon20)); this->ID_PrIcon = images->Add(wxIcon(PrIcon20)); @@ -106,6 +112,7 @@ bool wxCDMProjectsTreeCtrl::Create( void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxCDMTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* projectTree) { + this->Unselect(); std::cout << "building tree" << std::endl; this->DeleteAllItems(); modelElements.clear(); @@ -209,21 +216,45 @@ int wxCDMProjectsTreeCtrl::GetIconId(modelCDMIProjectTreeNode* node) } else { - element = dynamic_cast(node); + element = dynamic_cast(node); if(element != NULL) { - return this->ID_FdIcon; + return this->ID_CFIcon; } else { - element = dynamic_cast(node); + element = dynamic_cast(node); if(element != NULL) { - return this->ID_FlIcon; + return this->ID_BBSIcon; } else { - return this->ID_Cicon; + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_BBGIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_FdIcon; + } + else + { + element = dynamic_cast(node); + if(element != NULL) + { + return this->ID_FlIcon; + } + else + { + return this->ID_Cicon; + } + } + } } } }