X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=019c0ac25c47e0cf39236f433c59b33b8b606f79;hb=35dd4d1ddf73a91d308cc49fc394104169936055;hp=9565b8a37858d75e7e8b0713d573e1c0fabab5c4;hpb=94511d0d24fe76a082b14afeab79bcaf0d1ecf13;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp index 9565b8a..019c0ac 100755 --- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp +++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp @@ -38,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" @@ -54,6 +55,8 @@ #include "wxCDMFileDescriptionPanel.h" #include "wxCDMPackageManagerPanel.h" +#include "wxCDMSettingsDialog.h" + #include "wxCDMProjectActionsPanel.h" #include "wxCDMNewProjectDialog.h" @@ -66,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) @@ -110,6 +114,9 @@ wxCDMMainFrame::wxCDMMainFrame( wxCDMMainFrame::~wxCDMMainFrame() { + wxConfigBase* pConfig = wxConfigBase::Get(); + pConfig->Write(wxT("HELP"), this->help); + auiManager.UnInit(); } @@ -123,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; @@ -152,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() @@ -174,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")); @@ -231,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); @@ -260,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(); + } + } @@ -299,11 +325,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 +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)) @@ -346,9 +382,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,11 +503,25 @@ 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(); } +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; @@ -587,11 +637,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]; @@ -843,7 +894,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) //this->tree_Projects->Expand(this->model->GetProject()->GetId()); //this->tree_Projects->Unselect(); this->actualTreeItem.Unset(); - description = new wxCDMPackageManagerPanel( + description = new wxCDMPackageManagerPanel( this, this->model->GetProject(), ID_WINDOW_PROPERTIES, @@ -868,7 +919,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) else if(event.GetString() == wxT("blackbox")) { modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData(); - this->actualTreeItem.Unset(); + this->actualTreeItem.Unset(); + this->tree_Projects->SelectItem(bb->GetHeaderFile()->GetId().GetWxId()); description = new wxCDMBlackBoxDescriptionPanel( this, bb, @@ -878,6 +930,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) wxSize(600, 400), 0 ); + } @@ -895,7 +948,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) auiManager.Update(); break; default: - event.Skip(); + event.Skip(); + break; } }