Qt black boxes updated

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 795d8d490e6ac45e6425f081e6308d37108782ec..316f8cb8142a711f57eed716f3e2486b00a17b82 100644 (file)
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:05 $
-  Version:   $Revision: 1.46 $
+  Date:      $Date: 2009/05/28 14:22:09 $
+  Version:   $Revision: 1.47 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -1337,28 +1337,28 @@ namespace bbtk
      
     if (this->bbGetDescriptor()->GetPackage()) 
       {
-       bbtkBlackBoxMessage("Help",1,"Black Box '"<<bbGetName()<<"' <"<<
+       bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
                    this->bbGetDescriptor()->GetPackage()->GetName()
                    <<"::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
       }
     else 
       {
-       bbtkBlackBoxMessage("Help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
+       bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
       }
     /*
     if (bbIsUpToDate())
       {
-       bbtkBlackBoxMessage("Help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
+       bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
                    <<mMinOutputChangeTime<<"]"<<std::endl);
       }
     else 
       {
-       bbtkBlackBoxMessage("Help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
+       bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
                    <<mMinOutputChangeTime<<"]"<<std::endl);
       }
     */
-    //    bbtkBlackBoxMessage("Help",1," "<<GetDescription()<<std::endl);
-    //    bbtkBlackBoxMessage("Help",1," By : "<<GetAuthor()<<std::endl);
+    //    bbtkBlackBoxMessage("help",1," "<<GetDescription()<<std::endl);
+    //    bbtkBlackBoxMessage("help",1," By : "<<GetAuthor()<<std::endl);
 
     std::vector<std::string> iname;
     std::vector<std::string> ivalue;
@@ -1413,9 +1413,9 @@ namespace bbtk
       }
 
     if (iname.size()) 
-      bbtkBlackBoxMessage("Help",1," * Inputs : "<<std::endl);
+      bbtkBlackBoxMessage("help",1," * Inputs : "<<std::endl);
     else 
-      bbtkBlackBoxMessage("Help",1," * No inputs"<<std::endl);
+      bbtkBlackBoxMessage("help",1," * No inputs"<<std::endl);
 
     std::vector<std::string>::iterator i1,i2,i3,i4;
     for (i1=iname.begin(),i2=ivalue.begin(),i3=iconn.begin(),i4=istatus.begin();
@@ -1429,17 +1429,17 @@ namespace bbtk
        value += "'";
        value.append(1+valuelmax-value.size(),' ');
        if (i3->size()) 
-         bbtkBlackBoxMessage("Help",1,"    '"<<name<<" = '"<<value<<" <-- '"
+         bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value<<" <-- '"
                      <<*i3<<"'");
        else 
-         bbtkBlackBoxMessage("Help",1,"    '"<<name<<" = '"<<value);
-       bbtkBlackBoxMessage("Help",1," ["<<*i4<<"]"<<std::endl);
+         bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
+       bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
       }
 
     if (oname.size()) 
-      bbtkBlackBoxMessage("Help",1," * Outputs : "<<std::endl);
+      bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
     else 
-      bbtkBlackBoxMessage("Help",1," * No outputs"<<std::endl);
+      bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
 
     std::vector<std::vector<std::string> >::iterator i5;
 
@@ -1454,17 +1454,17 @@ namespace bbtk
        value += "'";
        value.append(1+valuelmax-value.size(),' ');
        if (!(*i5).size())
-         bbtkBlackBoxMessage("Help",1,"    '"<<name<<" = '"<<value);
+         bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
        else 
          {
            std::string pref = "    '"+name+" = '"+value;
            for (i3=i5->begin();i3!=i5->end();++i3)
              {
-               bbtkBlackBoxMessage("Help",1,pref<<" --> '"<<*i3<<"'");
+               bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
                pref.replace(0,pref.size(),pref.size(),' ');
              }
          }
-       bbtkBlackBoxMessage("Help",1," ["<<*i4<<"]"<<std::endl);
+       bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
       }
 
    }

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 45f39dc9732e18e89dbbd539b4adf0a6bf5db538..c163a5b6a9907cad8cc9b58ec30403648be0ceed 100644 (file)
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/24 13:42:59 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.31 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -116,11 +116,11 @@ namespace bbtk
                        INVALID_FILE_SEPARATOR,
                        VALID_FILE_SEPARATOR);
     
