X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=45dc8e587af7b58c181854246764400458d2b57e;hb=72a6140565ccd0905f822c7bf17ea471762a9301;hp=ad37e22c023a6bc3f12de9fd1ab7163100d14836;hpb=698d779d5af904401fa3640f9a2e1c9a3f4aad28;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index ad37e22..45dc8e5 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -29,6 +29,7 @@
 #include "wxCDMMainFrame.h"
 
 #include <iostream>
+#include <sstream>
 
 #include <creaWx.h>
 #include "creaSystem.h"
@@ -274,13 +275,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           event.Skip();
           return;
         }
-
-      //populate tree control
-      tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
-      tree_Projects->Unselect();
-      tree_Projects->SelectItem(this->model->GetProject()->GetId());
-
-
+      
       //show project actions panel
       if(this->panel_ProjectActions != NULL)
         {
@@ -288,7 +283,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           this->panel_ProjectActions->Destroy();
           this->panel_ProjectActions = NULL;
         }
-
+	  
       panel_ProjectActions = new wxCDMProjectActionsPanel(
           this,
           this->model->GetProject(),
@@ -298,18 +293,16 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           wxSize(800,200),
           0
       );
-      panel_ProjectActions->SetMinSize(wxSize(500, 100));
-
-
+      
       auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false));
-
       auiManager.Update();
 
-      //wxMessageBox(_T("New Project created!"),_T("New Project - Success!"), wxOK | wxICON_INFORMATION);
-
+      //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);
     }
-
-  event.Skip();
 }
 void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
 {
@@ -353,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(), true);
 
 
 
@@ -597,15 +590,16 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
   //get selected element
   wxTreeItemId elementId = event.GetItem();
-  if(this->tree_Projects->IsSelected(elementId))
+  if(elementId.IsOk() && this->tree_Projects->IsSelected(elementId))
     {
       std::cout << "Tree Selection id: " << elementId << 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
       //project
       modelCDMProject* elementProject = dynamic_cast<modelCDMProject*>(element);
@@ -646,7 +640,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
             {
               //application
               modelCDMApplication* elementApplication = dynamic_cast<modelCDMApplication*>(element);
-              if(elementApplication != NULL)
+			  if(elementApplication != NULL)
                 {
                   //create element description
                   description = new wxCDMApplicationDescriptionPanel(