From: guigues <guigues>
Date: Tue, 13 Jan 2009 08:45:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.9.1~13
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;p=bbtk.git

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

diff --git a/kernel/appli/bbStudio/bbStudio.cxx b/kernel/appli/bbStudio/bbStudio.cxx
index 541d24a..7e06626 100644
--- a/kernel/appli/bbStudio/bbStudio.cxx
+++ b/kernel/appli/bbStudio/bbStudio.cxx
@@ -13,6 +13,7 @@ static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
   { wxCMD_LINE_PARAM,  NULL, NULL, _T("file1 [file2 [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
   { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("Prints this help") },
+  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"),   _T("Message all 9") },
   { wxCMD_LINE_NONE }
 };
 
@@ -55,6 +56,14 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 	      << std::endl;
     parser.Usage();
   }
+  else 
+  {
+	if ( parser.Found(_T("d")) )
+	{
+		bbtk::MessageManager::SetMessageLevel("all",9);
+	}
+  }
+
 
   return true;
 }
diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index ce75260..3813133 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -89,7 +89,8 @@ MESSAGE(STATUS "* BBTK_BBFY             =${BBTK_BBFY}")
 # from build tree root or install tree root
 # (different on win/lin)
 IF(WIN32)
-  SET(BBTK_SHARE_REL_PATH "/")
+  # A trick to install in root install dir (problem when empty path given)
+  SET(BBTK_SHARE_REL_PATH "bin/..")
   SET(BBTK_DOC_REL_PATH doc)
   SET(BBTK_BBS_REL_PATH bbs)
   SET(BBTK_DATA_REL_PATH data)
diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 0a31ad8..45d6473 100644
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/12 12:11:21 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2009/01/13 08:45:27 $
+  Version:   $Revision: 1.26 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -120,10 +120,7 @@ namespace bbtk
 
     // Create user package
     Package::Pointer p =
-      Package::New("user","internal",
-		   "User defined black boxes",
-		   "",
-		   BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+      Package::New("user","internal","User defined black boxes","");
     // Insert the user package in the factory
     GetFactory()->InsertPackage(p);
     // And in the list of open packages
@@ -170,11 +167,7 @@ namespace bbtk
       }
     catch (Exception e)
       {
-	p = Package::New(name,
-                         "",
-                         "",
-                         "",
-                         BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+	p = Package::New(name,"","","");
 	GetFactory()->InsertPackage(p);
       }
      mOpenPackage.push_back(p);
@@ -242,11 +235,7 @@ namespace bbtk
 	  }
 	catch (Exception e)
 	  {
-	    p = Package::New(pname,
-			     "",
-			     "",
-			     "",
-			     BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+	    p = Package::New(pname,"","","");
 	    GetFactory()->InsertPackage(p);
 	  }
       }
diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index d705f36..5f72953 100644
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:21:44 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2009/01/13 08:45:27 $
+  Version:   $Revision: 1.24 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -50,16 +50,14 @@ namespace bbtk
   Package::Pointer Package::New(const std::string& name,
 				const std::string& author,
 				const std::string& description,
-				const std::string& version,
-				const std::string& BBTKVersion) 
+				const std::string& version) 
   {
     bbtkDebugMessage("object",1,"##> Package::New('"<<name<<"',...)"
 		     <<bbtkendl);
     Package::Pointer p = MakePointer(new Package(name,
 					       author,
 					       description,
-					       version,
-					       BBTKVersion));
+					       version));
     bbtkDebugMessage("object",2,"<## Package::New('"<<name<<"',...)"
 		     <<bbtkendl);
     return p;
@@ -71,8 +69,7 @@ namespace bbtk
   Package::Package(const std::string& name,
 		   const std::string& author,
 		   const std::string& description,
-		   const std::string& version,
-		   const std::string& BBTKVersion) 
+		   const std::string& version) 
     :
     mDynamicLibraryHandler(0),
     mName(name),
diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h
index 6abb711..9a1c46a 100644
--- a/kernel/src/bbtkPackage.h
+++ b/kernel/src/bbtkPackage.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:14 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/01/13 08:45:27 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -58,8 +58,7 @@ namespace bbtk
     static Pointer New(const std::string& name,
 		       const std::string& author,
 		       const std::string& description,
-		       const std::string& version,
-		       const std::string& BBTKVersion);
+		       const std::string& version);
     /// Creates a package from a dynamic library
     static Pointer CreateFromDynamicLibrary(const std::string& libname,
 					    const std::string& pkgname,
@@ -128,7 +127,7 @@ namespace bbtk
     /// Returns the version of the package
     const std::string& GetVersion() const { return mVersion; }
 
-    bool ContainsBlackBox(const std::string& boxname) const;
+	bool ContainsBlackBox(const std::string& boxname) const;
 
  
     BlackBox::Pointer NewBlackBox(const std::string& type,
@@ -241,8 +240,7 @@ namespace bbtk
     Package(const std::string& name,
 	    const std::string& author,
 	    const std::string& description,
-	    const std::string& version,
-	    const std::string& BBTKVersion);
+	    const std::string& version);
     /// Does unload a package (no test)
     static void UnLoad(Package::WeakPointer p);
 
@@ -340,8 +338,7 @@ namespace bbtk
 	  bbtk::Package::New(#NAME,					\
 			     AUTHOR,					\
 			     DESCRIPTION,				\
-			     VERSION,					\
-			     BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)	\
+			     VERSION	\
 			     );						\
       bbtk::Object::InsertInPackageList( NAME ## GetPackagePointer() ); \
       return NAME ## GetPackagePointer();				\
diff --git a/packages/kw/src/bbkwSlider.cxx b/packages/kw/src/bbkwSlider.cxx
index 8547f40..0407681 100644
--- a/packages/kw/src/bbkwSlider.cxx
+++ b/packages/kw/src/bbkwSlider.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbkwSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/02 13:37:56 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/01/13 08:45:30 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -140,7 +140,7 @@ namespace bbkw
     bbSetOutputOut( scale->GetValue() );
     bbSetInputIn( scale->GetValue() );
     // and signal that the output has changed
-    bbSignalOutputModification("Out");    
+	bbSignalOutputModification(std::string("Out"));    
   } 
   //--------------------------------------------------------------------------