-    bbtkMessage("Config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
-    bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
-    bbtkMessage("Config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
-    bbtkMessage("Config",1," ==> bbs    : '"<<mBbs_path<<"'"<<std::endl);
-    bbtkMessage("Config",1," ==> data   : '"<<mData_path<<"'"<<std::endl);
+    bbtkMessage("config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
+    bbtkMessage("config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
+    bbtkMessage("config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
+    bbtkMessage("config",1," ==> bbs    : '"<<mBbs_path<<"'"<<std::endl);
+    bbtkMessage("config",1," ==> data   : '"<<mData_path<<"'"<<std::endl);
 
 
 
@@ -192,7 +192,7 @@ namespace bbtk
     
     if ( Utilities::FileExists( configXmlFullPathName ))
       {
-       bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << 
+       bbtkMessage("config",1, "ConfigurationFile : [" << configXmlFullPathName << 
                    "] found in current directory" << std::endl); 
        //Read(configXmlFullPathName.c_str());
        // traiter le fichier local     
@@ -240,7 +240,7 @@ namespace bbtk
     std::string filename = Utilities::MakeUserSettingsFullFileName("doc/help_contents.html");
     if (!Utilities::FileExists(filename))
       {
-       bbtkDebugMessage("Config",1, 
+       bbtkDebugMessage("config",1, 
                         "* Creating [" << filename << "]" << std::endl);
        // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
        std::string doc_path = mInstall_path + "/" 
@@ -297,7 +297,7 @@ namespace bbtk
     FILE *fp;
     char configXml[250];
     sprintf (configXml , "%s/bbtk_config.xml", rootDirectory);
-    bbtkDebugMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl);
+    bbtkDebugMessage("config",1, "in CreateConfigXML[" << configXml << "]" << std::endl);
     fp = fopen (configXml, "w");
     fprintf(fp, "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n");
     fprintf(fp, "<config>\n");
@@ -410,7 +410,7 @@ namespace bbtk
     sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory );
     
     int attribs = GetFileAttributes (rootDirectory);
-    bbtkMessage("Config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl);
+    bbtkMessage("config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl);
     if ( attribs != 0xFFFFFFFF)
       {
        if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check !
@@ -446,7 +446,7 @@ namespace bbtk
   void ConfigurationFile::Read(const std::string& filename)
   {
     
-    bbtkDebugMessage("Config",1,"ConfigurationFile::Read(" <<filename << ")" << std::endl);
+    bbtkDebugMessage("config",1,"ConfigurationFile::Read(" <<filename << ")" << std::endl);
     
     mConfig_xml_full_path = filename;
     XMLResults* res = new XMLResults;
@@ -456,12 +456,12 @@ namespace bbtk
       {
        std::string mess = GetErrorMessage(res,filename);
        delete res;
-       bbtkDebugMessage("Config",1,mess<< std::endl);
+       bbtkDebugMessage("config",1,mess<< std::endl);
        bbtkError(mess);
       }
     delete res;
     
-    bbtkDebugMessage("Config",1,"OK" << std::endl);
+    bbtkDebugMessage("config",1,"OK" << std::endl);
   
     int i,j;
     
@@ -522,7 +522,7 @@ namespace bbtk
   //=========================================================================
   bool ConfigurationFile::AddPackagePathsAndWrite( const std::string& path )
   {
-    bbtkDebugMessageInc("Config",9,
+    bbtkDebugMessageInc("config",9,
                        "ConfigurationFile::AddPackagePathsAndWrite("
                        <<path<<")"<<std::endl);
     
@@ -535,7 +535,7 @@ namespace bbtk
       {
        std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
        delete res;
-       bbtkDebugMessage("Config",1,mess<< std::endl);
+       bbtkDebugMessage("config",1,mess<< std::endl);
        bbtkError(mess);
       }
    delete res;
@@ -583,7 +583,7 @@ namespace bbtk
     if ( err != eXMLErrorNone ) 
       {
        std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
-       bbtkDebugMessage("Config",1,mess<< std::endl);
+       bbtkDebugMessage("config",1,mess<< std::endl);
        bbtkError(mess);
       }
 
@@ -594,7 +594,7 @@ namespace bbtk
   //=========================================================================
   void ConfigurationFile::GetHelp(int level) const
   {
-    bbtkDebugMessageInc("Config",9,"ConfigurationFile::GetHelp("<<level
+    bbtkDebugMessageInc("config",9,"ConfigurationFile::GetHelp("<<level
                        <<")"<<std::endl);
     
     const std::string config_xml_full_path      = Get_config_xml_full_path();    
@@ -606,30 +606,30 @@ namespace bbtk
     const std::vector<std::string>bbs_paths     = Get_bbs_paths();
     const std::vector<std::string>package_paths = Get_package_paths();
     
-    bbtkMessage("Help",level, "============="   << std::endl);           
-    bbtkMessage("Help",level, "Configuration"   << std::endl);
-    bbtkMessage("Help",level, "============="   << std::endl);
-    bbtkMessage("Help",level, "bbtk_config.xml    : [" << config_xml_full_path  << "]" << std::endl); 
-    bbtkMessage("Help",level, "Documentation Path : [" << url             << "]" << std::endl);
-    bbtkMessage("Help",level, "Data Path          : [" << data_path       << "]" << std::endl);
-    bbtkMessage("Help",level, "Temp Directory     : [" << default_temp_dir << "]" << std::endl);
-    bbtkMessage("Help",level, "File Separator     : [" << file_separator  << "]" << std::endl);
+    bbtkMessage("help",level, "============="   << std::endl);           
+    bbtkMessage("help",level, "Configuration"   << std::endl);
+    bbtkMessage("help",level, "============="   << std::endl);
+    bbtkMessage("help",level, "bbtk_config.xml    : [" << config_xml_full_path  << "]" << std::endl); 
+    bbtkMessage("help",level, "Documentation Path : [" << url             << "]" << std::endl);
+    bbtkMessage("help",level, "Data Path          : [" << data_path       << "]" << std::endl);
+    bbtkMessage("help",level, "Temp Directory     : [" << default_temp_dir << "]" << std::endl);
+    bbtkMessage("help",level, "File Separator     : [" << file_separator  << "]" << std::endl);
 
     std::vector<std::string>::const_iterator i;
            
-    bbtkMessage("Help",level, "BBS Paths   " << std::endl);     
+    bbtkMessage("help",level, "BBS Paths   " << std::endl);     
     for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i )
     {
-      bbtkMessage("Help",level,"--- ["<<*i<<"]"<<std::endl);
+      bbtkMessage("help",level,"--- ["<<*i<<"]"<<std::endl);
     }    
     
-    bbtkMessage("Help",level, "PACKAGE Paths : " << std::endl);     
+    bbtkMessage("help",level, "PACKAGE Paths : " << std::endl);     
     for (i = package_paths.begin(); i!=package_paths.end(); ++i )
     {
-      bbtkMessage("Help",level,"--- ["<<*i<<"]"<<std::endl);
+      bbtkMessage("help",level,"--- ["<<*i<<"]"<<std::endl);
     }
 
-    bbtkDebugDecTab("Config",9);
+    bbtkDebugDecTab("config",9);
   }
   //=========================================================================
 

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 288beb46c62c12daec54f2d9108b16175ef5974b..bd057e349e8aeaa24c19f58d148fe078074bd8b7 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/05/28 08:12:05 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.44 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -398,7 +398,7 @@ namespace bbtk
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
     {
-      bbtkMessage("Help",1, i->first << std::endl);
+      bbtkMessage("help",1, i->first << std::endl);
       if (details) {
          i->second->PrintBlackBoxes(false,adaptors);
       }
@@ -418,30 +418,30 @@ namespace bbtk
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
       {
-      bbtkMessage("Help",1, "Package "<<i->first<<" ");
+      bbtkMessage("help",1, "Package "<<i->first<<" ");
       
       if (i->second->GetVersion().length()>0)
-        bbtkMessageCont("Help",1,"v" <<i->second->GetVersion());
+        bbtkMessageCont("help",1,"v" <<i->second->GetVersion());
         
       if (i->second->GetAuthor().length()>0)
-        bbtkMessageCont("Help",1,"- "<<i->second->GetAuthor());
+        bbtkMessageCont("help",1,"- "<<i->second->GetAuthor());
         
       if (i->second->GetCategory().length()>0)
-        bbtkMessageCont("Help",1,"- "<<i->second->GetCategory());        
+        bbtkMessageCont("help",1,"- "<<i->second->GetCategory());        
         
-      bbtkMessageCont("Help",1,std::endl);
-      bbtkIncTab("Help",1);
-      bbtkMessage("Help",1,i->second->GetDescription()<<std::endl);
+      bbtkMessageCont("help",1,std::endl);
+      bbtkIncTab("help",1);
+      bbtkMessage("help",1,i->second->GetDescription()<<std::endl);
       if (i->second->GetNumberOfBlackBoxes()>0) 
         {
-          bbtkMessage("Help",1, "Black boxes : "<<std::endl);
+          bbtkMessage("help",1, "Black boxes : "<<std::endl);
           i->second->PrintBlackBoxes(true,adaptors);
         }
       else 
         {
-          bbtkMessage("Help",1, "No black boxes"<<std::endl);
+          bbtkMessage("help",1, "No black boxes"<<std::endl);
         }
-      bbtkDecTab("Help",1);
+      bbtkDecTab("help",1);
       }
     else 
       {

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 2a1fc8d3772fdf05e8f6aa4c535c05eb6a6e9ddb..ebd5ddf7ad1ae4112d8a70b396b96544faeb3bc0 100644 (file)
--- 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: 2009/05/28 12:18:51 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.29 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -687,16 +687,16 @@ namespace bbtk
   BlackBox::Pointer Package::NewBlackBox(const std::string& type, 
                                         const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::NewBlackBox(\""<<type<<"\",\""<<name<<"\")"<<bbtkendl);
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<">::NewBlackBox(\""<<type<<"\",\""<<name<<"\")"<<bbtkendl);
     
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(type);
     if (i == mBlackBoxMap.end())  
     {
-          bbtkDebugDecTab("Kernel",8);
+          bbtkDebugDecTab("kernel",8);
           return BlackBox::Pointer();
     }
     BlackBox::Pointer bb =i->second->NewBlackBox(name);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return bb;   
 
   }
@@ -711,7 +711,7 @@ namespace bbtk
                                const DataInfo& typeout,
                                const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
                        ">::NewAdaptor("
                        <<typein<<","
                        <<typeout<<",\""
@@ -722,11 +722,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-       bbtkDebugDecTab("Kernel",8);
+       bbtkDebugDecTab("kernel",8);
        return BlackBox::Pointer();
       }
     BlackBox::Pointer bb =i->second.lock()->NewBlackBox(name);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return bb;   
 
   }
@@ -739,7 +739,7 @@ namespace bbtk
                                      const DataInfo& typeout,
                                      const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
                        ">::NewWidgetAdaptor("
                        <<typein<<","
                        <<typeout<<",\""
@@ -750,11 +750,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-       bbtkDebugDecTab("Kernel",8);
+       bbtkDebugDecTab("kernel",8);
        return BlackBox::Pointer();
       }
     BlackBox::Pointer bb =i->second.lock()->NewBlackBox(name);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return bb;   
 
   }
@@ -771,7 +771,7 @@ namespace bbtk
                                  const DataInfo& typeout,
                                  std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
                        ">::FindWidgetAdaptor("
                        <<typein<<","
                        <<typeout<<")"<<bbtkendl);
@@ -784,11 +784,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-       bbtkDebugDecTab("Kernel",8);
+       bbtkDebugDecTab("kernel",8);
        return false;
       }
     adaptor = i->second.lock()->GetTypeName();
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return true;   
 
   }
@@ -805,7 +805,7 @@ namespace bbtk
                            const DataInfo& typeout,
                            std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
                        ">::FindAdaptor("
                        <<typein<<","
                        <<typeout<<")"<<bbtkendl);
@@ -815,11 +815,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-       bbtkDebugDecTab("Kernel",8);
+       bbtkDebugDecTab("kernel",8);
        return false;
       }
     adaptor = i->second.lock()->GetTypeName();
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return true;   
 
   }
@@ -830,7 +830,7 @@ namespace bbtk
   /// Registers a black box descriptor in the package
   bool Package::RegisterBlackBox(BlackBoxDescriptor::Pointer d) 
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\")"<<std::endl);
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\")"<<std::endl);
     
     BlackBoxMapType::iterator i = mBlackBoxMap.find(d->GetTypeName());
     if (i!=mBlackBoxMap.end())
@@ -847,7 +847,7 @@ namespace bbtk
     // If it is a default adaptor, also register it in the adaptors map
     if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_ADAPTOR )
       {
-       bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<<std::endl);   
+       bbtkDebugMessage("kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<<std::endl);   
        
        TypeInfo typein = d->GetInputDescriptor("In")->GetTypeInfo();
        TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo();
@@ -877,7 +877,7 @@ namespace bbtk
     // If it is a default adaptor, also register it in the adaptors map
     else if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_GUI)
       {
-       bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<<std::endl);   
+       bbtkDebugMessage("kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<<std::endl);   
        
        TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo();
        DataInfo infoin(typeid(void),"");
@@ -905,7 +905,7 @@ namespace bbtk
       }
     
 
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
    
     return true;
   }
