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()
wxStaticText* instruction = new wxStaticText(this, wxID_ANY, wxT("Please fill the following details."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
v_sizer1->Add(instruction, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
- wxFlexGridSizer* formItems = new wxFlexGridSizer(4,2,9,15);
+ wxFlexGridSizer* formItems = new wxFlexGridSizer(10,2,9,15);
wxStaticText *stxtPrjName = new wxStaticText(this, -1, wxT("Black Box Name"));
wxStaticText *stxtPrjAuth = new wxStaticText(this, -1, wxT("Black Box Authors (separated by ',')"));
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)"),
+//JFGA new type added
+ wxT("Web Widget - WtBlackBox")
+
};
- this->blackBoxType = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, BBTypes);
+ this->blackBoxType = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, BBTypes);
wxString BBFormats[] =
{