From: guigues <guigues>
Date: Mon, 17 Mar 2008 10:51:35 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~115
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8a15ae69662abfba701a970f9efee218e0b126d3;hp=029bec1fef526327df088b15771a4a4d84af7b0b;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index eb2e31f..1d8c302 100644
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/10 06:24:12 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/03/17 10:51:35 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -91,14 +91,18 @@ namespace bbtk
     std::string toolsappli_rel_path("/");
 //EED    toolsappli_rel_path +=  "toolsbbtk" + mFile_separator + "appli";
     toolsappli_rel_path +=  "toolsbbtk/appli";
-    mBbs_paths.push_back(mBbs_path + toolsappli_rel_path);
-
-	int iStrVec,sizeStrVec;
-
-	sizeStrVec = mBbs_paths.size();
-	for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
-		Utilities::replace( mBbs_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	}
+    //
+    //-----------------------------------------------------------
+    // LG : REMOVE BUGGY PATH WITH include *:
+    // 
+    //    mBbs_paths.push_back(mBbs_path + toolsappli_rel_path);
+    //-----------------------------------------------------------
+    int iStrVec,sizeStrVec;
+    
+    sizeStrVec = mBbs_paths.size();
+    for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+      Utilities::replace( mBbs_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+    }
 
     
     // always add "." (current working directory) at the begining
diff --git a/packages/toolsbbtk/bbs/appli/CreateBlackBox.bbs b/packages/toolsbbtk/bbs/appli/CreateBlackBox.bbs
index b763093..25d6c15 100644
--- a/packages/toolsbbtk/bbs/appli/CreateBlackBox.bbs
+++ b/packages/toolsbbtk/bbs/appli/CreateBlackBox.bbs
@@ -65,10 +65,19 @@ new LayoutLine layoutHor
   connect typeBlackbox.Widget layoutHor.Widget1
   connect formatBlackbox.Widget layoutHor.Widget2
 
+new CommandButton cancelButton
+    set cancelButton.In "quit"
+    set cancelButton.Label "Cancel"
+
 new CommandButton createButton
     set createButton.In "exec command; quit"
     set createButton.Label "Go"
 
+new LayoutLine buttons
+    set buttons.Orientation Horizontal
+    connect cancelButton.Widget buttons.Widget1
+    connect createButton.Widget buttons.Widget2
+
 new LayoutLine main
     connect windowTitle.Widget main.Widget1
     connect nameBlackbox.Widget main.Widget2
@@ -76,7 +85,7 @@ new LayoutLine main
     connect author.Widget main.Widget4
     connect description.Widget main.Widget5
     connect layoutHor.Widget main.Widget6
-    connect createButton.Widget main.Widget7
+    connect buttons.Widget main.Widget7
     set main.WinTitle "Create new black box"
     set main.WinDialog true
     set main.WinWidth 350 
diff --git a/packages/toolsbbtk/bbs/appli/CreatePackage.bbs b/packages/toolsbbtk/bbs/appli/CreatePackage.bbs
index ecd1cd6..d1e2608 100644
--- a/packages/toolsbbtk/bbs/appli/CreatePackage.bbs
+++ b/packages/toolsbbtk/bbs/appli/CreatePackage.bbs
@@ -23,16 +23,25 @@ new InputText description
     set description.Title "Description            (caracters   '<',  '>' not accepted...)"
     set description.In "_description_"
 
+new CommandButton cancelButton
+    set cancelButton.In "quit"
+    set cancelButton.Label "Cancel"
+
 new CommandButton createButton
     set createButton.In "exec command; quit"
     set createButton.Label "Go"
 
+new LayoutLine buttons
+    set buttons.Orientation Horizontal
+    connect cancelButton.Widget buttons.Widget1
+    connect createButton.Widget buttons.Widget2
+
 new LayoutLine main
     connect windowTitle.Widget main.Widget1
     connect name.Widget main.Widget2
     connect author.Widget main.Widget3
     connect description.Widget main.Widget4
-    connect createButton.Widget main.Widget5
+    connect buttons.Widget main.Widget5
     set main.WinTitle "Create new black box package"
     set main.WinDialog true
     set main.WinWidth 400