@@ -933,12 +933,12 @@ namespace bbtk
   /// Changes the name of a black box type
   void Package::ChangeBlackBoxName( const std::string& oldname, const std::string& newname )
   { 
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::ChangeBlackBoxName(\""<<oldname<<"\",\""<<newname<<"\")"<<std::endl);
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<">::ChangeBlackBoxName(\""<<oldname<<"\",\""<<newname<<"\")"<<std::endl);
     // Looking into the bb map
     BlackBoxMapType::iterator i = mBlackBoxMap.find(oldname);
     if (i == mBlackBoxMap.end())  
       {
-         bbtkDebugDecTab("Kernel",8);
+         bbtkDebugDecTab("kernel",8);
          bbtkError("ChangeBlackBoxName : The package <"<<GetName()<<"> does not contains the black box <"<<oldname<<">");
       }
 
@@ -946,7 +946,7 @@ namespace bbtk
     mBlackBoxMap[newname] = i->second;
     mBlackBoxMap.erase(i);
 
-    bbtkDebugDecTab("Kernel",8);    
+    bbtkDebugDecTab("kernel",8);    
   }
   //==========================================================================
 
@@ -1007,15 +1007,15 @@ namespace bbtk
       {
        std::string space;
        space.append(lmax - ni->size() - ci->size(),' ');
-       bbtkMessage("Help",1,*ni << space << *ci );
+       bbtkMessage("help",1,*ni << space << *ci );
        std::string d(*di);
        unsigned int dmax = 75 - lmax;
        //      while (d.size() > dmax ) 
        //  {
        if (d.size()>dmax) 
-         bbtkMessage("Help",1,d.substr(0,dmax) << "..." << std::endl);
+         bbtkMessage("help",1,d.substr(0,dmax) << "..." << std::endl);
        else 
-         bbtkMessage("Help",1,d << std::endl);
+         bbtkMessage("help",1,d << std::endl);
        //    d = d.substr(dmax,d.size());
        //  }
       }
