X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIPackageBrowser2.cxx;h=bc5b5253bffcbc0d811f8e824bcaedc755544c4b;hb=899e84df04040566381e7252faa0b47d0863baca;hp=7fde9202edb143b53f2088bb449f33ec76bd1736;hpb=ca57bbfa3922d84e77fc9dd2d5e731f6f0fe0c9c;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx
index 7fde920..bc5b525 100644
--- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx
@@ -1,32 +1,39 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkWxGUIPackageBrowser2.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/10/11 06:30:33 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.27 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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
-*  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.
-* ------------------------------------------------------------------------ */
+
 
 /* \brief Short description in one line
  *
@@ -129,9 +136,9 @@ namespace bbtk
     if (GetColumnCount()!=3)
       {
 	InsertColumn( 0, _("Package"),
-		      wxLIST_FORMAT_LEFT, 60  );
+		      wxLIST_FORMAT_LEFT, 90  );
 	InsertColumn( 1, _("Box"),
-		      wxLIST_FORMAT_LEFT, 200 );
+		      wxLIST_FORMAT_LEFT, 150 );
 	InsertColumn( 2, _("Description"),
 		      wxLIST_FORMAT_LEFT, 500  );
       }
@@ -257,7 +264,9 @@ namespace bbtk
 		  BlackBoxDescriptor* d = (BlackBoxDescriptor*)(info.GetData());
 		  if (d!=0)
 		  {
-			  sendtext += crea::std2wx(d->GetFullTypeName());
+		      //DFGO -> To identify it is a box
+		      sendtext += crea::std2wx("box:");
+		      sendtext += crea::std2wx(d->GetFullTypeName());
 		  }
 	  }
 	  else
@@ -814,6 +823,8 @@ namespace bbtk
     mBoxList->SetUser(this);
     mBoxList->SetBackgroundColour(*wxWHITE);
 
+
+// JGRR & CM DISABLED CLOSE BUTTON
     m_mgr.AddPane(mBoxList,
 		  wxAuiPaneInfo().Name(wxT("BoxList"))
 		  .Caption(wxT("Black Boxes"))
@@ -821,19 +832,22 @@ namespace bbtk
 		  .MaximizeButton(true)
 		  .Center()
 		  .MinSize(wxSize(100,100))
+		  .CloseButton(false)
 		  );
     //    sizer->Add(mBoxList,5,wxGROW);
 
     mBoxInfo = new WxGUIBlackBoxInfo(this);
     //    sizer->Add(mBoxInfo,3,wxGROW);
 
+// JGRR & CM DISABLED CLOSE BUTTON
     m_mgr.AddPane(mBoxInfo,
 		  wxAuiPaneInfo().Name(wxT("Box"))
 		  .Caption(wxT(""))
 		  .MinimizeButton(true)
 		  .MaximizeButton(true)
 		  .Bottom()
-		  .MinSize(wxSize(100,300))
+		  .MinSize(wxSize(100,200))
+		  .CloseButton(false)
 		  );
 
     wxPanel* filters = new wxPanel(this,-1);
@@ -925,13 +939,16 @@ namespace bbtk
 
     filters->SetSizer(fsizer);
 
+// JGRR & CM DISABLED CLOSE BUTTON
     m_mgr.AddPane(filters,
 		  wxAuiPaneInfo().Name(wxT("Filter"))
 		  .Caption(wxT("Filter"))
 		  .MinimizeButton(true)
 		  .MaximizeButton(true)
-		  .Right()
-		  .MinSize(wxSize(100,100)) );
+		  .Left()
+		  .MinSize(wxSize(100,100)) 
+		  .CloseButton(false)
+);
 
     //    sizer->Add(fsizer,1,wxGROW);
     m_mgr.Update();