Fixed Window deletion mechanism

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

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index ad64151ba1696592f5611f2095d42125f86b6155..288beb46c62c12daec54f2d9108b16175ef5974b 100644 (file)
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 15:22:51 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2009/05/28 08:12:05 $
+  Version:   $Revision: 1.43 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -58,7 +58,7 @@ namespace bbtk
   /// Default ctor
   Factory::Pointer Factory::New()
   {
-    bbtkDebugMessage("Kernel",9,"Factory::New()"<<std::endl);
+    bbtkDebugMessage("kernel",9,"Factory::New()"<<std::endl);
     return MakePointer(new Factory());
   }
   //===================================================================
@@ -68,7 +68,7 @@ namespace bbtk
   Factory::Factory()
     : mExecuter()
   {
-    bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
+    bbtkDebugMessage("kernel",7,"Factory()"<<std::endl);
   }
   //===================================================================
 
@@ -76,9 +76,9 @@ namespace bbtk
   /// Dtor
   Factory::~Factory()
   {
-    bbtkDebugMessageInc("Kernel",7,"Factory::~Factory()"<<std::endl);
+    bbtkDebugMessage("kernel",7,"==> ~Factory()"<<std::endl);
     CloseAllPackages();
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugMessage("kernel",7,"<== ~Factory()"<<std::endl);
   }
   //===================================================================
 
@@ -87,9 +87,9 @@ namespace bbtk
   //===================================================================
   void Factory::Reset()
   {
-    bbtkDebugMessageInc("Kernel",7,"Factory::Reset()"<<std::endl);
+    bbtkDebugMessage("kernel",7,"==> Factory::Reset()"<<std::endl);
     CloseAllPackages();
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugMessage("kernel",7,"<== Factory::Reset()"<<std::endl);
   }
   //===================================================================
 
@@ -106,13 +106,13 @@ namespace bbtk
     if (p!=0)
       {
        //===================================================================
-       bbtkMessage("Output",2,p->GetName()<<" "
+       bbtkMessage("output",2,p->GetName()<<" "
                    <<p->GetVersion()
                    <<" "
                    <<p->GetAuthor() << " Category(s) :"
                    <<p->GetCategory()
                    <<std::endl);
-       bbtkMessage("Output",2,p->GetDescription()<<std::endl);
+       bbtkMessage("output",2,p->GetDescription()<<std::endl);
        //===================================================================
        p->AddFactory(GetThisPointer<Factory>());
        mPackageMap[pkgname] = p;
@@ -149,7 +149,7 @@ namespace bbtk
   //
   // lastname : string before the last / (if any), or user supplied name
 
-    bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+    bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
     bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
 
     std::vector<std::string> package_paths;
@@ -167,7 +167,7 @@ namespace bbtk
     iUnload = mPackageMap.find(pkgname);
     if (iUnload != mPackageMap.end())
     {
-      bbtkMessage("Output",2,"["<< pkgname <<"] already loaded" << std::endl);
+      bbtkMessage("output",2,"["<< pkgname <<"] already loaded" << std::endl);
       return;
     }
 
@@ -208,7 +208,7 @@ namespace bbtk
           // The following is *NOT* a debug time message :
           // It's a user intended message.
           // Please don't remove it.
-           bbtkMessage("Output",3,"   [" <<libname 
+           bbtkMessage("output",3,"   [" <<libname 
                        <<"] : doesn't exist" <<std::endl);
           }
           else
@@ -252,7 +252,7 @@ namespace bbtk
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
-          bbtkMessage("Output",3,
+          bbtkMessage("output",3,
                      "   [" <<libname <<"] : doesn't exist" <<std::endl);
            continue;  // try next path
         }
@@ -294,7 +294,7 @@ namespace bbtk
 #endif
       }
     }
-    bbtkMessage("Output",2,"[" << libname << "] loaded" << std::endl);
+    bbtkMessage("output",2,"[" << libname << "] loaded" << std::endl);
 
   }
 
@@ -305,7 +305,7 @@ namespace bbtk
   /// If the entry is found in the map, calls ClosePackage
  void Factory::UnLoadPackage( const std::string& name )
  {
-    bbtkDebugMessageInc("Kernel",7,"Factory::UnLoadPackage(\""
+    bbtkDebugMessageInc("kernel",7,"Factory::UnLoadPackage(\""
                        <<name<<"\")"<<std::endl);
   
     PackageMapType::iterator i;
@@ -316,7 +316,7 @@ namespace bbtk
                 <<"\" : package not loaded !");
     }
     ClosePackage(i);
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
   }
   //===================================================================
 
