X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=5017c440ee1b368bd25f15208535ffd2be61fc61;hb=741b9c1d03c7984f7ac4a39188e2bb114471f579;hp=45dc8e587af7b58c181854246764400458d2b57e;hpb=a9365e98724ef545368a3212e32263cd331d41d0;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 45dc8e5..5017c44 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -300,7 +300,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
       //populate tree control
       tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
       tree_Projects->Unselect();
-	  tree_Projects->SelectItem(this->model->GetProject()->GetId());
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId());
 	  wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
     }
 }
@@ -346,7 +346,7 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       //populate tree control
       tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
       tree_Projects->Unselect();
-	  tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
 
 
 
@@ -470,7 +470,7 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event)
       this->auiManager.Update();
 
       this->tree_Projects->Unselect();
-      this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+      this->tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
     }
   event.Skip();
 }
@@ -825,8 +825,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
     myItem = ((modelCDMIProjectTreeNode*)event.GetClientData());
     //select out old one to generate selection event
     this->tree_Projects->Unselect();
-    this->tree_Projects->SelectItem(myItem->GetId(), true);
-    this->tree_Projects->Expand(myItem->GetId());
+    this->tree_Projects->SelectItem(myItem->GetId().GetWxId(), true);
+    this->tree_Projects->Expand(myItem->GetId().GetWxId());
     break;
   case 1:
     wxPanel* description = NULL;
@@ -846,14 +846,14 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
       }
     else if(event.GetString() == wxT("manage_libraries"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetLib()->GetId(), true);
-        this->tree_Projects->Expand(this->model->GetProject()->GetLib()->GetId());
+        this->tree_Projects->SelectItem(this->model->GetProject()->GetLib()->GetId().GetWxId(), true);
+        this->tree_Projects->Expand(this->model->GetProject()->GetLib()->GetId().GetWxId());
         break;
       }
     else if(event.GetString() == wxT("manage_applications"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetAppli()->GetId(), true);
-        this->tree_Projects->Expand(this->model->GetProject()->GetAppli()->GetId());
+        this->tree_Projects->SelectItem(this->model->GetProject()->GetAppli()->GetId().GetWxId(), true);
+        this->tree_Projects->Expand(this->model->GetProject()->GetAppli()->GetId().GetWxId());
         break;
       }
     else if(event.GetString() == wxT("blackbox"))
@@ -892,10 +892,10 @@ void wxCDMMainFrame::OnElementSelected(wxCommandEvent& event)
 {
   //std::cout << "element " << event.GetInt() << std::endl;
   modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
-  this->tree_Projects->EnsureVisible(item->GetId());
-  this->tree_Projects->SetItemBold(item->GetId(), true);
-  this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,255));
-  this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(230,230,255));
+  this->tree_Projects->EnsureVisible(item->GetId().GetWxId());
+  this->tree_Projects->SetItemBold(item->GetId().GetWxId(), true);
+  this->tree_Projects->SetItemTextColour(item->GetId().GetWxId(), wxColour(0,0,255));
+  this->tree_Projects->SetItemBackgroundColour(item->GetId().GetWxId(), wxColour(230,230,255));
   this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
   auiManager.Update();
 }
@@ -903,9 +903,9 @@ void wxCDMMainFrame::OnElementSelected(wxCommandEvent& event)
 void wxCDMMainFrame::OnElementDeselected(wxCommandEvent& event)
 {
   modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
-  this->tree_Projects->SetItemBold(item->GetId(), false);
-  this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,0));
-  this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(255,255,255));
+  this->tree_Projects->SetItemBold(item->GetId().GetWxId(), false);
+  this->tree_Projects->SetItemTextColour(item->GetId().GetWxId(), wxColour(0,0,0));
+  this->tree_Projects->SetItemBackgroundColour(item->GetId().GetWxId(), wxColour(255,255,255));
   this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
   auiManager.Update();
 }