X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMLibraryDescriptionPanel.cpp;h=71f6d69374decb41000d5dcebb73c79a34e47de9;hb=e622abafafec5f3887413020502eebf8631cd853;hp=47efd9c86b95d9621c90dfac33db844034532333;hpb=71c071fbb1e2af618f6caa489351b966e1a54b1a;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
index 47efd9c..71f6d69 100644
--- a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
@@ -81,12 +81,11 @@ bool wxCDMLibraryDescriptionPanel::Create(
 )
 {
   wxPanel::Create(parent, id, pos, size, style);
+  this->library = library;
+  CreateControls();
   // this part makes the scrollbars show up
   this->FitInside(); // ask the sizer about the needed size
   this->SetScrollRate(5, 5);
-
-  this->library = library;
-  CreateControls();
   return TRUE;
 }
 
@@ -153,7 +152,8 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
 
   //Includes
   wxStaticBoxSizer* includesBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("&Used Libraries"));
-  wxPanel* includesPanel = new wxPanel(this);
+  includesBox->SetMinSize(200,250);
+  wxScrolledWindow* includesPanel = new wxScrolledWindow(this);
   wxBoxSizer* includesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   //Third Party Libraries
@@ -161,7 +161,7 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
   wxFont font = Title1->GetFont();
   font.SetWeight(wxFONTWEIGHT_BOLD);
   Title1->SetFont(font);
-  includesPanelSizer->Add(Title1, 0, wxEXPAND | wxALL, 5);
+  includesPanelSizer->Add(Title1, 0, wxEXPAND);
 
   //inclusion data
   std::map<std::string, bool> inclusions = this->library->Get3rdPartyLibraries();
@@ -192,7 +192,14 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
     wxCheckBox* ChBIncl = new wxCheckBox(
         includesPanel, ID_CHECK_INCLUDE_3RDLIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
       );
-    ChBIncl->SetToolTip(crea::std2wx("When this box is checked the " + it->first + " library is included in the project configuration for this library."));
+    ChBIncl->SetToolTip(crea::std2wx(
+        "When this box is checked the " + it->first + " library\n"
+        "is included in the project configuration for\n"
+        "this library including the following instruction\n"
+        "in the library's folder CMakeLists.txt file:\n"
+        "SET ( ${LIBRARY_NAME}_LINK_LIBRARIES\n"
+        "  ${" + it->first+ "_LIBRARIES}\n"
+        ")"));
     ChBIncl->SetName(crea::std2wx(it->first));
     ChBIncl->SetValue(it->second);
     includesGridSizer->Add(ChBIncl, 1, wxEXPAND);
@@ -203,14 +210,14 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
 
   includesGridSizer->AddGrowableCol(1,1);
 
-  includesPanelSizer->Add(includesGridSizer, 1, wxEXPAND, 0);
+  includesPanelSizer->Add(includesGridSizer, 0, wxEXPAND | wxLEFT, 5);
 
   //Custom Libraries
   wxStaticText* Title2 = new wxStaticText(includesPanel, wxID_ANY, wxT("Custom Libraries:"));
   font = Title2->GetFont();
   font.SetWeight(wxFONTWEIGHT_BOLD);
   Title2->SetFont(font);
-  includesPanelSizer->Add(Title2, 0, wxEXPAND | wxALL, 5);
+  includesPanelSizer->Add(Title2, 0, wxEXPAND);
 
   //inclusion data
   std::map<std::string, bool> inclusionsLibs = this->library->GetCustomLibraries();
@@ -241,7 +248,17 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
     wxCheckBox* ChBIncl = new wxCheckBox(
         includesPanel, ID_CHECK_INCLUDE_LIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
       );
-    ChBIncl->SetToolTip(crea::std2wx("When this box is checked the " + it->first + " custom library is included in the project configuration for this library."));
+    ChBIncl->SetToolTip(crea::std2wx(
+        "When this box is checked the " + it->first + " custom\n"
+        "library is included in the project configuration for\n"
+        "this library including the following code in the\n"
+        "library's CMakeLists.txt file:\n"
+        "INCLUDE_DIRECTORIES (\n"
+        "  ../"+ it->first + "\n"
+        ")\n"
+        "SET ( ${LIBRARY_NAME}_LINK_LIBRARIES\n"
+        "  " + it->first+ "\n"
+        ")"));
     ChBIncl->SetName(crea::std2wx(it->first));
     ChBIncl->SetValue(it->second);
     includesLibGridSizer->Add(ChBIncl, 1, wxEXPAND);
@@ -252,10 +269,14 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
 
   includesLibGridSizer->AddGrowableCol(1,1);
 
-  includesPanelSizer->Add(includesLibGridSizer, 1, wxEXPAND, 0);
+  includesPanelSizer->Add(includesLibGridSizer, 0, wxEXPAND | wxLEFT, 5);
 
   includesPanel->SetSizer(includesPanelSizer);
   includesPanelSizer->Fit(includesPanel);
+
+  includesPanel->FitInside();
+  includesPanel->SetScrollRate(5,5);
+
   includesBox->Add(includesPanel, 1, wxEXPAND);
   sizer -> Add(includesBox, 0, wxALL | wxEXPAND, 10);
 
@@ -347,12 +368,18 @@ void wxCDMLibraryDescriptionPanel::OnBtnSetExeName(wxCommandEvent& event)
 
 void wxCDMLibraryDescriptionPanel::On3rdLibraryChBChange(wxCommandEvent& event)
 {
-  this->library->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue());
+  if(this->library->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue()))
+    ((wxCheckBox*)event.GetEventObject())->SetValue(((wxCheckBox*)event.GetEventObject())->GetValue());
+  else
+    ((wxCheckBox*)event.GetEventObject())->SetValue(!((wxCheckBox*)event.GetEventObject())->GetValue());
 }
 
 void wxCDMLibraryDescriptionPanel::OnLibraryChBChange(wxCommandEvent& event)
 {
-  this->library->SetCustomLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue());
+  if(this->library->SetCustomLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue()))
+      ((wxCheckBox*)event.GetEventObject())->SetValue(((wxCheckBox*)event.GetEventObject())->GetValue());
+    else
+      ((wxCheckBox*)event.GetEventObject())->SetValue(!((wxCheckBox*)event.GetEventObject())->GetValue());
 }
 
 void wxCDMLibraryDescriptionPanel::OnBtnCreateClass(wxCommandEvent& event)