Feature #1711

[crea.git] / lib / creaDevManagerLib / wxCDMMainFrame.cpp

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 9565b8a37858d75e7e8b0713d573e1c0fabab5c4..441d99e89050c728f347cd41239a1bdb095e1e69 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -152,6 +152,8 @@ void wxCDMMainFrame::RefreshProject()
   this->model->RefreshProject(result);
   std::cout << "rebuilding project tree" << std::endl;
   this->tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
+  this->tree_Projects->Unselect();
+  this->actualTreeItem.Unset();
 }
 
 void wxCDMMainFrame::CreateMenus()
@@ -260,6 +262,17 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
               event.Skip();
               return;
             }
+          if(this->panel_Properties != NULL)
+            {
+              auiManager.DetachPane(this->panel_Properties);
+              this->panel_Properties->Hide();
+            }
+          if(this->panel_ProjectActions != NULL)
+            {
+              auiManager.DetachPane(this->panel_ProjectActions);
+              this->panel_ProjectActions->Hide();    
+            }
+
         }
 
 
@@ -299,11 +312,11 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
       auiManager.Update();
 
       //populate tree control
+         tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
       tree_Projects->Unselect();
          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);
+         tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
+         //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
     }
 }
 void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
@@ -333,6 +346,16 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
               event.Skip();
               return;
             }
+          if(this->panel_Properties != NULL)
+            {
+              auiManager.DetachPane(this->panel_Properties);
+              this->panel_Properties->Hide();
+            }
+          if(this->panel_ProjectActions != NULL)
+            {
+              auiManager.DetachPane(this->panel_ProjectActions);
+              this->panel_ProjectActions->Hide();    
+            }
         }
 
       if (!this->model->OpenProject(path, result))
@@ -346,9 +369,9 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       std::cout << "building ui" << std::endl;
 
       //populate tree control
-         tree_Projects->Unselect();
-         this->actualTreeItem.Unset();
       tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
+      tree_Projects->Unselect();
+      this->actualTreeItem.Unset();
          tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
 
 
@@ -467,6 +490,7 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event)
       this->auiManager.Update();
 
       this->tree_Projects->Unselect();
+         this->actualTreeItem.Unset();
       this->tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
     }
   event.Skip();
@@ -587,11 +611,12 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
   //get selected element
   wxTreeItemId elementId = event.GetItem();
+  //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.m_pItem << std::endl;
+      //std::cout << "Valid tree selection id: " << elementId.m_pItem << std::endl;
       //get element from model
       modelCDMIProjectTreeNode* element = this->model->GetModelElements()[elementId];