X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMPackageDescriptionPanel.cpp;h=bed6dc5e8d878f3dabadafc453893d88c16f9a0f;hb=94511d0d24fe76a082b14afeab79bcaf0d1ecf13;hp=12b915276c1a6a7a81c219a799a2525af4188d10;hpb=11150e550ff03ee658e90cda4b475b4c24da0a7f;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
index 12b9152..bed6dc5 100644
--- a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
@@ -99,12 +99,13 @@ void wxCDMPackageDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->package->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()));
-      returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
+      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)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -183,14 +184,14 @@ void wxCDMPackageDescriptionPanel::CreateControls()
 
 
   std::vector<modelCDMBlackBox*> blackBoxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < blackBoxes.size(); i++)
+  for (int i = 0; i < (int)(blackBoxes.size()); i++)
     {
 
       if(blackBoxes[i] != NULL)
         {
 
-          wxHyperlinkCtrl* pBBlk = new wxHyperlinkCtrl(BBPanel,ID_LINK_SELECT_BLACKBOX, crea::std2wx(blackBoxes[i]->GetName().c_str()), crea::std2wx(blackBoxes[i]->GetName().c_str()));
-          pBBlk->SetWindowStyle(wxALIGN_LEFT);
+			wxHyperlinkCtrl* pBBlk = new wxHyperlinkCtrl(BBPanel,ID_LINK_SELECT_BLACKBOX, crea::std2wx(blackBoxes[i]->GetName().c_str()), crea::std2wx(blackBoxes[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+          pBBlk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
           std::string tt = "Author: " + blackBoxes[i]->GetAuthors() + "\nDescription: " + blackBoxes[i]->GetDescription() + "\nCategories: " + blackBoxes[i]->GetCategories();
           pBBlk->SetToolTip(crea::std2wx(tt));
           pBBlk->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageDescriptionPanel::OnMouseEnter,NULL,this);
@@ -248,12 +249,12 @@ void wxCDMPackageDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->package->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);
         }
@@ -339,14 +340,12 @@ void wxCDMPackageDescriptionPanel::OnBtnSetDescription(wxCommandEvent& event)
 
 void wxCDMPackageDescriptionPanel::OnLnkBlackBoxSelect(wxHyperlinkEvent& event)
 {
-  int bbId = 0;
   modelCDMBlackBox* bb;
   std::vector<modelCDMBlackBox*> bbs = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < bbs.size(); i++)
+  for (int i = 0; i < (int)(bbs.size()); i++)
     {
       if(bbs[i]->GetName() == crea::wx2std(event.GetURL()))
         {
-          bbId = bbs[i]->GetHeaderFile()->GetId();
           bb = bbs[i];
           break;
         }
@@ -358,8 +357,8 @@ void wxCDMPackageDescriptionPanel::OnLnkBlackBoxSelect(wxHyperlinkEvent& event)
   newEvent->SetString(wxT("blackbox"));
   wxPostEvent(this->GetParent(), *newEvent);
 
-  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
-  newEvent1->SetInt(bbId);
+  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+  newEvent1->SetClientData(bb->GetHeaderFile());
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
@@ -401,7 +400,7 @@ void wxCDMPackageDescriptionPanel::OnBtnCreateBlackBox(wxCommandEvent& event)
 
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
       newEvent->SetId(1);
-      newEvent->SetInt(blackBox->GetId());
+      newEvent->SetClientData(blackBox);
       newEvent->SetString(wxT("blackbox"));
       newEvent->SetClientData(blackBox);
       wxPostEvent(this->GetParent(), *newEvent);
@@ -414,12 +413,11 @@ void wxCDMPackageDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
   if(!this->package->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->package->GetCMakeLists() != NULL)
     {
-      int CMId = this->package->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->package->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -436,20 +434,20 @@ void wxCDMPackageDescriptionPanel::OnBtnOpenFolder(wxCommandEvent& event)
 
 void wxCDMPackageDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
   std::string BBName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
 
-  int bbId = 0;
+  modelCDMFile* bbHeader = NULL;
   std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < boxes.size(); i++)
+  for (int i = 0; i < (int)(boxes.size()); i++)
     {
       if(boxes[i]->GetName() == BBName)
         {
-          bbId = boxes[i]->GetHeaderFile()->GetId();
+          bbHeader = boxes[i]->GetHeaderFile();
           break;
         }
     }
-  newEvent->SetInt(bbId);
+  newEvent->SetClientData(bbHeader);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -457,19 +455,19 @@ void wxCDMPackageDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 
 void wxCDMPackageDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
   std::string BBName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int bbId = 0;
+  modelCDMFile* bbHeader = NULL;
   std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < boxes.size(); i++)
+  for (int i = 0; i < (int)(boxes.size()); i++)
     {
       if(boxes[i]->GetName() == BBName)
         {
-          bbId = boxes[i]->GetHeaderFile()->GetId();
+          bbHeader = boxes[i]->GetHeaderFile();
           break;
         }
     }
-  newEvent->SetInt(bbId);
+  newEvent->SetClientData(bbHeader);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -477,12 +475,11 @@ void wxCDMPackageDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 
 void wxCDMPackageDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
 
   if(this->package->GetCMakeLists() != NULL)
     {
-      int CMId = this->package->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->package->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -491,12 +488,11 @@ void wxCDMPackageDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
 void wxCDMPackageDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 
   if(this->package->GetCMakeLists() != NULL)
     {
-      int CMId = this->package->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->package->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }