Feature #1711

[crea.git] / lib / creaDevManagerLib / wxCDMProjectsTreeCtrl.cxx

diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
index eba2c0de19da2c74a60e1ce592a6cc7800fed633..6f7e33354cbff7aeb8eb380e1b112a4aa345c81f 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
+++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
@@ -36,6 +36,7 @@
 #include "wxCDMProjectsTreeCtrl.h"
 
 #include <vector>
+#include <sstream>
 
 #include <wx/imaglist.h>
 
@@ -81,6 +82,8 @@ bool wxCDMProjectsTreeCtrl::Create(
 {
   wxTreeCtrl::Create (parent, id, pos, size, style, validator, name);
 
+  this->DeleteAllItems();
+
   wxImageList* images = new wxImageList(20, 20, true);
   this->ID_AIcon = images->Add(wxIcon(AIcon20));
   this->ID_ApIcon = images->Add(wxIcon(ApIcon20));
@@ -95,54 +98,53 @@ bool wxCDMProjectsTreeCtrl::Create(
   this->ID_PkIcon = images->Add(wxIcon(PkIcon20));
   this->AssignImageList(images);
 
-  wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project"), this->ID_Cicon, this->ID_Cicon);
+  wxTreeItemId rootIndex = this->AddRoot(wxT("No Open Project"), this->ID_Cicon, this->ID_Cicon);
+
   this->Update();
   return TRUE;
 }
 
-void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* projectTree)
+void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxCDMTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* projectTree)
 {
   std::cout << "building tree" << std::endl;
   this->DeleteAllItems();
   modelElements.clear();
   if(projectTree != NULL)
     {
-      wxTreeItemId rootIndex;
-      rootIndex= this-> AddRoot(crea::std2wx(projectTree->GetName()), this->ID_PrIcon, this->ID_PrIcon);
-      projectTree->SetId(rootIndex);
-      modelElements[rootIndex] = projectTree;
+      projectTree->SetId(this->AddRoot(crea::std2wx(projectTree->GetName()), this->ID_PrIcon));
+         
+         modelElements[projectTree->GetId()] = projectTree;
 
       std::cout << "Building TreeCtrl for " << projectTree->GetName() << std::endl;
-      this->BuildTree(projectTree->GetChildren(), modelElements, rootIndex);
+      this->BuildTree(projectTree->GetChildren(), modelElements, projectTree->GetId());
 
-      this->Expand(rootIndex);
+      this->Expand(projectTree->GetId().GetWxId());
 
       this->Update();
     }
   else
     {
-      wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project"));
+      wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project"), this->ID_Cicon);
     }
 }
 
-void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode*>& treeNodes, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, wxTreeItemId parent)
+void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode*>& treeNodes, std::map< wxCDMTreeItemId, modelCDMIProjectTreeNode* >& modelElements, const wxCDMTreeItemId& parent)
 {
-  for (int i = 0; i < treeNodes.size(); i++)
+  for (int i = 0; i < (int)(treeNodes.size()); i++)
     {
       //cout << projectsTree[i].GetName() << endl;
-      wxTreeItemId parentNodeIndex;
       if(treeNodes[i] != NULL)
         {
           int idIcon = GetIconId(treeNodes[i]);
           wxString nodeName((treeNodes[i]->GetName()).c_str(), wxConvUTF8);
-          parentNodeIndex = this->AppendItem(parent, nodeName, idIcon, idIcon);
-          treeNodes[i]->SetId(parentNodeIndex);
-          modelElements[parentNodeIndex] = treeNodes[i];
+          treeNodes[i]->SetId(wxCDMTreeItemId(this->AppendItem(parent.GetWxId(), nodeName, idIcon)));
+         
+                 modelElements[treeNodes[i]->GetId()] = treeNodes[i];
 
           std::vector<modelCDMIProjectTreeNode*> innerChildren = treeNodes[i]->GetChildren();
           if(innerChildren.size() > 0)
             {
-              this->BuildTree(innerChildren, modelElements, parentNodeIndex);
+              this->BuildTree(innerChildren, modelElements, treeNodes[i]->GetId());
             }
         }