X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIPackageBrowser.cxx;h=b452fd2e4eeb99e6cdb9e55ade97d66017d9977c;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=515a707cdb1fd4f0156ab5d587b2ca597ee7ffab;hpb=355e3d011880c7febb568fd7a3c51b180cd23707;p=bbtk.git
diff --git a/kernel/src/bbtkWxGUIPackageBrowser.cxx b/kernel/src/bbtkWxGUIPackageBrowser.cxx
index 515a707..b452fd2 100644
--- a/kernel/src/bbtkWxGUIPackageBrowser.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser.cxx
@@ -1,20 +1,42 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ # pour la SantÃ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ # 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.
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
/*=========================================================================
-
Program: bbtk
Module: $RCSfile: bbtkWxGUIPackageBrowser.cxx,v $
Language: C++
- Date: $Date: 2008/03/31 13:18:04 $
- Version: $Revision: 1.3 $
-
- Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
- l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*//**
+ Date: $Date: 2012/11/16 08:49:01 $
+ Version: $Revision: 1.8 $
+=========================================================================*/
+
+
+
+
+/**
* \brief Short description in one line
*
* Long description which
@@ -29,7 +51,7 @@
* \brief
*/
-
+/*
#ifdef _USE_WXWIDGETS_
#define CHECKBOXVIEW 1
@@ -47,9 +69,10 @@
namespace bbtk
{
//================================================================
- WxGUIPackageBrowserBlackBox::WxGUIPackageBrowserBlackBox(wxWindow* parent,
- WxGUIPackageBrowser* browser,
- BlackBoxDescriptor* descr) :
+ WxGUIPackageBrowserBlackBox::
+ WxGUIPackageBrowserBlackBox(wxWindow* parent,
+ WxGUIPackageBrowser* browser,
+ BlackBoxDescriptor::Pointer descr) :
wxPanel(parent, -1),
mBrowser(browser),
mDescriptor(descr)
@@ -111,14 +134,6 @@ namespace bbtk
out.push_back(name);
out.push_back(type);
out.push_back(descr);
- /* =
- " "+name+" | "
- + " "+type+" | "
- + ""+descr+" |
\n";
- */
if (iotype==0) user_defined.push_back(out);
else if (iotype==1) ubb_defined.push_back(out);
@@ -139,25 +154,6 @@ namespace bbtk
std::vector >::iterator hi;
for (hi=user_defined.begin();hi!=user_defined.end();++hi)
{
- /*
- wxTextCtrl* t = new wxTextCtrl(this,-1,_T("")
- ,wxDefaultPosition
- ,wxDefaultSize
- ,wxTE_READONLY
- );
- t->SetDefaultStyle(ionameattr);
- t->AppendText( std2wx((*hi)[0]) );
- grid->Add(t);
-
- t = new wxTextCtrl(this,-1,_T("")
- ,wxDefaultPosition
- ,wxDefaultSize
- ,wxTE_READONLY
- );
- t->SetDefaultStyle(iotypeattr);
- t->AppendText( std2wx((*hi)[1]) );
- grid->Add(t);
- */
grid->Add( new wxStaticText(this,-1,std2wx((*hi)[0])));
grid->Add( new wxStaticText(this,-1,std2wx((*hi)[1])));
@@ -228,14 +224,6 @@ namespace bbtk
out.push_back(name);
out.push_back(type);
out.push_back(descr);
- /* =
- " "+name+" | "
- + " "+type+" | "
- + ""+descr+" |
\n";
- */
if (iotype==0) user_defined.push_back(out);
else if (iotype==1) ubb_defined.push_back(out);
@@ -303,7 +291,7 @@ namespace bbtk
WxGUIPackageBrowserUser* user )
: wxPanel(parent, -1),
mUser(user),
- mInterpreter(0)
+ mInterpreter()
{
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
@@ -339,26 +327,26 @@ namespace bbtk
//================================================================
WxGUIPackageBrowser::~WxGUIPackageBrowser()
{
- std::cout << "del interpreter" << std::endl;
- if (mInterpreter) delete mInterpreter;
- std::cout << "ok" << std::endl;
+ // std::cout << "del interpreter" << std::endl;
+ // if (mInterpreter) delete mInterpreter;
+ // std::cout << "ok" << std::endl;
}
//================================================================
//================================================================
void WxGUIPackageBrowser::IncludeAll()
{
- if (!mInterpreter) mInterpreter = new bbtk::Interpreter();
+ if (!mInterpreter) mInterpreter = bbtk::Interpreter::New();
mInterpreter->SetCommandLine(true);
mInterpreter->InterpretLine("include *");
- Factory* F = mInterpreter->GetExecuter()->GetFactory();
+ Factory::Pointer F = mInterpreter->GetExecuter()->GetFactory();
BuildFromFactory(F);
}
//================================================================
//================================================================
- void WxGUIPackageBrowser::BuildFromFactory(Factory* F)
+ void WxGUIPackageBrowser::BuildFromFactory(Factory::Pointer F)
{
#ifndef LINUX
wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_CNT, 8, 0);
@@ -370,7 +358,7 @@ namespace bbtk
Factory::PackageMapType::const_iterator i;
for (i=M.begin();i!=M.end();++i)
{
- Package* P = i->second.mPackage;
+ Package::Pointer P = i->second;
wxString packname = std2wx(P->GetName());
if (packname==_T("user")) continue;
wxTreeMultiItem pack = mTree->AddRoot(packname,packname);
@@ -420,14 +408,14 @@ namespace bbtk
// WxGUICommand* com = new WxGUICommand(this,this);
// sizer->Add(com);
- SetSizer(sizer);
+ SetSizer(sizer);
+
+
+ // Creates the parent window of all bbtk windows as a child of this
+ Wx::CreateTopWindow(this);
+ // bbtkAddWxObserver(WxGUIConsole::OnWxSignal);
+
- // Creates and sets the parent window of all bbtk windows
- wxWindow* top = new wxPanel(this,-1);
- top->Hide();
-
- Wx::SetTopWindow(top);
-
SetAutoLayout(true);
Layout();
}
@@ -443,3 +431,4 @@ namespace bbtk
#endif //_USE_WXWIDGETS_
+*/