]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Tue, 13 Jan 2009 08:45:23 +0000 (08:45 +0000)
committerguigues <guigues>
Tue, 13 Jan 2009 08:45:23 +0000 (08:45 +0000)
kernel/appli/bbStudio/bbStudio.cxx
kernel/cmake/BBTKKernelConfig.cmake
kernel/src/bbtkExecuter.cxx
kernel/src/bbtkPackage.cxx
kernel/src/bbtkPackage.h
packages/kw/src/bbkwSlider.cxx

index 541d24a171de07b8082381362b25d9c19c570ee2..7e066269f562dabaa1dcd5f034d6bc522f48b1fd 100644 (file)
@@ -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;
 }
index ce75260c9dc7e3fd7eb9007fcecf09355ba73210..3813133db56985331f433d6a7feaebf35f0e7933 100644 (file)
@@ -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)
index 0a31ad8c537930adaaf3bda133ae6361ef068254..45d64739702f0574bc6369a280a79bae3e25c03e 100644 (file)
@@ -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);
          }
       }
index d705f36470a0ec35f83df3c04024fe936bbf6761..5f72953fa743ddc5492f287f296f5be8c2f7c1db 100644 (file)
@@ -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),
index 6abb711f63100b31bc7e7ca99d61b977c8de19c0..9a1c46a9e43b0fa42b8f99246598077d3d1e9c01 100644 (file)
@@ -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();                              \
index 8547f401678f494189d41a095ff42de888879589..04076817e562e7d89eec4a103ffa44c7957abd4c 100644 (file)
@@ -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"));    
   } 
   //--------------------------------------------------------------------------