From c333db268f8b73bcf7fe7ff9eeed8394252f1c94 Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 28 May 2009 14:22:09 +0000 Subject: [PATCH] Qt black boxes updated --- kernel/src/bbtkBlackBox.cxx | 36 ++++++------ kernel/src/bbtkConfigurationFile.cxx | 62 ++++++++++---------- kernel/src/bbtkFactory.cxx | 26 ++++----- kernel/src/bbtkPackage.cxx | 86 ++++++++++++++-------------- kernel/src/bbtkQt.cxx | 25 ++++---- kernel/src/bbtkQtBlackBox.cxx | 66 ++++++++++++++++++++- kernel/src/bbtkQtBlackBox.h | 24 +++++++- kernel/src/bbtkQtBlackBoxDialog.cxx | 58 ++++++------------- kernel/src/bbtkQtBlackBoxDialog.h | 17 ++---- kernel/src/bbtkQtBlackBoxDialog.ui | 23 ++++---- kernel/src/bbtkWxBlackBox.cxx | 5 +- packages/qt/src/bbqtLayoutLine.cxx | 6 +- packages/qt/src/bbqtLayoutSplit.cxx | 6 +- 13 files changed, 247 insertions(+), 193 deletions(-) diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index 795d8d4..316f8cb 100644 --- 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 '"<bbGetDescriptor()->GetPackage()->GetName() <<"::"<bbGetDescriptor()->GetTypeName()<<">"<bbGetDescriptor()->GetTypeName()<<">"<bbGetDescriptor()->GetTypeName()<<">"< iname; std::vector ivalue; @@ -1413,9 +1413,9 @@ namespace bbtk } if (iname.size()) - bbtkBlackBoxMessage("Help",1," * Inputs : "<::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," '"< '"<<*i3<<"'"); pref.replace(0,pref.size(),pref.size(),' '); } } - bbtkBlackBoxMessage("Help",1," ["<<*i4<<"]"< bin : '"< prefix : '"< doc : '"< bbs : '"< data : '"< bin : '"< prefix : '"< doc : '"< bbs : '"< data : '"<\n"); fprintf(fp, "\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(" <bbs_paths = Get_bbs_paths(); const std::vectorpackage_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::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<<"]"<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 "<first<<" "); + bbtkMessage("help",1, "Package "<first<<" "); if (i->second->GetVersion().length()>0) - bbtkMessageCont("Help",1,"v" <second->GetVersion()); + bbtkMessageCont("help",1,"v" <second->GetVersion()); if (i->second->GetAuthor().length()>0) - bbtkMessageCont("Help",1,"- "<second->GetAuthor()); + bbtkMessageCont("help",1,"- "<second->GetAuthor()); if (i->second->GetCategory().length()>0) - bbtkMessageCont("Help",1,"- "<second->GetCategory()); + bbtkMessageCont("help",1,"- "<second->GetCategory()); - bbtkMessageCont("Help",1,std::endl); - bbtkIncTab("Help",1); - bbtkMessage("Help",1,i->second->GetDescription()<second->GetDescription()<second->GetNumberOfBlackBoxes()>0) { - bbtkMessage("Help",1, "Black boxes : "<second->PrintBlackBoxes(true,adaptors); } else { - bbtkMessage("Help",1, "No black boxes"<::NewBlackBox(\""<::NewBlackBox(\""<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<"<::NewAdaptor(" <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<"<::NewWidgetAdaptor(" <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<"<::FindWidgetAdaptor(" <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<"<::FindAdaptor(" <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<"<::RegisterBlackBox(\""<GetTypeName()<<"\")"<::RegisterBlackBox(\""<GetTypeName()<<"\")"<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<"<::RegisterBlackBox(\""<GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<::RegisterBlackBox(\""<GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<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<"<::RegisterBlackBox(\""<GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<::RegisterBlackBox(\""<GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<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<"<::ChangeBlackBoxName(\""<::ChangeBlackBoxName(\""< does not contains the black box <"<"); } @@ -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, " "<second->GetTypeName()); if ( i->second->GetKind() == BlackBoxDescriptor::DEFAULT_ADAPTOR ) { - bbtkMessage("Help",1, + bbtkMessage("help",1, " [default]"); } if (description) { - bbtkMessage("Help",1, + bbtkMessage("help",1, " : "<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, " "<second->GetTypeName()); if (detail_level>0) { - bbtkMessage("Help",1, + bbtkMessage("help",1, " : "<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<"<::HelpBlackBox(\"" + bbtkDebugMessageInc("kernel",8,"Package<"<::HelpBlackBox(\"" < does not contains the black box <"<"); } - // bbtkMessage("Help",1,"["<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<"<::HelpBlackBox(\"" + bbtkDebugMessageInc("kernel",8,"Package<"<::HelpBlackBox(\"" <::CreateHtmlPage(\"" + bbtkDebugMessageInc("kernel",9,"Package<"<::CreateHtmlPage(\"" < Creating bbtk QApplication"< Creating bbtk QApplication"<(argv); mgQtApp = new QApplication(argc,&aargv); - // std::cout << ">>>> mgQtApp.exec()"<exec(); - // std::cout << "<<<< mgQtApp.exec()"< QApplication::instance = "<>>> mgQtApp.exec()"<exec(); - // wxInitialize(); + std::cout << "<<<< mgQtApp.exec()"< QtBlackBox::bbUserFinalizeProcessing()"< QtBlackBox::bbSetWindow("< QtBlackBox::bbShowWindow()" + <updateGeometry(); + ((QDialog*)bbmWindow)->exec(); + bbDestroyWindow(); + } + else + { + bbmWindow->updateGeometry(); + ((QDialog*)bbmWindow)->exec(); + bbSetShown(true); + } + } + } + //================================================================== + + //================================================================== + void QtBlackBox::bbDestroyWindow() + { + bbtkBlackBoxDebugMessage("widget",3,"==> QtBlackBox::bbDestroyWindow("<Close(true); + // + delete bbGetWindow(); + bbSetShown(false); + } + bbtkBlackBoxDebugMessage("widget",3,"<== QtBlackBox::bbDestroyWindow("<bbGetFullName()<<","<bbGetName()<<"] QtBlackBoxDialog("<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() [" - <bbGetFullName()<<"]"<bbGetName() + <<"] $$$$$$$$$$$$$$$$$$$ ~QtBlackBoxDialog()" + <bbSetWindow(0); + Qt::DecNbWindowsAlive(); } //========================================================================= diff --git a/kernel/src/bbtkQtBlackBoxDialog.h b/kernel/src/bbtkQtBlackBoxDialog.h index a9d6202..ba2fb29 100644 --- a/kernel/src/bbtkQtBlackBoxDialog.h +++ b/kernel/src/bbtkQtBlackBoxDialog.h @@ -5,9 +5,9 @@ #include "bbtkQtBlackBox.h" -#include "bbtkWidgetBlackBoxWindow.h" + +#include #include "ui_bbtkQtBlackBoxDialog.h" -#include "bbtkQtBlackBoxDialogParent.h" namespace bbtk { @@ -15,25 +15,18 @@ namespace bbtk //========================================================================= // QtBlackBoxDialog //========================================================================= - class QtBlackBoxDialog : public QtBlackBoxDialogParent, - // WidgetBlackBoxWindow, - // public QDialog, + class QtBlackBoxDialog : public QDialog, private Ui::bbtkQtBlackBoxDialog { Q_OBJECT public: - typedef QtBlackBoxDialogParent Parent; - // typedef WidgetBlackBoxWindow 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 98ec27f..9a69403 100644 --- a/kernel/src/bbtkQtBlackBoxDialog.ui +++ b/kernel/src/bbtkQtBlackBoxDialog.ui @@ -1,7 +1,8 @@ - + + bbtkQtBlackBoxDialog - - + + 0 0 @@ -9,25 +10,25 @@ 603 - - + + 1 1 - + Dialog - + - - - + + + 1 1 - + diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 1983cb3..08c58c9 100644 --- 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()"<