@@ -324,7 +324,7 @@ namespace bbtk
   //===================================================================
   void Factory::CloseAllPackages()
   {
-    bbtkDebugMessageInc("Kernel",7,"Factory::CloseAllPackages()"<<std::endl);
+    bbtkDebugMessageInc("kernel",7,"Factory::CloseAllPackages()"<<std::endl);
     
     std::vector< Package::WeakPointer > mAlive;  
     do {
@@ -342,7 +342,7 @@ namespace bbtk
          // If not dead : reinsert
          if (i->lock())
            {
-             bbtkDebugMessage("Kernel",7,"Package "<<i->lock()->GetName()
+             bbtkDebugMessage("kernel",7,"Package "<<i->lock()->GetName()
                               <<" still alive"<<std::endl);
              // InsertPackage(i->lock());
            }
@@ -350,7 +350,7 @@ namespace bbtk
     }
     while (mPackageMap.size()>0);
 
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
   }
   //===================================================================
 
@@ -368,7 +368,7 @@ namespace bbtk
  /// Finally erases the package entry in the packages map
  void Factory::ClosePackage(PackageMapType::iterator& i) 
   {   
-     bbtkDebugMessageInc("Kernel",7,"Factory::ClosePackage(\""
+     bbtkDebugMessageInc("kernel",7,"Factory::ClosePackage(\""
                          <<i->second->GetName()
                         <<"\")"<<std::endl);
 
@@ -383,7 +383,7 @@ namespace bbtk
        {
         Package::Release(p);
        }
-     bbtkDebugDecTab("Kernel",7);
+     bbtkDebugDecTab("kernel",7);
   }
   //===================================================================
   
@@ -393,7 +393,7 @@ namespace bbtk
   /// Displays the list of packages loaded
   void Factory::PrintPackages(bool details, bool adaptors) const
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::PrintPackages"<<std::endl);
+    bbtkDebugMessageInc("kernel",9,"Factory::PrintPackages"<<std::endl);
 
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -404,7 +404,7 @@ namespace bbtk
       }
     }
 
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
 
@@ -412,7 +412,7 @@ namespace bbtk
   /// Displays help on a package
   void Factory::HelpPackage(const std::string& name, bool adaptors) const
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::HelpPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("kernel",9,"Factory::HelpPackage(\""<<name<<"\")"
                         <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
@@ -445,11 +445,11 @@ namespace bbtk
       }
     else 
       {
-      bbtkDebugDecTab("Kernel",9);
+      bbtkDebugDecTab("kernel",9);
       bbtkError("package \""<<name<<"\" unknown");
       }
     
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
 
@@ -460,7 +460,7 @@ namespace bbtk
                             std::string& package,
                             bool full) const
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::HelpBlackBox(\""<<name<<"\")"
+    bbtkDebugMessageInc("kernel",9,"Factory::HelpBlackBox(\""<<name<<"\")"
                         <<std::endl);
 
     bool found = false;
@@ -475,7 +475,7 @@ namespace bbtk
         }
       }
     
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
     if (!found) 
       {
       bbtkError("No package of the factory contains any black box <"
@@ -489,13 +489,13 @@ namespace bbtk
   /// Inserts a package in the factory
   void Factory::InsertPackage( Package::Pointer p )
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<<
+    bbtkDebugMessageInc("kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
     p->AddFactory(GetThisPointer<Factory>());
     mPackageMap[p->GetName()] = p;
 
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
   
@@ -503,7 +503,7 @@ namespace bbtk
   /// Removes a package from the factory (and deletes it)
   void Factory::RemovePackage( Package::Pointer p )
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::RemovePackage(\""<<
+    bbtkDebugMessageInc("kernel",9,"Factory::RemovePackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
     PackageMapType::iterator i;
@@ -522,7 +522,7 @@ namespace bbtk
                  p->GetName()<<"\") : package absent from factory");
       }
 
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
   
@@ -532,7 +532,7 @@ namespace bbtk
   BlackBox::Pointer Factory::NewBlackBox(const std::string& type, 
                                  const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",7,"Factory::NewBlackBox(\""
+    bbtkDebugMessageInc("kernel",7,"Factory::NewBlackBox(\""
                         <<type<<"\",\""<<name<<"\")"<<std::endl);
 
     BlackBox::Pointer b; 
@@ -547,7 +547,7 @@ namespace bbtk
        bbtkError("black box type \""<<type<<"\" unknown");
       } 
 
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
     return b;
   }
   //===================================================================
@@ -558,7 +558,7 @@ namespace bbtk
                                const DataInfo& typeout,
                                const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor("
+    bbtkDebugMessageInc("kernel",8,"Factory::NewAdaptor("
                         <<typein<<","
                         <<typeout<<",\""
                         <<name<<"\")"<<bbtkendl);
@@ -577,7 +577,7 @@ namespace bbtk
                  <<" adaptor available");
       } 
     
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
     return b; 
   }
   //===================================================================
@@ -589,7 +589,7 @@ namespace bbtk
                                      const DataInfo& typeout,
                                      const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Factory::NewWidgetAdaptor(<"
+    bbtkDebugMessageInc("kernel",8,"Factory::NewWidgetAdaptor(<"
                         <<typein<<">,<"
                         <<typeout<<">,\""
                         <<name<<"\")"<<bbtkendl);
@@ -610,7 +610,7 @@ namespace bbtk
                  <<"> widget adaptor available");
       } 
     
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
     return b; 
   }
   //===================================================================