@@ -1034,21 +1034,21 @@ namespace bbtk
       {
        if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD ) 
          {
-           bbtkMessage("Help",1,
+           bbtkMessage("help",1,
                        "  "<<i->second->GetTypeName());
            if ( i->second->GetKind() == 
                 BlackBoxDescriptor::DEFAULT_ADAPTOR )
              {
-               bbtkMessage("Help",1,
+               bbtkMessage("help",1,
                            " [default]");
              }  
            if (description) 
              {
-               bbtkMessage("Help",1,
+               bbtkMessage("help",1,
                            " : "<<i->second->GetDescription());
 
              } 
-           bbtkMessage("Help",1,std::endl);
+           bbtkMessage("help",1,std::endl);
          }
       } 
     /*
@@ -1057,15 +1057,15 @@ namespace bbtk
         i!=mAdaptorMap.end();
         ++i) 
       {
-       bbtkMessage("Help",1,
+       bbtkMessage("help",1,
                    "  "<<i->second->GetTypeName());
        if (detail_level>0) 
          {
-           bbtkMessage("Help",1,
+           bbtkMessage("help",1,
                        " : "<<i->second->GetDescription());
   
          } 
-       bbtkMessage("Help",1,std::endl);
+       bbtkMessage("help",1,std::endl);
       }
     */ 
   }
@@ -1075,18 +1075,18 @@ namespace bbtk
   /// Prints help on a black box
   void Package::HelpBlackBox(const std::string& name, bool full) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
                        <<name<<"\")"<<bbtkendl);
 
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
       {
-       bbtkDebugDecTab("Kernel",8);
+       bbtkDebugDecTab("kernel",8);
        bbtkError("The package <"<<GetName()<<"> does not contains the black box <"<<name<<">");
       }
