X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMAppliDescriptionPanel.cpp;h=ac06179f96fee894b51d7ee69f93da8e5dc48aec;hb=a26a54f4555934ed0f3720bea6bb95913d7f02d6;hp=109e9db8497a434572ef9a48b681b63c0c884c03;hpb=11150e550ff03ee658e90cda4b475b4c24da0a7f;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp index 109e9db..ac06179 100644 --- a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp @@ -49,6 +49,7 @@ EVT_HYPERLINK(ID_LINK_SELECT_APPLICATION, wxCDMAppliDescriptionPanel::OnLnkAppli EVT_BUTTON(ID_BUTTON_CREATE_APPLICATION, wxCDMAppliDescriptionPanel::OnBtnCreateApplication) EVT_BUTTON(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists) EVT_BUTTON(ID_BUTTON_OPEN_FOLDER, wxCDMAppliDescriptionPanel::OnBtnOpenFolder) +EVT_CHECKBOX(ID_CHECK_INCLUDE_APPLICATION, wxCDMAppliDescriptionPanel::OnChBApplicationChange) END_EVENT_TABLE() wxCDMAppliDescriptionPanel::wxCDMAppliDescriptionPanel( @@ -81,6 +82,9 @@ bool wxCDMAppliDescriptionPanel::Create( wxPanel::Create(parent, id, pos, size, style); this->appli = appli; CreateControls(); + // this part makes the scrollbars show up + this->FitInside(); // ask the sizer about the needed size + this->SetScrollRate(5, 5); return TRUE; } @@ -91,16 +95,16 @@ void wxCDMAppliDescriptionPanel::CreateControls() //Links to return wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL); std::vector parents = this->appli->GetParents(); - for (int i = 0; i < parents.size(); i++) + for (int i = 0; i < (int)(parents.size()); i++) { - wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath())); + wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE); + returnLnk->SetWindowStyle(wxNO_BORDER); returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + ".")); linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); - if (i < parents.size()-1) - { - linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0); - } + linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0); } + linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->appli->GetName())), 0, wxALIGN_CENTER, 0); + sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5); //Header @@ -120,23 +124,48 @@ void wxCDMAppliDescriptionPanel::CreateControls() wxStaticBoxSizer* propertiesBox = new wxStaticBoxSizer(wxVERTICAL, this, wxT("A&vailable Applications")); propertiesBox->GetStaticBox()->SetToolTip(wxT("Select any of the available applications to see its details or the modify them.")); wxPanel* propertiesPanel = new wxPanel(this); - wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL); std::vector applications = this->appli->GetApplications(); - for (int i = 0; i < applications.size(); i++) + wxFlexGridSizer* propertiesGridSizer = new wxFlexGridSizer(applications.size()+1, 3, 9, 5); + + wxStaticText* ChBTitle = new wxStaticText(propertiesPanel, wxID_ANY, wxT("Include in\nCMake"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL); + wxStaticText* LkTitle = new wxStaticText(propertiesPanel, wxID_ANY, wxT("Application Name"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL); + wxStaticText* HlpTitle = new wxStaticText(propertiesPanel, wxID_ANY, wxT("Help"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL); + + propertiesGridSizer -> Add(ChBTitle, 0, wxEXPAND | wxALL, 5); + propertiesGridSizer -> Add(LkTitle, 0, wxEXPAND | wxALL, 5); + propertiesGridSizer -> Add(HlpTitle, 0, wxEXPAND | wxALL, 5); + + for (int i = 0; i < (int)(applications.size()); i++) { - wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str())); - pApplicationlk->SetWindowStyle(wxALIGN_LEFT); - std::string tt = "Name: " + applications[i]->GetName() + "\n"; + //checkbox for cmake inclusion + wxCheckBox* pApplicationChB = new wxCheckBox(propertiesPanel, ID_CHECK_INCLUDE_APPLICATION, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT); + pApplicationChB->SetName(crea::std2wx(applications[i]->GetName())); + std::string tt = "if this box is checked the the " + applications[i]->GetName() + " application is included in the project compilation."; + pApplicationChB->SetToolTip(crea::std2wx(tt)); + pApplicationChB->SetValue(this->appli->IsApplicationIncluded(applications[i]->GetName())); + propertiesGridSizer -> Add(pApplicationChB, 0, wxEXPAND | wxALIGN_CENTER); + + //link to library with description + wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel, ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE); + pApplicationlk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER); + tt = "Name: " + applications[i]->GetName() + "\n"; tt += "Location: " + applications[i]->GetPath(); - pApplicationlk->SetToolTip(crea::std2wx(tt.c_str())); + pApplicationlk->SetToolTip(crea::std2wx(tt)); pApplicationlk->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMAppliDescriptionPanel::OnMouseEnter,NULL,this); pApplicationlk->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMAppliDescriptionPanel::OnMouseExit,NULL,this); - propertiesPanelSizer -> Add(pApplicationlk, 1, wxEXPAND | wxALL, 5); + propertiesGridSizer -> Add(pApplicationlk, 0, wxEXPAND); + + //help icon + wxButton* pApplicationHlp = new wxButton(propertiesPanel, wxID_ANY, wxT("?"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + propertiesGridSizer -> Add(pApplicationHlp, 0, wxEXPAND | wxALIGN_CENTER); } - propertiesPanel->SetSizer(propertiesPanelSizer); - propertiesPanelSizer->Fit(propertiesPanel); + propertiesGridSizer->AddGrowableCol(1,1); + + propertiesPanel->SetSizer(propertiesGridSizer); + propertiesGridSizer->Fit(propertiesPanel); + propertiesBox->Add(propertiesPanel, 1, wxEXPAND | wxALL, 5); sizer -> Add(propertiesBox, 0, wxEXPAND | wxALL, 10); @@ -151,12 +180,12 @@ void wxCDMAppliDescriptionPanel::CreateControls() wxButton* createApplicationbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_APPLICATION, _T("A. Create Application")); createApplicationbt->SetToolTip(wxT("Create a new application for this project.")); actionsGridSizer->Add(createApplicationbt, 1, wxALL | wxEXPAND, 5); - wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("B. Edit CMakeLists File")); + wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("Edit CMakeLists File")); editCMakebt->SetToolTip(wxT("Open the system default text editor to edit the CMakeLists.txt file.")); editCMakebt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMAppliDescriptionPanel::OnCMakeMouseEnter,NULL,this); editCMakebt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMAppliDescriptionPanel::OnCMakeMouseExit,NULL,this); actionsGridSizer->Add(editCMakebt, 1, wxALL | wxEXPAND, 5); - wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("C. Open Applications Folder")); + wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("Open Applications Folder")); openFolderbt->SetToolTip(wxT("Open the appli folder in the file explorer.")); actionsGridSizer->Add(openFolderbt, 1, wxALL | wxEXPAND, 5); @@ -183,36 +212,59 @@ void wxCDMAppliDescriptionPanel::CreateControls() void wxCDMAppliDescriptionPanel::OnBtnCreateApplication(wxCommandEvent& event) { //get name - wxString applicationName = wxGetTextFromUser( - _T("Enter the new application name"), - _T("New Application - creaDevManager"), - _T("") - ); - //check name - if(applicationName.Len() > 0) - { - std::string* result; - //create library - modelCDMIProjectTreeNode* application = this->appli->CreateApplication(crea::wx2std(applicationName),result); - //check library created - if(application == NULL) - { - wxMessageBox(crea::std2wx(*result),_T("New Application - Error!"),wxOK | wxICON_ERROR); - event.Skip(); - return; - } - wxMessageBox(crea::std2wx("Application successfully created."),_T("New Application - Success!"),wxOK | wxICON_INFORMATION); - - //refreshing tree and description - //send event instead of calling parent to avoid crashing - - ((wxCDMMainFrame*)this->GetParent())->RefreshProject(); - - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); - newEvent->SetInt(application->GetId()); - wxPostEvent(this->GetParent(), *newEvent); - event.Skip(); - } + wxTextEntryDialog* appDlg = new wxTextEntryDialog( + this, + wxT("Enter the new application name (NO white spaces)"), + wxT("New Application - creaDevManager"), + wxT(""), + wxOK | wxCANCEL + ); + + if (appDlg->ShowModal() == wxID_OK) + { + std::string applicationName = crea::wx2std(appDlg->GetValue()); + //check name + if(applicationName.size() > 0) + { + wxArrayString types; + types.Add(wxT("Console Application")); + types.Add(wxT("GUI Application (wxWidgets)")); + int applicationType = wxGetSingleChoiceIndex( + wxT("Select the application type"), + wxT("New Application - creaDevManager"), + types + ); + + if (applicationType != -1) + { + std::string* result; + //create library + modelCDMIProjectTreeNode* application = this->appli->CreateApplication(applicationName, applicationType ,result); + //check library created + if(application == NULL) + { + wxMessageBox(crea::std2wx(*result),_T("New Application - Error!"),wxOK | wxICON_ERROR); + event.Skip(); + return; + } + wxMessageBox(crea::std2wx("Application successfully created."),_T("New Application - Success!"),wxOK | wxICON_INFORMATION); + + //refreshing tree and description + //send event instead of calling parent to avoid crashing + + ((wxCDMMainFrame*)this->GetParent())->RefreshProject(); + + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); + newEvent->SetClientData(application); + wxPostEvent(this->GetParent(), *newEvent); + event.Skip(); + } + } + else + { + wxMessageBox(crea::std2wx("Invalid application name, please try again with a valid name."),_T("New Application - Error!"),wxOK | wxICON_INFORMATION); + } + } } void wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event) @@ -221,36 +273,43 @@ void wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event) if(!this->appli->OpenCMakeListsFile(result)) wxMessageBox(crea::std2wx(*result),_T("Open CMakeLists File - Error!"),wxOK | wxICON_ERROR); - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED); + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); if(this->appli->GetCMakeLists() != NULL) { - int CMId = this->appli->GetCMakeLists()->GetId(); - newEvent->SetInt(CMId); + newEvent->SetClientData(this->appli->GetCMakeLists()); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); } } +void wxCDMAppliDescriptionPanel::OnChBApplicationChange(wxCommandEvent& event) +{ + this->appli->SetApplicationInclude( + crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), + ((wxCheckBox*)event.GetEventObject())->GetValue() + ); +} + void wxCDMAppliDescriptionPanel::OnLnkApplicationSelect(wxHyperlinkEvent& event) { - int applicationId = 0; + modelCDMApplication* applicationFound = NULL; std::vector applications = this->appli->GetApplications(); - for (int i = 0; i < applications.size(); i++) + for (int i = 0; i < (int)(applications.size()); i++) { if(applications[i]->GetName() == crea::wx2std(event.GetURL())) { - applicationId = applications[i]->GetId(); + applicationFound = applications[i]; break; } } - wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED); - newEvent1->SetInt(applicationId); + wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); + newEvent1->SetClientData(applicationFound); newEvent1->SetId(0); wxPostEvent(this->GetParent(), *newEvent1); wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); - newEvent->SetInt(applicationId); + newEvent->SetClientData(applicationFound); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); } @@ -260,12 +319,12 @@ void wxCDMAppliDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event) std::vector parents = this->appli->GetParents(); std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL()); //std::cout << parentURL << std::endl; - for (int i = 0; i < parents.size(); i++) + for (int i = 0; i < (int)(parents.size()); i++) { if (parents[i]->GetPath() == parentURL) { wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); - newEvent->SetInt(parents[i]->GetId()); + newEvent->SetClientData(parents[i]); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); } @@ -281,19 +340,19 @@ void wxCDMAppliDescriptionPanel::OnBtnOpenFolder(wxCommandEvent& event) void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event) { - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED); + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED); std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL()); - int appId = 0; + modelCDMApplication* theApp = NULL; std::vector applications = this->appli->GetApplications(); - for (int i = 0; i < applications.size(); i++) + for (int i = 0; i < (int)(applications.size()); i++) { if(applications[i]->GetName() == AppName) { - appId = applications[i]->GetId(); + theApp = applications[i]; break; } } - newEvent->SetInt(appId); + newEvent->SetClientData(theApp); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); event.Skip(); @@ -301,19 +360,19 @@ void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event) void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event) { - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED); + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL()); - int appId = 0; + modelCDMApplication* theApp = NULL; std::vector applications = this->appli->GetApplications(); - for (int i = 0; i < applications.size(); i++) + for (int i = 0; i < (int)(applications.size()); i++) { if(applications[i]->GetName() == AppName) { - appId = applications[i]->GetId(); + theApp = applications[i]; break; } } - newEvent->SetInt(appId); + newEvent->SetClientData(theApp); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); event.Skip(); @@ -321,12 +380,11 @@ void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event) void wxCDMAppliDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event) { - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED); + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED); if(this->appli->GetCMakeLists() != NULL) { - int CMId = this->appli->GetCMakeLists()->GetId(); - newEvent->SetInt(CMId); + newEvent->SetClientData(this->appli->GetCMakeLists()); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); } @@ -335,12 +393,11 @@ void wxCDMAppliDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event) void wxCDMAppliDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event) { - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED); + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); if(this->appli->GetCMakeLists() != NULL) { - int CMId = this->appli->GetCMakeLists()->GetId(); - newEvent->SetInt(CMId); + newEvent->SetClientData(this->appli->GetCMakeLists()); newEvent->SetId(0); wxPostEvent(this->GetParent(), *newEvent); }