From 80c01320fbade82fcc5bc972f2ed9f3e65239987 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Sun, 3 Oct 2010 11:40:48 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkWxGUIPackageBrowser2.cxx | 261 ++++++++++++------------ 1 file changed, 131 insertions(+), 130 deletions(-) diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx index 7d87a0e..cd511f7 100644 --- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx +++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx @@ -1,9 +1,9 @@ -/*========================================================================= +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkWxGUIPackageBrowser2.cxx,v $ Language: C++ - Date: $Date: 2010/09/12 14:52:25 $ - Version: $Revision: 1.22 $ + Date: $Date: 2010/10/03 11:40:48 $ + Version: $Revision: 1.23 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -11,36 +11,36 @@ * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html * or in the file LICENSE.txt. * * As a counterpart to the access to the source code and rights to copy, * modify and redistribute granted by the license, users are provided only * with a limited warranty and the software's author, the holder of the * economic rights, and the successive licensors have only limited -* liability. +* liability. * * The fact that you are presently reading this means that you have had * knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ /* \brief Short description in one line - * - * Long description which + * + * Long description which * can span multiple lines */ - + /** - * \file - * \brief + * \file + * \brief */ /** * \class bbtk:: - * \brief + * \brief */ @@ -81,23 +81,23 @@ namespace bbtk EVT_LIST_KEY_DOWN(LIST_CTRL, WxGUIBlackBoxList::OnListKeyDown) EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, WxGUIBlackBoxList::OnActivated) EVT_LIST_ITEM_FOCUSED(LIST_CTRL, WxGUIBlackBoxList::OnFocused) - + EVT_LIST_COL_CLICK(LIST_CTRL, WxGUIBlackBoxList::OnColClick) EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, WxGUIBlackBoxList::OnColRightClick) EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, WxGUIBlackBoxList::OnColBeginDrag) EVT_LIST_COL_DRAGGING(LIST_CTRL, WxGUIBlackBoxList::OnColDragging) EVT_LIST_COL_END_DRAG(LIST_CTRL, WxGUIBlackBoxList::OnColEndDrag) - + EVT_LIST_CACHE_HINT(LIST_CTRL, WxGUIBlackBoxList::OnCacheHint) - + #if USE_CONTEXT_MENU EVT_CONTEXT_MENU(WxGUIBlackBoxList::OnContextMenu) #endif EVT_CHAR(WxGUIBlackBoxList::OnChar) - + EVT_RIGHT_DOWN(WxGUIBlackBoxList::OnRightClick) END_EVENT_TABLE() - + int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData)) { // inverse the order @@ -105,7 +105,7 @@ namespace bbtk return -1; if (item1 > item2) return 1; - + return 0; } @@ -128,45 +128,45 @@ namespace bbtk { if (GetColumnCount()!=3) { - InsertColumn( 0, _("Package"), - wxLIST_FORMAT_LEFT, 60 ); - InsertColumn( 1, _("Box"), - wxLIST_FORMAT_LEFT, 200 ); - InsertColumn( 2, _("Description"), - wxLIST_FORMAT_LEFT, 500 ); + InsertColumn( 0, _("Package"), + wxLIST_FORMAT_LEFT, 60 ); + InsertColumn( 1, _("Box"), + wxLIST_FORMAT_LEFT, 200 ); + InsertColumn( 2, _("Description"), + wxLIST_FORMAT_LEFT, 500 ); } - + wxListItem kNewItem; kNewItem.SetAlign(wxLIST_FORMAT_LEFT); - + int nID = this->GetItemCount(); kNewItem.SetId(nID); kNewItem.SetMask(wxLIST_MASK_DATA); // TO DO : STORE SMART POINTER ? - kNewItem.SetData(d.get()); + kNewItem.SetData(d.get()); // BlackBoxDescriptor::Pointer* d2 = (BlackBoxDescriptor::Pointer*)kNewItem.GetData(); // std::cout << "Descr = "<InsertItem(kNewItem); this->SetItem(nID, 0, std2wx(d->GetPackage()->GetName()) ); this->SetItem(nID, 1, std2wx(d->GetTypeName()) ); this->SetItem(nID, 2, std2wx(d->GetDescription()) ); - + /* if (nID % 2) { kNewItem.SetBackgroundColour(wxColour(192,192,192)); this->SetItem(kNewItem); } - */ + */ } - - + + void WxGUIBlackBoxList::OnCacheHint(wxListEvent& event) { //wxLogMessage( wxT("OnCacheHint: cache items %ld..%ld"), // event.GetCacheFrom(), event.GetCacheTo() ); } - + void WxGUIBlackBoxList::SetColumnImage(int col, int image) { /* @@ -244,7 +244,7 @@ namespace bbtk void WxGUIBlackBoxList::OnBeginDrag(wxListEvent& event) { std::cout<<"RaC DRAG TABLE"<GetItemText(event.GetIndex())); wxListItem info; info.m_itemId = event.m_itemIndex; @@ -505,7 +505,7 @@ namespace bbtk int flags; long subitem; - // long item = + // long item = HitTest(event.GetPosition(), flags, &subitem); wxString where; @@ -583,11 +583,11 @@ namespace bbtk void WxGUIBlackBoxList::ShowContextMenu(const wxPoint& pos) { wxMenu menu; - + menu.Append(wxID_ABOUT, _T("&About")); menu.AppendSeparator(); menu.Append(wxID_EXIT, _T("E&xit")); - + PopupMenu(&menu, pos.x, pos.y); } //================================================================ @@ -601,7 +601,7 @@ namespace bbtk mDescriptor() { wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - + // mName = new wxStaticText(this,-1,_T("")); // sizer->Add(mName,0,wxGROW); mDescription = new wxStaticText(this,-1,_T("")); @@ -611,9 +611,9 @@ namespace bbtk mCategory = new wxStaticText(this,-1,_T("")); sizer->Add(mCategory,0,wxGROW); - wxBoxSizer *inputs = + wxBoxSizer *inputs = new wxStaticBoxSizer - ( new wxStaticBox(this, wxID_ANY, _T("Inputs")), wxVERTICAL ); + ( new wxStaticBox(this, wxID_ANY, _T("Inputs")), wxVERTICAL ); mInputList = new wxListCtrl(this, -1, wxDefaultPosition, wxDefaultSize, @@ -623,15 +623,15 @@ namespace bbtk inputs->Add(mInputList,1,wxGROW); sizer->Add(inputs,1,wxGROW); - wxBoxSizer *outputs = + wxBoxSizer *outputs = new wxStaticBoxSizer - ( new wxStaticBox(this, wxID_ANY, _T("Outputs")), wxVERTICAL ); + ( new wxStaticBox(this, wxID_ANY, _T("Outputs")), wxVERTICAL ); mOutputList = new wxListCtrl(this, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT //wxLC_LIST | wxSUNKEN_BORDER); - + outputs->Add(mOutputList,1,wxGROW); sizer->Add(outputs,1,wxGROW); @@ -641,7 +641,7 @@ namespace bbtk } //================================================================ - + //================================================================ void WxGUIBlackBoxInfo::UpdateInfo(BlackBoxDescriptor* descr) { @@ -650,44 +650,44 @@ namespace bbtk mDescription->SetLabel(std2wx(descr->GetDescription())); mAuthor->SetLabel(std2wx(descr->GetAuthor())); mCategory->SetLabel(std2wx(descr->GetCategory())); - + mInputList->ClearAll(); - mInputList->InsertColumn( 0, _("Name"), - wxLIST_FORMAT_LEFT, 80 ); - mInputList->InsertColumn( 1, _("Type"), - wxLIST_FORMAT_LEFT, 100 ); - mInputList->InsertColumn( 2, _("Nature"), - wxLIST_FORMAT_LEFT, 100 ); - mInputList->InsertColumn( 3, _("Description"), - wxLIST_FORMAT_LEFT, 500 ); + mInputList->InsertColumn( 0, _("Name"), + wxLIST_FORMAT_LEFT, 80 ); + mInputList->InsertColumn( 1, _("Type"), + wxLIST_FORMAT_LEFT, 100 ); + mInputList->InsertColumn( 2, _("Nature"), + wxLIST_FORMAT_LEFT, 100 ); + mInputList->InsertColumn( 3, _("Description"), + wxLIST_FORMAT_LEFT, 500 ); mOutputList->ClearAll(); - mOutputList->InsertColumn( 0, _("Name"), - wxLIST_FORMAT_LEFT, 80 ); - mOutputList->InsertColumn( 1, _("Type"), - wxLIST_FORMAT_LEFT, 100 ); - mOutputList->InsertColumn( 2, _("Nature"), - wxLIST_FORMAT_LEFT, 100 ); - mOutputList->InsertColumn( 3, _("Description"), - wxLIST_FORMAT_LEFT, 500 ); - + mOutputList->InsertColumn( 0, _("Name"), + wxLIST_FORMAT_LEFT, 80 ); + mOutputList->InsertColumn( 1, _("Type"), + wxLIST_FORMAT_LEFT, 100 ); + mOutputList->InsertColumn( 2, _("Nature"), + wxLIST_FORMAT_LEFT, 100 ); + mOutputList->InsertColumn( 3, _("Description"), + wxLIST_FORMAT_LEFT, 500 ); + std::vector user_defined; std::vector ubb_defined; std::vector wxbb_defined; - - const BlackBoxDescriptor::InputDescriptorMapType& imap = + + const BlackBoxDescriptor::InputDescriptorMapType& imap = descr->GetInputDescriptorMap(); BlackBoxDescriptor::InputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) + for ( in = imap.begin(); in != imap.end(); ++in ) { int iotype = 0; - if (in->second->GetCreatorTypeInfo() == + if (in->second->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) { iotype = 1; } - else if (in->second->GetCreatorTypeInfo() == + else if (in->second->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) { iotype = 2; @@ -695,58 +695,58 @@ namespace bbtk if (iotype==0) user_defined.push_back(in->second); else if (iotype==1) ubb_defined.push_back(in->second); else if (iotype==2) wxbb_defined.push_back(in->second); - + } std::vector::iterator hi; - for (hi=user_defined.begin();hi!=user_defined.end();++hi) + for (hi=user_defined.begin();hi!=user_defined.end();++hi) { InsertInputOutput(mInputList,*hi); } - for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) + for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) { InsertInputOutput(mInputList,*hi); } - for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) + for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) { InsertInputOutput(mInputList,*hi); } - + // Outputs user_defined.clear(); ubb_defined.clear(); wxbb_defined.clear(); - const BlackBoxDescriptor::OutputDescriptorMapType& omap = + const BlackBoxDescriptor::OutputDescriptorMapType& omap = descr->GetOutputDescriptorMap(); BlackBoxDescriptor::OutputDescriptorMapType::const_iterator out; - for ( out = omap.begin(); out != omap.end(); ++out ) + for ( out = omap.begin(); out != omap.end(); ++out ) { int iotype = 0; - if (out->second->GetCreatorTypeInfo() == + if (out->second->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) { iotype = 1; } - else if (out->second->GetCreatorTypeInfo() == + else if (out->second->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) { iotype = 2; } - + if (iotype==0) user_defined.push_back(out->second); else if (iotype==1) ubb_defined.push_back(out->second); else if (iotype==2) wxbb_defined.push_back(out->second); } - for (hi=user_defined.begin();hi!=user_defined.end();++hi) + for (hi=user_defined.begin();hi!=user_defined.end();++hi) { InsertInputOutput(mOutputList,*hi); } - for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) + for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) { InsertInputOutput(mOutputList,*hi); } - for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) + for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) { InsertInputOutput(mOutputList,*hi); } @@ -764,7 +764,7 @@ namespace bbtk // std::cout << nID << std::endl; kNewItem.SetId(nID); // kNewItem.SetMask(wxLIST_MASK_DATA); - // kNewItem.SetData(d); + // kNewItem.SetData(d); l->InsertItem(kNewItem); l->SetItem(nID, 0, std2wx(d->GetName()) ); l->SetItem(nID, 1, std2wx(d->GetTypeName()) ); @@ -780,7 +780,7 @@ namespace bbtk //================================================================ - enum + enum { id_f1, id_f2, @@ -802,6 +802,7 @@ namespace bbtk mUser(user), mInterpreter() { + _actualSelected=NULL; m_mgr.SetManagedWindow(this); // wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); @@ -820,7 +821,7 @@ namespace bbtk .MaximizeButton(true) .Center() .MinSize(wxSize(100,100)) - ); + ); // sizer->Add(mBoxList,5,wxGROW); mBoxInfo = new WxGUIBlackBoxInfo(this); @@ -833,29 +834,29 @@ namespace bbtk .MaximizeButton(true) .Bottom() .MinSize(wxSize(100,300)) - ); + ); wxPanel* filters = new wxPanel(this,-1); - wxBoxSizer *fsizer = new wxBoxSizer(wxVERTICAL ); - wxBoxSizer *fpack = + wxBoxSizer *fsizer = new wxBoxSizer(wxVERTICAL ); + wxBoxSizer *fpack = new wxStaticBoxSizer - ( new wxStaticBox(filters, wxID_ANY, _T("Package")), wxHORIZONTAL ); + ( new wxStaticBox(filters, wxID_ANY, _T("Package")), wxHORIZONTAL ); mPackageFilter = new wxTextCtrl(filters,id_f1,_T(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); fpack->Add(mPackageFilter,1,wxGROW); fsizer->Add(fpack,0,wxGROW); - wxBoxSizer *fname = + wxBoxSizer *fname = new wxStaticBoxSizer - ( new wxStaticBox(filters, wxID_ANY, _T("Name")), wxHORIZONTAL ); + ( new wxStaticBox(filters, wxID_ANY, _T("Name")), wxHORIZONTAL ); mNameFilter = new wxTextCtrl(filters,id_f2,_T(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); fname->Add(mNameFilter,1,wxGROW); fsizer->Add(fname,0,wxGROW); - wxBoxSizer *fdescr = + wxBoxSizer *fdescr = new wxStaticBoxSizer ( new wxStaticBox(filters, wxID_ANY, _T("Description")), wxHORIZONTAL ); mDescriptionFilter = new wxTextCtrl(filters,id_f3,_T(""), @@ -864,16 +865,16 @@ namespace bbtk wxTE_PROCESS_ENTER); fdescr->Add(mDescriptionFilter,1,wxGROW); fsizer->Add(fdescr,0,wxGROW); - wxBoxSizer *fcat = + wxBoxSizer *fcat = new wxStaticBoxSizer - ( new wxStaticBox(filters, wxID_ANY, _T("Category")), wxHORIZONTAL ); + ( new wxStaticBox(filters, wxID_ANY, _T("Category")), wxHORIZONTAL ); mCategoryFilter = new wxTextCtrl(filters,id_f4,_T(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); fcat->Add(mCategoryFilter,1,wxGROW); fsizer->Add(fcat,0,wxGROW); - wxBoxSizer *fintype = + wxBoxSizer *fintype = new wxStaticBoxSizer ( new wxStaticBox(filters, wxID_ANY, _T("Input type")), wxHORIZONTAL ); mInputTypeFilter = new wxTextCtrl(filters,id_f5,_T(""), @@ -882,7 +883,7 @@ namespace bbtk wxTE_PROCESS_ENTER); fintype->Add(mInputTypeFilter,1,wxGROW); fsizer->Add(fintype,0,wxGROW); - wxBoxSizer *fouttype = + wxBoxSizer *fouttype = new wxStaticBoxSizer ( new wxStaticBox(filters, wxID_ANY, _T("Output type")), wxHORIZONTAL ); mOutputTypeFilter = new wxTextCtrl(filters,id_f6,_T(""), @@ -891,18 +892,18 @@ namespace bbtk wxTE_PROCESS_ENTER); fouttype->Add(mOutputTypeFilter,1,wxGROW); fsizer->Add(fouttype,0,wxGROW); - wxBoxSizer *finnat = + wxBoxSizer *finnat = new wxStaticBoxSizer - ( new wxStaticBox(filters, wxID_ANY, _T("Input nature")),wxHORIZONTAL ); + ( new wxStaticBox(filters, wxID_ANY, _T("Input nature")),wxHORIZONTAL ); mInputNatureFilter = new wxTextCtrl(filters,id_f7,_T(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); finnat->Add(mInputNatureFilter,1,wxGROW); fsizer->Add(finnat,0,wxGROW); - wxBoxSizer *foutnat = + wxBoxSizer *foutnat = new wxStaticBoxSizer - ( new wxStaticBox(filters, wxID_ANY,_T("Output nature")),wxHORIZONTAL ); + ( new wxStaticBox(filters, wxID_ANY,_T("Output nature")),wxHORIZONTAL ); mOutputNatureFilter = new wxTextCtrl(filters,id_f8,_T(""), wxDefaultPosition, wxDefaultSize, @@ -938,7 +939,7 @@ namespace bbtk // SetSizer(sizer); SetAutoLayout(true); Layout(); - + } //================================================================ @@ -946,10 +947,10 @@ namespace bbtk { return mFactory; } - + //================================================================ - + //================================================================ void WxGUIPackageBrowser2::OnFilter(wxCommandEvent&) { @@ -958,7 +959,7 @@ namespace bbtk //================================================================ //================================================================ - // User callback when a box is selected in the list + // User callback when a box is selected in the list void WxGUIPackageBrowser2::WxGUIBlackBoxListUserOnSelected ( BlackBoxDescriptor* d) { @@ -970,7 +971,7 @@ namespace bbtk m_mgr.GetPane(mBoxInfo).Caption(std2wx(title)); m_mgr.Update(); } - + //================================================================ //================================================================ @@ -998,7 +999,7 @@ namespace bbtk mInterpreter->SetCommandLine(true); std::stringstream* buf = new std::stringstream; *buf << "exec freeze_no_error" << std::endl; - *buf << "message max 0" << std::endl; + *buf << "message max 0" << std::endl; *buf << "include *" << std::endl; mInterpreter->InterpretBuffer(buf); @@ -1012,7 +1013,7 @@ namespace bbtk { mFactory = F; RebuildList(); - } + } //================================================================ @@ -1020,15 +1021,15 @@ namespace bbtk void WxGUIPackageBrowser2::RebuildList() { mBoxList->Hide(); - mBoxList->ClearAll(); - + mBoxList->ClearAll(); + const Factory::PackageMapType& M = mFactory->GetPackageMap(); Factory::PackageMapType::const_iterator i; for (i=M.begin();i!=M.end();++i) { Package::Pointer P = i->second; if (P->GetName() == "user") continue; - + Package::DescriptorMapType::iterator j; for (j=P->GetDescriptorMap().begin(); j!=P->GetDescriptorMap().end(); @@ -1056,21 +1057,21 @@ namespace bbtk ((d->GetKind()==BlackBoxDescriptor::GUI)|| (d->GetKind()==BlackBoxDescriptor::DEFAULT_GUI))) return false; - if (d->GetPackage()->GetName().find( wx2std(mPackageFilter->GetValue()) ) + if (d->GetPackage()->GetName().find( wx2std(mPackageFilter->GetValue()) ) == std::string::npos ) return false; - if (d->GetTypeName().find( wx2std(mNameFilter->GetValue()) ) + if (d->GetTypeName().find( wx2std(mNameFilter->GetValue()) ) == std::string::npos ) return false; - if (d->GetDescription().find( wx2std(mDescriptionFilter->GetValue()) ) + if (d->GetDescription().find( wx2std(mDescriptionFilter->GetValue()) ) == std::string::npos ) return false; - if (d->GetCategory().find( wx2std(mCategoryFilter->GetValue()) ) + if (d->GetCategory().find( wx2std(mCategoryFilter->GetValue()) ) == std::string::npos ) return false; if (!mShowWidgetsFilter->IsChecked()) { bool found = false; - const BlackBoxDescriptor::OutputDescriptorMapType& imap = + const BlackBoxDescriptor::OutputDescriptorMapType& imap = d->GetOutputDescriptorMap(); BlackBoxDescriptor::OutputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) + for ( in = imap.begin(); in != imap.end(); ++in ) { if (in->second->GetName() == "Widget" ) { @@ -1084,10 +1085,10 @@ namespace bbtk { std::string s = wx2std(mInputTypeFilter->GetValue()); bool found = false; - const BlackBoxDescriptor::InputDescriptorMapType& imap = + const BlackBoxDescriptor::InputDescriptorMapType& imap = d->GetInputDescriptorMap(); BlackBoxDescriptor::InputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) + for ( in = imap.begin(); in != imap.end(); ++in ) { if (in->second->GetTypeName().find(s)!=std::string::npos) { @@ -1101,10 +1102,10 @@ namespace bbtk { std::string s = wx2std(mOutputTypeFilter->GetValue()); bool found = false; - const BlackBoxDescriptor::OutputDescriptorMapType& imap = + const BlackBoxDescriptor::OutputDescriptorMapType& imap = d->GetOutputDescriptorMap(); BlackBoxDescriptor::OutputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) + for ( in = imap.begin(); in != imap.end(); ++in ) { if (in->second->GetTypeName().find(s)!=std::string::npos) { @@ -1118,10 +1119,10 @@ namespace bbtk { std::string s = wx2std(mInputNatureFilter->GetValue()); bool found = false; - const BlackBoxDescriptor::InputDescriptorMapType& imap = + const BlackBoxDescriptor::InputDescriptorMapType& imap = d->GetInputDescriptorMap(); BlackBoxDescriptor::InputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) + for ( in = imap.begin(); in != imap.end(); ++in ) { if (in->second->GetNature().find(s)!=std::string::npos) { @@ -1135,10 +1136,10 @@ namespace bbtk { std::string s = wx2std(mOutputNatureFilter->GetValue()); bool found = false; - const BlackBoxDescriptor::OutputDescriptorMapType& imap = + const BlackBoxDescriptor::OutputDescriptorMapType& imap = d->GetOutputDescriptorMap(); BlackBoxDescriptor::OutputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) + for ( in = imap.begin(); in != imap.end(); ++in ) { if (in->second->GetNature().find(s)!=std::string::npos) { @@ -1171,7 +1172,7 @@ namespace bbtk //================================================================ - WxGUIPackageBrowser2Window::WxGUIPackageBrowser2Window( wxWindow *parent, + WxGUIPackageBrowser2Window::WxGUIPackageBrowser2Window( wxWindow *parent, wxString title, wxSize size) : wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size) @@ -1181,17 +1182,17 @@ namespace bbtk mBrowser = new WxGUIPackageBrowser2(this); mBrowser->IncludeAll(); sizer->Add(mBrowser,1,wxGROW); - + // WxGUICommand* com = new WxGUICommand(this,this); // sizer->Add(com); - + SetSizer(sizer); // Creates the parent window of all bbtk windows as a child of this // Wx::CreateTopWindow(this); - // Add the method OnWxSignal as a Wx::Signal observer + // Add the method OnWxSignal as a Wx::Signal observer //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal); - + SetAutoLayout(true); Layout(); } -- 2.45.1