X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=1b80f28ac7e938366333e0e7095b3b2a58503b3d;hb=03aef77bacc41f53b1d21b88e683302e7e1600c2;hp=45dc8e587af7b58c181854246764400458d2b57e;hpb=6a43a8cc1e5216f06e41799fbe154b2b1ef6d44b;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 45dc8e5..1b80f28 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -219,6 +219,7 @@ void wxCDMMainFrame::CreateControls()
       wxSize(200,400),
 	  wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
   );
+  this->actualTreeItem.Unset();
 
   panel_Properties = new wxCDMMainDescriptionPanel(
       this,
@@ -298,10 +299,11 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
       auiManager.Update();
 
       //populate tree control
-      tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
       tree_Projects->Unselect();
-	  tree_Projects->SelectItem(this->model->GetProject()->GetId());
-	  wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
+	  this->actualTreeItem.Unset();
+	  tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId());
+	  //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
     }
 }
 void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
@@ -344,10 +346,10 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       std::cout << "building ui" << std::endl;
 
       //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->BuildTree(this->model->GetModelElements(), this->model->GetProject());
+          tree_Projects->Unselect();
+          this->actualTreeItem.Unset();
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
 
 
       //change project's actions panel
@@ -374,8 +376,6 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       auiManager.Update();
 
     }
-
-  event.Skip();
 }
 
 void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
@@ -389,18 +389,16 @@ void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
     }
 
   tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
-
+  this->actualTreeItem.Unset();
   if(this->panel_Properties != NULL)
     {
       auiManager.DetachPane(this->panel_Properties);
-      this->panel_Properties->Destroy();
-      this->panel_Properties = NULL;
+	  this->panel_Properties->Hide();
     }
   if(this->panel_ProjectActions != NULL)
     {
       auiManager.DetachPane(this->panel_ProjectActions);
-      this->panel_ProjectActions->Destroy();
-      this->panel_ProjectActions = NULL;
+      this->panel_ProjectActions->Hide();    
     }
 
   this->panel_Properties = new wxCDMMainDescriptionPanel(
@@ -415,7 +413,6 @@ void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
   auiManager.AddPane(panel_Properties, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
 
   auiManager.Update();
-  event.Skip();
 }
 
 void wxCDMMainFrame::OnMenuExportHierarchy(wxCommandEvent& event)
@@ -470,7 +467,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();
 }
@@ -590,17 +587,25 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
   //get selected element
   wxTreeItemId elementId = event.GetItem();
-  if(elementId.IsOk() && this->tree_Projects->IsSelected(elementId))
+  std::cout << "Tree Selection id: " << elementId.m_pItem << this->actualTreeItem.m_pItem << std::endl;
+  //elementId.IsOk() && this->tree_Projects->IsSelected(elementId)
+  if(elementId.IsOk() && this->actualTreeItem != elementId)
     {
-      std::cout << "Tree Selection id: " << elementId << std::endl;
+      
+      std::cout << "Valid tree selection id: " << elementId.m_pItem << std::endl;
       //get element from model
       modelCDMIProjectTreeNode* element = this->model->GetModelElements()[elementId];
 
 	  if (element == NULL)
 		  return;
       std::cout << "Tree Selection: " << element->GetName() << std::endl;
-	  	
-      //TODO get element type
+
+	  //std::stringstream ss;
+	  //ss << this->actualTreeItem.m_pItem << ":" << event.GetOldItem().m_pItem << " --> " << elementId.m_pItem;
+	  //wxMessageBox( wxT("Tree Selection id: " + ss.str() + " by " + element->GetName()), wxT("Refresh Project - Error"), wxICON_ERROR);	
+      this->actualTreeItem = elementId;
+
+	  //get element type
       //project
       modelCDMProject* elementProject = dynamic_cast<modelCDMProject*>(element);
       wxPanel* description;
@@ -801,16 +806,19 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
         {
           this->panel_Properties->Hide();
           auiManager.DetachPane(this->panel_Properties);
-          this->panel_Properties->Destroy();
-          this->panel_Properties = NULL;
+          //this->panel_Properties->Destroy();
+          //this->panel_Properties = NULL;
         }
       //set new view
       auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
       this->panel_Properties = description;
 
       auiManager.Update();
-      event.Skip();
     }
+  else
+    {
+      event.Skip();
+	}
 
   return;
 
@@ -819,22 +827,24 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
 {
   modelCDMIProjectTreeNode* myItem = NULL;
+  wxPanel* description = NULL;
   switch(event.GetId())
   {
   case 0:
     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());
+    this->tree_Projects->Expand(myItem->GetId().GetWxId());
     break;
   case 1:
-    wxPanel* description = NULL;
+    
     if(event.GetString() == wxT("manage_packages"))
       {
         //this->tree_Projects->Expand(this->model->GetProject()->GetId());
         //this->tree_Projects->Unselect();
-        description = new wxCDMPackageManagerPanel(
+        this->actualTreeItem.Unset();
+		  description = new wxCDMPackageManagerPanel(
             this,
             this->model->GetProject(),
             ID_WINDOW_PROPERTIES,
@@ -846,19 +856,20 @@ 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());
+        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());
+        this->tree_Projects->Expand(this->model->GetProject()->GetAppli()->GetId().GetWxId());
         break;
       }
     else if(event.GetString() == wxT("blackbox"))
       {
         modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData();
+		this->actualTreeItem.Unset();
         description = new wxCDMBlackBoxDescriptionPanel(
             this,
             bb,
@@ -868,6 +879,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
             wxSize(600, 400),
             0
         );
+		
       }
 
     //delete old view
@@ -882,20 +894,21 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
     auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
     this->panel_Properties = description;
     auiManager.Update();
-
     break;
+  default:
+	  event.Skip();
   }
-  event.Skip();
+  
 }
 
 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 +916,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();
 }