]> Creatis software - crea.git/commitdiff
Feature #1711
authorDaniel Felipe Gonzalez <daniel.gonzalez@creatis.insa-lyon.fr>
Wed, 6 Feb 2013 10:19:35 +0000 (11:19 +0100)
committerDaniel Felipe Gonzalez <daniel.gonzalez@creatis.insa-lyon.fr>
Wed, 6 Feb 2013 10:19:35 +0000 (11:19 +0100)
CreaDevManager application implementation

- Fixed new project open when another project is already open.
- Fixed project open when another project is already open.

lib/creaDevManagerLib/wxCDMMainFrame.cpp

index 5305703190ec0f1a5922f55d8d6203ecde7146c2..441d99e89050c728f347cd41239a1bdb095e1e69 100755 (executable)
@@ -262,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();    
+            }
+
         }
 
 
@@ -301,10 +312,10 @@ 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());
+         tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
          //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
     }
 }
@@ -335,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))
@@ -348,9 +369,9 @@ 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();
-          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);