-    //    bbtkMessage("Help",1,"["<<GetName()<<"] ");
+    //    bbtkMessage("help",1,"["<<GetName()<<"] ");
     i->second->GetHelp(full);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
 
   }
   //==========================================================================
@@ -1096,16 +1096,16 @@ namespace bbtk
   /// Returns true iff the package contains the box of name boxname
   bool Package::ContainsBlackBox(const std::string& name) const 
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
                        <<name<<"\")"<<bbtkendl);
     
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
     {
-      bbtkDebugDecTab("Kernel",8);
+      bbtkDebugDecTab("kernel",8);
       return false;
     }
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return true;
   }
   //==========================================================================
@@ -1122,7 +1122,7 @@ namespace bbtk
                               int level,
                               bool relative_link ) const
   {
-    bbtkDebugMessageInc("Kernel",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
+    bbtkDebugMessageInc("kernel",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
                        <<filename<<"\")"<<bbtkendl);
 
     //---------------------
@@ -1338,7 +1338,7 @@ namespace bbtk
     //----------------------
 
     // End
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //==========================================================================
   

diff --git a/kernel/src/bbtkQt.cxx b/kernel/src/bbtkQt.cxx
index f7a193d6a18dd3ddb7f5fd587148ebe00bd08c5b..7e9b296b4caac1e51e2ab2c1e4257b0c389f4533 100644 (file)
--- a/kernel/src/bbtkQt.cxx
+++ b/kernel/src/bbtkQt.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkQt.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/18 10:45:41 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -88,27 +88,28 @@ namespace bbtk
   void Qt::CreateQtAppIfNeeded()
   {
     
-    if (QApplication::instance()==0)
+
+  if (QApplication::instance()==0)
       {
+
        if (mgQtApp != 0) 
          {
            bbtkGlobalError("Qt::CreateQtAppIfNeeded() : INTERNAL ERROR ! (QCoreApplication::instance()==0) && (mgQtApp != 0)");
          }
-       bbtkDebugMessage("qt",1,"  --> Creating bbtk QApplication"<<std::endl);
+       bbtkDebugMessage("widget",1,"  --> Creating bbtk QApplication"<<std::endl);
        char* aargv = const_cast<char*>(argv);
        mgQtApp = new QApplication(argc,&aargv);
 
-       //      std::cout << ">>>> mgQtApp.exec()"<<std::endl;
-       
-       //      mgQtApp->exec();
 
-       //      std::cout << "<<<< mgQtApp.exec()"<<std::endl;
-       //      wxApp::SetInstance(mgQtApp);
+       bbtkDebugMessage("widget",9,"  --> QApplication::instance = "<<QApplication::instance()<<std::endl);
 
-       //int argc = 0;
-       //wxEntry(argc,0);
+       /*
+       std::cout << ">>>> mgQtApp.exec()"<<std::endl;
+       
+       mgQtApp->exec();
 
-       //      wxInitialize();
+       std::cout << "<<<< mgQtApp.exec()"<<std::endl;
+       */
       }
     
   }

diff --git a/kernel/src/bbtkQtBlackBox.cxx b/kernel/src/bbtkQtBlackBox.cxx
index 8ac7de07a3983c31e8fe4d66da84656b0724ad9f..1ee4b47a836ac995f07f3e803b548e9f8a7a9f6c 100644 (file)
--- a/kernel/src/bbtkQtBlackBox.cxx
+++ b/kernel/src/bbtkQtBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkQtBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:33 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -85,6 +85,8 @@ namespace bbtk
   //==================================================================    
   void QtBlackBox::bbUserSetDefaultValues()
   {
+    bbtkBlackBoxDebugMessage("widget",5,"QtBlackBox::bbUserSetDefaultValues()"<<std::endl);
+    bbmWindow = 0;
   }
   //==================================================================    
 
@@ -94,12 +96,70 @@ namespace bbtk
   }
   //==================================================================    
  
- //==================================================================    
+  //==================================================================    
   void QtBlackBox::bbUserFinalizeProcessing()
   {
+    bbtkBlackBoxDebugMessage("widget",5,"==> QtBlackBox::bbUserFinalizeProcessing()"<<std::endl);
+    bbDestroyWindow();
+    bbtkBlackBoxDebugMessage("widget",5,"<== QtBlackBox::bbUserFinalizeProcessing()"<<std::endl);
   }
   //==================================================================    
    
+  //==================================================================    
+  void QtBlackBox::bbSetWindow(QWidget* w) 
+  {
+    bbtkBlackBoxDebugMessage("widget",9,"==> QtBlackBox::bbSetWindow("<<w<<")"<<std::endl);
+    if ((bbmWindow != 0)&&(w!=0)) 
+      { 
+       std::cout << "ERRRRRRRROOOOR"<<std::endl; 
+      }
+    bbmWindow = w;
+  }
+  //==================================================================    
+
+  //==================================================================    
+  void QtBlackBox::bbShowWindow()
+  {
+    if ((bbmWindow) && (!bbIsShown()))
+      {
+       bbtkBlackBoxDebugMessage("widget",3,"==> QtBlackBox::bbShowWindow()"
+                        <<std::endl);
+       if (bbGetInputWinDialog()) 
+         {
+           bbmWindow->updateGeometry();
+           ((QDialog*)bbmWindow)->exec();
+           bbDestroyWindow();  
+         }
+       else
+         {
+           bbmWindow->updateGeometry();
+           ((QDialog*)bbmWindow)->exec();
+           bbSetShown(true);
+         } 
+    }
+  }
+  //==================================================================    
+
+  //==================================================================    
+  void QtBlackBox::bbDestroyWindow()
+  {
+    bbtkBlackBoxDebugMessage("widget",3,"==> QtBlackBox::bbDestroyWindow("<<bbmWindow<<")"<<std::endl);
+    if (bbGetWindow()!=NULL) 
+      {
+       //       wxWindow* w = bbGetWindow();
+       //bbSetWindow(0);
+       // WE SHOULD DESTROY THE WINDOW WITH THE Close METHOD
+       // HOWEVER I
+       //w->Close(true);
+       //
+       delete bbGetWindow();
+       bbSetShown(false);
+      }
+    bbtkBlackBoxDebugMessage("widget",3,"<== QtBlackBox::bbDestroyWindow("<<bbmWindow<<")"<<std::endl);
+
+  }
+  //==================================================================    
+
   //==================================================================
   //  void QtBlackBox::InitWindowManagerIfNeeded() { Qt::
   void QtBlackBox::IncNbWindowsAlive() { Qt::IncNbWindowsAlive(); }

diff --git a/kernel/src/bbtkQtBlackBox.h b/kernel/src/bbtkQtBlackBox.h
index 5cee0ba197c23ca8041aa07b8b468d8790334541..e624bbef5b19ba81b99d08db1466279d8ef21be5 100644 (file)
--- a/kernel/src/bbtkQtBlackBox.h
+++ b/kernel/src/bbtkQtBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkQtBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.2 $
 ========================================================================*/
 
 
@@ -85,7 +85,25 @@ namespace bbtk
     virtual void bbCreateFrameWindow();
     //==================================================================    
 
-   
+   //==================================================================    
+    QWidget* bbGetWindow() { return bbmWindow; }
+    void bbSetWindow(QWidget*) ;
+    bool bbWindowIsCreated() { return (bbGetWindow() != 0); }
+    //==================================================================    
+
+
+    //==================================================================    
+    virtual void bbShowWindow();
+    //==================================================================   
+ 
+    //==================================================================    
+    virtual void bbDestroyWindow();
+    //==================================================================    
+
+  private:
+
+    QWidget* bbmWindow;
+    
     //==================================================================
     //    virtual void InitWindowManagerIfNeeded();
     virtual void IncNbWindowsAlive();

diff --git a/kernel/src/bbtkQtBlackBoxDialog.cxx b/kernel/src/bbtkQtBlackBoxDialog.cxx
index 36b7834f80fd110212adfcd6a9c45d7fadab89f0..71eeb0a01ec57f6dd64504b4066e33f61f3495ac 100644 (file)
--- a/kernel/src/bbtkQtBlackBoxDialog.cxx
+++ b/kernel/src/bbtkQtBlackBoxDialog.cxx
@@ -14,18 +14,21 @@ namespace bbtk
                                     int width, int height)
 
     :
