*** empty log message ***

[bbtk.git] / kernel / src / bbtkFactory.cxx

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 5095c0e81b452368b4aca8f68f53464aa4cf40cc..bdcde1fc42f876b2e719346661c23895db8a103b 100644 (file)
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -4,8 +4,8 @@ Program:   bbtk
 Module:    $RCSfile: bbtkFactory.cxx,v $
 Language:  C++
 
-Date:      $Date: 2008/02/14 13:44:25 $
-Version:   $Revision: 1.21 $
+Date:      $Date: 2008/03/03 14:55:55 $
+Version:   $Revision: 1.25 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -261,8 +261,7 @@ namespace bbtk
   
 
   
-  void Factory::LoadPackage( const std::string& name,
-                             bool use_configuration_file)
+  void Factory::LoadPackage( const std::string& name )
   {
   // Note : in the following :
   // name : the user supplied name
@@ -275,8 +274,6 @@ namespace bbtk
 
     bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
     bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
-    bbtkMessage("Debug",1,"use_configuration_file ["
-                 << use_configuration_file << "]" << std::endl);
 
     std::vector<std::string> package_paths;
     std::string libname;  // full path library name
@@ -823,6 +820,7 @@ namespace bbtk
   //===================================================================
   void Factory::WriteDotFilePackagesList(FILE *ff)
   {
+
     bbtkDebugMessageInc("Kernel",9,"Factory::WriteDotFilePackagesList()"
                          <<std::endl);
 
@@ -848,6 +846,7 @@ namespace bbtk
 
  void Factory::ShowGraphTypes(const std::string& name) const
  {
+
    bool found = false;
    PackageMapType::const_iterator i;
    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -915,6 +914,16 @@ namespace bbtk
             ++j)
          {
            
+           // Skip adaptors 
+           if ( type==Adaptors )
+             {  
+               if (j->second->GetKind() == BlackBoxDescriptor::STANDARD )
+                 continue;
+             }
+           else 
+             if (j->second->GetKind() != BlackBoxDescriptor::STANDARD )
+               continue;
+
            std::vector<std::string> keys;
            if (type==Packages)
              {
@@ -923,7 +932,7 @@ namespace bbtk
                keys.push_back(k);
                title = "Boxes by package";
              }
-           else if (type==Initials)
+           else if ((type==Initials) || (type==Adaptors))
              {
                std::string init(" ");
                init[0] =  std::toupper(j->second->GetTypeName()[0]);
@@ -940,6 +949,7 @@ namespace bbtk
                  keys.push_back(" NONE");
                title = "Boxes by category";
              }
+    
            
            std::vector<std::string>::const_iterator k;
            for (k=keys.begin(); k!=keys.end(); ++k )
@@ -1016,6 +1026,11 @@ namespace bbtk
            s << "<a name=\""<<ii->first<<"\"></a>\n"; 
            s << "<p><a href=\""<<ii->first<<"/index.html\">"
              << ii->first<<"</a>\n"; 
+
+           s << "&nbsp;&nbsp;-&nbsp;&nbsp;\n"; 
+
+           s << "<a name=\"doxygen\"></a>\n"; 
+           s << "<a href=..\\doxygen\\" << ii->first << "/main.html>(Doxygen documentation of the source)</a>\n"; 
          }
        else 
          {