@@ -621,7 +621,7 @@ namespace bbtk
                                  const DataInfo& typeout,
                                  std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Factory::FindAdaptor(<"
+    bbtkDebugMessageInc("kernel",8,"Factory::FindAdaptor(<"
                         <<typein<<">,<"
                         <<typeout<<">)"<<bbtkendl);
     
@@ -642,7 +642,7 @@ namespace bbtk
       } 
     */
 
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
     return b; 
   }
   //===================================================================
@@ -653,7 +653,7 @@ namespace bbtk
                                  const DataInfo& typeout,
                                  std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<"
+    bbtkDebugMessageInc("kernel",8,"Factory::FindWidgetAdaptor(<"
                         <<typein<<">,<"
                         <<typeout<<">)"<<bbtkendl);
     
@@ -666,7 +666,7 @@ namespace bbtk
                                                  adaptor);
        if (b) break; 
       }
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
     return b; 
   }
   //===================================================================
@@ -678,7 +678,7 @@ namespace bbtk
                                  std::string& widget,
                                  std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<"
+    bbtkDebugMessageInc("kernel",8,"Factory::FindWidgetAdaptor(<"
                         <<typein<<">,<"
                         <<typeout<<">)"<<bbtkendl);
     
@@ -695,7 +695,7 @@ namespace bbtk
     if (!b) 
       {
        // Look for a widget adaptor with good nature out
-       bbtkMessage("Kernel",5,
+       bbtkMessage("kernel",5,
                    "*** Looking for a two pieces widget adaptor for : "
                    << typein << "->"<<typeout<<std::endl);
        for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -712,7 +712,7 @@ namespace bbtk
                     )
                  {
                    widget = j->second.lock()->GetTypeName();
-                   bbtkMessage("Kernel",5,
+                   bbtkMessage("kernel",5,
                                "===> Found first part : "<<widget
                                << " "<<j->first.mTypeIn<<"->"
                                <<j->first.mTypeOut<<std::endl);
@@ -721,14 +721,14 @@ namespace bbtk
                    b = FindAdaptor( ti, to, adaptor );
                    if (b) 
                      {
-                       bbtkMessage("Kernel",5,
+                       bbtkMessage("kernel",5,
                                    "===> Found second part : "<<adaptor
                                    <<std::endl);
                        break;
                      }
                    else
                      {
-                       bbtkMessage("Kernel",5,
+                       bbtkMessage("kernel",5,
                                    "===> No second part found"<<std::endl);
                      }
                  }
@@ -736,7 +736,7 @@ namespace bbtk
            if (b) break;
          }
       }
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugDecTab("kernel",7);
     return b; 
   }
   //===================================================================
@@ -748,7 +748,7 @@ namespace bbtk
                                             BlackBox::Pointer to,
                                             const std::string& input) const
   {
-    bbtkDebugMessage("Kernel",7,"Factory::NewConnection(\""
+    bbtkDebugMessage("kernel",7,"Factory::NewConnection(\""
                       <<from->bbGetName()<<"\",\""<<output<<"\",\""
                       <<to->bbGetName()<<"\",\""<<input
                       <<"\")"<<std::endl);
@@ -763,22 +763,22 @@ namespace bbtk
   //===================================================================
   Package::Pointer Factory::GetPackage(const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("kernel",9,"Factory::GetPackage(\""<<name<<"\")"
                          <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
     {
-      bbtkDebugDecTab("Kernel",9); 
+      bbtkDebugDecTab("kernel",9); 
       return i->second;
     }
     else 
     {
-       bbtkDebugDecTab("Kernel",9);
+       bbtkDebugDecTab("kernel",9);
        bbtkError("package \""<<name<<"\" unknown");
     }
     
-    bbtkDebugDecTab("Kernel",9);  
+    bbtkDebugDecTab("kernel",9);  
   }
   //===================================================================
   
@@ -802,7 +802,7 @@ namespace bbtk
   void Factory::WriteDotFilePackagesList(FILE *ff)
   {
 
-    bbtkDebugMessageInc("Kernel",9,"Factory::WriteDotFilePackagesList()"
+    bbtkDebugMessageInc("kernel",9,"Factory::WriteDotFilePackagesList()"
                          <<std::endl);
 
     fprintf( ff , "\n");
@@ -820,7 +820,7 @@ namespace bbtk
        fprintf(ff,"  %s [shape=ellipse, URL=\"%s\"]%s\n",i->first.c_str(),url.c_str(),";" );
     }
     fprintf( ff , "}\n\n");
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
 
@@ -862,7 +862,7 @@ namespace bbtk
      }
    }
     
-   bbtkDebugDecTab("Kernel",9);
+   bbtkDebugDecTab("kernel",9);
    if (!found) 
    {
       bbtkError("No package of the factory contains any black box <"
@@ -876,7 +876,7 @@ namespace bbtk
   void Factory::CreateHtmlIndex(IndexEntryType type, 
                                const std::string& filename)
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::CreateHtmlIndex(\""
+    bbtkDebugMessageInc("kernel",9,"Factory::CreateHtmlIndex(\""
                        <<filename<<"\")"<<bbtkendl);
     
     std::string title;
@@ -1062,7 +1062,7 @@ namespace bbtk
     //----------------------
 
     // End
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
 
  //==========================================================================