X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=019c0ac25c47e0cf39236f433c59b33b8b606f79;hb=71c071fbb1e2af618f6caa489351b966e1a54b1a;hp=ad37e22c023a6bc3f12de9fd1ab7163100d14836;hpb=698d779d5af904401fa3640f9a2e1c9a3f4aad28;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index ad37e22..019c0ac 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"
@@ -37,6 +38,7 @@
 #include "wx/tooltip.h"
 #include "wx/wxhtml.h"
 #include "wx/statline.h"
+#include "wx/config.h"
 #include "CDMUtilities.h"
 
 #include "creaDevManagerIds.h"
@@ -53,6 +55,8 @@
 #include "wxCDMFileDescriptionPanel.h"
 #include "wxCDMPackageManagerPanel.h"
 
+#include "wxCDMSettingsDialog.h"
+
 #include "wxCDMProjectActionsPanel.h"
 #include "wxCDMNewProjectDialog.h"
 
@@ -65,6 +69,7 @@ EVT_MENU(ID_MENU_CLOSE_PROJECT, wxCDMMainFrame::OnMenuCloseProject)
 EVT_MENU(ID_MENU_EXPORT_HIERARCHY, wxCDMMainFrame::OnMenuExportHierarchy)
 EVT_MENU(ID_MENU_EXIT, wxCDMMainFrame::OnMenuExit)
 EVT_MENU(ID_MENU_REFRESH_PROJECT, wxCDMMainFrame::OnMenuRefreshProject)
+EVT_MENU(ID_MENU_SETTINGS, wxCDMMainFrame::OnMenuSettings)
 EVT_MENU(ID_MENU_BBTK_GRAPHICAL_EDITOR, wxCDMMainFrame::OnMenuBBTKGraphicalEditor)
 EVT_MENU(ID_MENU_MINITOOLS, wxCDMMainFrame::OnMenuMiniTools)
 EVT_MENU(ID_MENU_CODE_EDITOR, wxCDMMainFrame::OnMenuCodeEditor)
@@ -109,6 +114,9 @@ wxCDMMainFrame::wxCDMMainFrame(
 
 wxCDMMainFrame::~wxCDMMainFrame()
 {
+  wxConfigBase* pConfig = wxConfigBase::Get();
+  pConfig->Write(wxT("HELP"), this->help);
+
   auiManager.UnInit();
 }
 
@@ -122,8 +130,13 @@ bool wxCDMMainFrame::Create(
 )
 {
   wxFrame::Create(parent, id, caption, pos, size, style);
-  this->model = new modelCDMMain();
   this->help = true;
+
+  wxConfigBase* pConfig = wxConfigBase::Get();
+  this->help = pConfig->Read(wxT("HELP"), this->help) != 0;
+
+  this->model = new modelCDMMain();
+
   CreateMenus();
   CreateControls();
   return TRUE;
@@ -151,6 +164,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()
@@ -173,6 +188,7 @@ void wxCDMMainFrame::CreateMenus()
   //EditMenu
   menu_Edit = new wxMenu();
   menu_Edit->Append(ID_MENU_REFRESH_PROJECT, wxT("&Refresh Project"));
+  menu_Edit->Append(ID_MENU_SETTINGS, wxT("&Settings"));
 
   menuBar->Append(menu_Edit, wxT("&Edit"));
 
@@ -218,6 +234,7 @@ void wxCDMMainFrame::CreateControls()
       wxSize(200,400),
 	  wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
   );
+  this->actualTreeItem.Unset();
 
   panel_Properties = new wxCDMMainDescriptionPanel(
       this,
@@ -229,7 +246,7 @@ void wxCDMMainFrame::CreateControls()
   );
 
   auiManager.AddPane(panel_Properties, wxAuiPaneInfo().BestSize(600,400).CenterPane().Name(wxT("panel_Properties")).Caption(wxT("")).CloseButton(false));
-  auiManager.AddPane(tree_Projects, wxAuiPaneInfo().Right().MinSize(300,300).BestSize(300,400).CloseButton(false).Name(wxT("tree_Projects")).Caption(wxT("Project Tree")).CloseButton(false));
+  auiManager.AddPane(tree_Projects, wxAuiPaneInfo().Left().MinSize(300,300).BestSize(300,400).CloseButton(false).Name(wxT("tree_Projects")).Caption(wxT("Project Tree")).CloseButton(false));
   auiManager.Update();
   //auiManager.LoadPerspective(pers,true);
   wxToolTip::Enable(true);
@@ -258,6 +275,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();    
+            }
+
         }
 
 
@@ -274,13 +302,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 +310,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           this->panel_ProjectActions->Destroy();
           this->panel_ProjectActions = NULL;
         }
-
+	  
       panel_ProjectActions = new wxCDMProjectActionsPanel(
           this,
           this->model->GetProject(),
@@ -298,18 +320,17 @@ 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();
+	  this->actualTreeItem.Unset();
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
+	  //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
     }
-
-  event.Skip();
 }
 void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
 {
@@ -338,6 +359,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))
@@ -353,8 +384,8 @@ 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);
-
+      this->actualTreeItem.Unset();
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
 
 
       //change project's actions panel
@@ -381,8 +412,6 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       auiManager.Update();
 
     }
-
-  event.Skip();
 }
 
 void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
@@ -396,18 +425,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(
@@ -422,7 +449,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)
@@ -477,11 +503,25 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event)
       this->auiManager.Update();
 
       this->tree_Projects->Unselect();
-      this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+	  this->actualTreeItem.Unset();
+      this->tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
     }
   event.Skip();
 }
 
+void wxCDMMainFrame::OnMenuSettings(wxCommandEvent& event)
+{
+  wxCDMSettingsDialog* settingsDialog = new wxCDMSettingsDialog(this, -1);
+  settingsDialog->SetHelpEnabled(this->help);
+
+  int res = settingsDialog->ShowModal();
+  if(res == wxID_OK)
+    {
+      this->help = settingsDialog->IsHelpEnabled();
+      this->menu_Help->Check(ID_MENU_TOGGLE_HELP, this->help);
+    }
+}
+
 void wxCDMMainFrame::OnMenuBBTKGraphicalEditor(wxCommandEvent& event)
 {
   std::cerr << "Event OnMenuBBTKGraphicalEditor not implemented" << std::endl;
@@ -597,16 +637,25 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
   //get selected element
   wxTreeItemId elementId = event.GetItem();
-  if(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;
@@ -646,7 +695,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(
@@ -807,16 +856,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;
 
@@ -825,22 +877,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,
@@ -852,19 +906,21 @@ 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();
+        this->tree_Projects->SelectItem(bb->GetHeaderFile()->GetId().GetWxId());
         description = new wxCDMBlackBoxDescriptionPanel(
             this,
             bb,
@@ -874,6 +930,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
             wxSize(600, 400),
             0
         );
+
+		
       }
 
     //delete old view
@@ -888,20 +946,22 @@ 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();
     break;
   }
-  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();
 }
@@ -909,9 +969,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();
 }