-    QtBlackBoxDialogParent(box,parent)
+    QDialog(parent),
+    mBox(box)
                                    //    QDialog( parent )
   {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::QtBlackBoxDialog("<<
-                    bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
-                    <<title<<","<<width<<"x"<<height<<")"<<std::endl);
+    bbtkDebugMessage("widget",9,"["<<
+                    box->bbGetName()<<"] QtBlackBoxDialog("<<parent<<",\""
+                    <<title<<"\","<<width<<"x"<<height<<")"<<std::endl);
+    Qt::IncNbWindowsAlive();
     // Sets up the GUI inherited from Ui::bbtkQtblackBoxDialog
     setupUi(this);
     resize ( width  , height );
     setWindowTitle(title.c_str());
     
- 
+    ///
+    box->bbSetWindow(this);
    // Create the widget
     box->bbUserCreateWidget(widget);
 
@@ -38,44 +41,19 @@ namespace bbtk
   }
   //=========================================================================
   
-  //=========================================================================
-  void QtBlackBoxDialog::bbShow()
-  { 
-    if (bbIsShown()) return;
-    bbtkDebugMessage("qt",5,"QtBlackBoxDialog::bbShow() ["
-                    <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
-    Parent::bbShow();
-    updateGeometry();
-    exec();
-    //    Show(false);
-    //SetReturnCode( wxDialog::ShowModal() ); 
-    bbDestroy();
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void QtBlackBoxDialog::bbHide()
-  {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::bbHide()"<<std::endl);
-    Parent::bbHide();
-    
-    //Hide();
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void QtBlackBoxDialog::bbDestroy()
-  {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::bbDestroy()"<<std::endl);
-    Parent::bbDestroy();
-    //wxDialog::Destroy();
-    
-  }
-  //=========================================================================
-
+ 
   //=========================================================================
   QtBlackBoxDialog::~QtBlackBoxDialog()
   {
+    if (mBox.lock())
+      bbtkDebugMessage("widget",9,"["<<mBox.lock()->bbGetName()
+                      <<"] $$$$$$$$$$$$$$$$$$$ ~QtBlackBoxDialog()"
+                      <<std::endl);
+    else 
+      bbtkDebugMessage("widget",9,"[DEAD] $$$$$$$$$$$$$$$$$$$$$ ~QtBlackBoxDialog()"<<std::endl);
+    //bbtkDebugMessage("widget",9,"WxFrame::~WxFrame()"<<std::endl);
+    if (mBox.lock()) mBox.lock()->bbSetWindow(0); 
+    Qt::DecNbWindowsAlive();
   }
   //=========================================================================
 

diff --git a/kernel/src/bbtkQtBlackBoxDialog.h b/kernel/src/bbtkQtBlackBoxDialog.h
index a9d6202f027413604e5f091e5981f658da8fc945..ba2fb29f2798b8d3b0a3bae34076dc06e4e6a2b0 100644 (file)
--- a/kernel/src/bbtkQtBlackBoxDialog.h
+++ b/kernel/src/bbtkQtBlackBoxDialog.h
@@ -5,9 +5,9 @@
 
 
 #include "bbtkQtBlackBox.h"
-#include "bbtkWidgetBlackBoxWindow.h"
+
+#include <QDialog>
 #include "ui_bbtkQtBlackBoxDialog.h"
-#include "bbtkQtBlackBoxDialogParent.h"
 
 namespace bbtk
 {
@@ -15,25 +15,18 @@ namespace bbtk
   //=========================================================================
   // QtBlackBoxDialog
   //=========================================================================
-  class QtBlackBoxDialog : public QtBlackBoxDialogParent,
-                          // WidgetBlackBoxWindow<QWidget>, 
-                          // public QDialog,
+  class QtBlackBoxDialog : public QDialog,
                           private Ui::bbtkQtBlackBoxDialog
   {
     Q_OBJECT
   public:
-    typedef QtBlackBoxDialogParent Parent;
-    //  typedef WidgetBlackBoxWindow<QWidget> Parent;
-    //QtBlackBoxDialog() : Parent(QtBlackBox::Pointer()) {}
     QtBlackBoxDialog(QtBlackBox::Pointer box,
                     QWidget *parent,
                     const std::string& title,
                     int width, int height);
     ~QtBlackBoxDialog();
-    void bbShow();
-    void bbHide();
-    void bbDestroy();
-    bool bbIsDialog() { return true; }
+  private:
+    QtBlackBox::WeakPointer mBox;
   };
   //=========================================================================
 

diff --git a/kernel/src/bbtkQtBlackBoxDialog.ui b/kernel/src/bbtkQtBlackBoxDialog.ui
index 98ec27fbe9e039390e960fec5d412488d7be3c58..9a694038a96ae0e6781ed251be1802ae9d7024cd 100644 (file)
--- a/kernel/src/bbtkQtBlackBoxDialog.ui
+++ b/kernel/src/bbtkQtBlackBoxDialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>bbtkQtBlackBoxDialog</class>
- <widget class="QDialog" name="bbtkQtBlackBoxDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="bbtkQtBlackBoxDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,25 +10,25 @@
     <height>603</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>1</horstretch>
     <verstretch>1</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QWidget" native="1" name="widget" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>1</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" />
+     <layout class="QHBoxLayout" name="horizontalLayout"/>
     </widget>
    </item>
   </layout>

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 1983cb36492145a13a5ac1f87b599f3d4339c65a..08c58c97554c34a08cd8bd92af7c73f8967a8026 100644 (file)
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:06 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2009/05/28 14:22:11 $
+  Version:   $Revision: 1.42 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -252,7 +252,6 @@ namespace bbtk
   void WxBlackBox::bbUserSetDefaultValues()
   {
     bbtkBlackBoxDebugMessage("widget",5,"WxBlackBox::bbUserSetDefaultValues()"<<std::endl);
-    //    bbSetWidgetEventHandler(0);
     bbmWindow = 0;
   }
   //=========================================================================

diff --git a/packages/qt/src/bbqtLayoutLine.cxx b/packages/qt/src/bbqtLayoutLine.cxx
index 1919d15abe55cd8c9cf46f214cdb619704fe7f09..542385f34cab53534347c32d03aab1cce792faf8 100644 (file)
--- a/packages/qt/src/bbqtLayoutLine.cxx
+++ b/packages/qt/src/bbqtLayoutLine.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbqtLayoutLine.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 16:21:19 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/28 14:22:15 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -117,6 +117,7 @@ namespace bbqt
   // when window is shown
   void  LayoutLine::OnShowWidget()
   {
+    /*
     bbUserOnShowWidget("Widget1");
     bbUserOnShowWidget("Widget2");
     bbUserOnShowWidget("Widget3");
@@ -126,6 +127,7 @@ namespace bbqt
     bbUserOnShowWidget("Widget7");
     bbUserOnShowWidget("Widget8");
     bbUserOnShowWidget("Widget9");
+    */
   }
 
 }//namespace bbqt

diff --git a/packages/qt/src/bbqtLayoutSplit.cxx b/packages/qt/src/bbqtLayoutSplit.cxx
index a7c6ba1517439c4a621bea4fa5c08c6407c207d9..ef0c1f4788fd627608a4673f3453ec3d3ff5bc2c 100644 (file)
--- a/packages/qt/src/bbqtLayoutSplit.cxx
+++ b/packages/qt/src/bbqtLayoutSplit.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbqtLayoutSplit.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 16:21:19 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/28 14:22:15 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -166,6 +166,7 @@ namespace bbqt
   // when window is shown
   void  LayoutSplit::OnShowWidget()
   {
+    /*
     bbUserOnShowWidget("Widget1");
     bbUserOnShowWidget("Widget2");
     bbUserOnShowWidget("Widget3");
@@ -175,6 +176,7 @@ namespace bbqt
     bbUserOnShowWidget("Widget7");
     bbUserOnShowWidget("Widget8");
     bbUserOnShowWidget("Widget9");
+    */
   }