X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUICommand.cxx;h=2e37ec476a6922b11453d95112e2ef97f88feae8;hb=84454af9be8cecfbf41ca7c0198c65efe60f9b48;hp=929d07bd84853f9a39dc7d8fc629050999bc4e73;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUICommand.cxx b/kernel/src/bbtkWxGUICommand.cxx
index 929d07b..2e37ec4 100644
--- a/kernel/src/bbtkWxGUICommand.cxx
+++ b/kernel/src/bbtkWxGUICommand.cxx
@@ -1,20 +1,41 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkWxGUICommand.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:29 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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.9 $
+=========================================================================*/
+
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -35,6 +56,7 @@
 #include "bbtkWxGUICommand.h"
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
+#include "bbtkWxGUIPackageBrowser2.h" 
 
 namespace bbtk
 {
@@ -48,6 +70,7 @@ namespace bbtk
     EVT_BUTTON(WxGUICommand::ID_Btn_GraphS, WxGUICommand::OnBtnGraphS)
     EVT_BUTTON(WxGUICommand::ID_Btn_GraphD, WxGUICommand::OnBtnGraphD)
     EVT_BUTTON(WxGUICommand::ID_Btn_Help, WxGUICommand::OnBtnHelp)
+    EVT_BUTTON(WxGUICommand::ID_Btn_PackageBrowser, WxGUICommand::OnBtnPackageBrowser)
    END_EVENT_TABLE()
   //================================================================
 
@@ -78,27 +101,27 @@ namespace bbtk
     sizerCommand->Add(mwxTextCommand,1,wxGROW);
     sizerCommand->Add(btnGo);
     
-    sizer->Add(sizerCommand,0,wxLEFT | wxRIGHT | wxBOTTOM | wxGROW, 10 );
+    sizer->Add(sizerCommand,0,wxGROW);
 
     wxBoxSizer *btnsSizer	= new wxBoxSizer(wxHORIZONTAL);
     
-    wxButton *btnInclude  = new wxButton(this,ID_Btn_Include,_T("include")  );
-    wxButton *btnReset    = new wxButton(this,ID_Btn_Reset,_T("reset")    );
-    wxButton *btnConfig   = new wxButton(this,ID_Btn_Config,_T("config")   );
-    wxButton *btnGraphS   = new wxButton(this,ID_Btn_GraphS,
-					 _T("graph (simple)") );
-    wxButton *btnGraphD   = new wxButton(this,ID_Btn_GraphD,
-					 _T("graph (detailed)") );
-    wxButton *btnHelp     = new wxButton(this,ID_Btn_Help,_T("help")     );
+    wxButton *btnInclude		= new wxButton(this,ID_Btn_Include		,_T("include")			);
+    wxButton *btnReset			= new wxButton(this,ID_Btn_Reset		,_T("reset")			);
+    wxButton *btnConfig			= new wxButton(this,ID_Btn_Config		,_T("config")			);
+    wxButton *btnGraphS			= new wxButton(this,ID_Btn_GraphS		,_T("graph (simple)")	);
+    wxButton *btnGraphD			= new wxButton(this,ID_Btn_GraphD		,_T("graph (detailed)") );
+    wxButton *btnHelp			= new wxButton(this,ID_Btn_Help			,_T("help")				);
+    wxButton *btnPackageBrowser    = new wxButton(this,ID_Btn_PackageBrowser	,_T("Start Package Browser")     );
     
-    btnsSizer->Add( btnInclude 	);
+    btnsSizer->Add( btnInclude 		);
     btnsSizer->Add( btnReset 		);
     btnsSizer->Add( btnConfig		);
-    btnsSizer->Add( btnGraphS 	);
-    btnsSizer->Add( btnGraphD 	);
+    btnsSizer->Add( btnGraphS 		);
+    btnsSizer->Add( btnGraphD 		);
     btnsSizer->Add( btnHelp 		);
+    btnsSizer->Add( btnPackageBrowser 	);
     
-    sizer->Add(btnsSizer,0,wxLEFT | wxRIGHT | wxBOTTOM  | wxGROW, 10 );
+    sizer->Add(btnsSizer,0,wxTOP|wxGROW, 10 );
 
     SetSizer(sizer);
     
@@ -127,7 +150,7 @@ namespace bbtk
     if (command.length()==0) return;
 
     mwxTextCommand->SetValue(_T(""));
-    mwxTextCommand->Append(command);
+    mwxTextCommand->Append(std2wx(command));
     if (mUser) mUser->WxGUICommandEnter(command);
   }
 
@@ -147,7 +170,7 @@ namespace bbtk
        // std::string command(_T("include "));
        // std::string pathfilename = (const char *)(dialog.GetFilename().mb_str());
        std::string command("include ");
-       command += wx2std(dialog.GetPath());
+       command = command + "\"" + wx2std(dialog.GetPath()) + "\"";
        SendCommand(command);
      }
   }
@@ -181,6 +204,14 @@ namespace bbtk
     bbtkDebugMessage("gui",2,"WxGUICommand::OnBtnHelp"<<std::endl);
     SendCommand("help");
   }
+
+  void WxGUICommand::OnBtnPackageBrowser(wxCommandEvent& event)
+  {
+	wxBusyCursor wait;
+	WxGUIPackageBrowser2Window *helpbrowser = new
+	WxGUIPackageBrowser2Window(this,_T("Package Browser"), wxSize(600,600) );
+	helpbrowser->Show();
+  }
   
 } // namespace bbtk