X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaDevManagerLib%2FwxCDMNewBlackBoxDialog.cpp;h=c1542881aebf1afa9a6e4a4b37bf18cc4c872e64;hb=38fb78e3930c8ba01021536630624e4b0b03dd87;hp=166ba83eaa52a7fd83537e5df432c05cf6409a15;hpb=cfa883d25e73975f73c20fefc1ec2c947d827938;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp b/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
index 166ba83..c154288 100644
--- a/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
@@ -101,12 +101,52 @@ const wxString wxCDMNewBlackBoxDialog::GetBlackBoxCategories() const
 
 const wxString wxCDMNewBlackBoxDialog::GetBlackBoxType() const
 {
-  return this->blackBoxType->GetString(this->blackBoxType->GetCurrentSelection());
+  wxString res;
+  switch(this->blackBoxType->GetCurrentSelection())
+  {
+  case 0:
+    res = wxT("std");
+    break;
+  case 1:
+    res = wxT("widget");
+    break;
+  case 2:
+#ifdef _WIN32
+	res = wxT("VTK_ImageAlgorithm");
+#else
+    res = wxT("VTK-ImageAlgorithm");
+#endif
+    break;
+  case 3:
+#ifdef _WIN32
+	res = wxT("VTK_PolyDataAlgorithm");
+#else
+    res = wxT("VTK-PolyAlgorithm");
+#endif
+    break;
+  default:
+    res = wxT("std");
+    break;
+  }
+  return res;
 }
 
 const wxString wxCDMNewBlackBoxDialog::GetBlackBoxFormat() const
 {
-  return this->blackBoxFormat->GetString(this->blackBoxFormat->GetCurrentSelection());
+  wxString res;
+  switch(this->blackBoxFormat->GetCurrentSelection())
+  {
+  case 0:
+    res = wxT("C++");
+    break;
+  case 1:
+    res = wxT("XML");
+    break;
+  default:
+    res = wxT("C++");
+    break;
+  }
+  return res;
 }
 
 void wxCDMNewBlackBoxDialog::CreateControls()
@@ -137,10 +177,10 @@ void wxCDMNewBlackBoxDialog::CreateControls()
   this->blackBoxCategories = new wxTextCtrl(this, -1);
   wxString BBTypes[] =
       {
-          wxT("std"),
-          wxT("VTK-ImageAlgorithm"),
-          wxT("VTK-PolyAlgorithm"),
-          wxT("widget")
+          wxT("Basic - AtomicBlackBox"),
+		  wxT("Widget - WxBlackBox"),
+          wxT("VTK ImageAlgorithm - Basic and vtkImageAlgorithm (standard vtk I/O)"),
+          wxT("VTK PolyDataAlgorithm - Basic and vtkPolyDataAlgorithm (standard vtk I/O)")
       };
   this->blackBoxType = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, BBTypes);