X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMLibDescriptionPanel.cpp;h=abc0a8e2bd11328ff97c475c133a16c28ad3a281;hb=94511d0d24fe76a082b14afeab79bcaf0d1ecf13;hp=6167c17ac1fa2a17253d453e531ae2dae3bc25c7;hpb=5af1633cdea030f5189c57c51bd843685eecd8b6;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
index 6167c17..abc0a8e 100644
--- a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
@@ -42,7 +42,7 @@
 #include "images/LbIcon64.xpm"
 
 BEGIN_EVENT_TABLE(wxCDMLibDescriptionPanel, wxPanel)
-EVT_BUTTON(ID_BUTTON_PREV, wxCDMLibDescriptionPanel::OnBtnReturn)
+EVT_HYPERLINK(ID_BUTTON_PREV, wxCDMLibDescriptionPanel::OnBtnReturn)
 EVT_HYPERLINK(ID_LINK_SELECT_LIBRARY, wxCDMLibDescriptionPanel::OnLnkLibrarySelect)
 EVT_BUTTON(ID_BUTTON_CREATE_LIBRARY, wxCDMLibDescriptionPanel::OnBtnCreateLibrary)
 EVT_BUTTON(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMLibDescriptionPanel::OnBtnEditCMakeLists)
@@ -86,10 +86,22 @@ void wxCDMLibDescriptionPanel::CreateControls()
 {
   wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
-  //Link to return
-  wxButton* returnbt = new wxButton(this, ID_BUTTON_PREV, wxT("Return to project"));
-  returnbt->SetToolTip(wxT("Return to the active project description."));
-  sizer->Add(returnbt, 0, wxALIGN_CENTER | wxALL, 5);
+  //Links to return
+  wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
+  std::vector<modelCDMIProjectTreeNode*> parents = this->lib->GetParents();
+  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()), 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 < (int)(parents.size())-1)
+        {
+          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
+        }
+    }
+  sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
+
   //Header
   wxBoxSizer* headerSizer = new wxBoxSizer(wxHORIZONTAL);
   {
@@ -109,10 +121,10 @@ void wxCDMLibDescriptionPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
-      wxHyperlinkCtrl* pLibrarylk = new wxHyperlinkCtrl(propertiesPanel, ID_LINK_SELECT_LIBRARY, crea::std2wx(libraries[i]->GetName().c_str()), crea::std2wx(libraries[i]->GetName().c_str()));
-      pLibrarylk->SetWindowStyle(wxALIGN_LEFT);
+		wxHyperlinkCtrl* pLibrarylk = new wxHyperlinkCtrl(propertiesPanel, ID_LINK_SELECT_LIBRARY, crea::std2wx(libraries[i]->GetName().c_str()), crea::std2wx(libraries[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+      pLibrarylk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
       std::string tt = "Name: " + libraries[i]->GetName() + "\n";
       tt += "Location: " + libraries[i]->GetPath();
       pLibrarylk->SetToolTip(crea::std2wx(tt.c_str()));
@@ -196,7 +208,7 @@ void wxCDMLibDescriptionPanel::OnBtnCreateLibrary(wxCommandEvent& event)
       ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
 
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-      newEvent->SetInt(library->GetId());
+      newEvent->SetClientData(library);
       wxPostEvent(this->GetParent(), *newEvent);
     }
 }
@@ -207,12 +219,11 @@ void wxCDMLibDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
   if(!this->lib->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->lib->GetCMakeLists() != NULL)
     {
-      int CMId = this->lib->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->lib->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -220,35 +231,44 @@ void wxCDMLibDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
 void wxCDMLibDescriptionPanel::OnLnkLibrarySelect(wxHyperlinkEvent& event)
 {
-  int libraryId = 0;
+  modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == crea::wx2std(event.GetURL()))
         {
-          libraryId = libraries[i]->GetId();
+          theLibrary = libraries[i];
           break;
         }
     }
 
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(libraryId);
+  newEvent->SetClientData(theLibrary);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 
-  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
-  newEvent1->SetInt(libraryId);
+  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+  newEvent1->SetClientData(theLibrary);
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
 }
 
-void wxCDMLibDescriptionPanel::OnBtnReturn(wxCommandEvent& event)
+void wxCDMLibDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(((wxCDMMainFrame*)this->GetParent())->GetModel()->GetProject()->GetId());
-  newEvent->SetId(0);
-  wxPostEvent(this->GetParent(), *newEvent);
+  std::vector<modelCDMIProjectTreeNode*> parents = this->lib->GetParents();
+  std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
+  //std::cout << parentURL << std::endl;
+  for (int i = 0; i < (int)(parents.size()); i++)
+    {
+      if (parents[i]->GetPath() == parentURL)
+        {
+          wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
+          newEvent->SetClientData(parents[i]);
+          newEvent->SetId(0);
+          wxPostEvent(this->GetParent(), *newEvent);
+        }
+    }
 }
 
 void wxCDMLibDescriptionPanel::OnBtnOpenFolder(wxCommandEvent& event)
@@ -260,19 +280,19 @@ void wxCDMLibDescriptionPanel::OnBtnOpenFolder(wxCommandEvent& event)
 
 void wxCDMLibDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
   std::string LibName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int lbId = 0;
+  modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == LibName)
         {
-          lbId = libraries[i]->GetId();
+          theLibrary = libraries[i];
           break;
         }
     }
-  newEvent->SetInt(lbId);
+  newEvent->SetClientData(theLibrary);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -280,19 +300,19 @@ void wxCDMLibDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 
 void wxCDMLibDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
   std::string LibName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int lbId = 0;
+  modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == LibName)
         {
-          lbId = libraries[i]->GetId();
+          theLibrary = libraries[i];
           break;
         }
     }
-  newEvent->SetInt(lbId);
+  newEvent->SetClientData(theLibrary);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -300,12 +320,11 @@ void wxCDMLibDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 
 void wxCDMLibDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
 
   if(this->lib->GetCMakeLists() != NULL)
     {
-      int CMId = this->lib->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->lib->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -314,12 +333,11 @@ void wxCDMLibDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
 void wxCDMLibDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 
   if(this->lib->GetCMakeLists() != NULL)
     {
-      int CMId = this->lib->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->lib->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }