From b24cd2e9c7d2d6ca05fd76fc1cb8a72dd7039078 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 17 Nov 2015 01:12:43 +0100 Subject: [PATCH] refs #507, adjustements in swift data (mapping tool) * output of download template * setup will be read automatically --- src/swiftdata/swiftdata.cpp | 10 +++++++--- src/swiftdata/swiftdata.h | 8 +++++++- src/swiftdata/swiftdata.ui | 16 ++++++++++++++-- src/swiftdata/swiftdata_menus.cpp | 16 ++++++++++++---- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index af99ef065..ac8b82831 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -15,6 +15,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/stylesheetutility.h" #include "blackcore/webdataservices.h" +#include "blackmisc/network/entityflags.h" #include "blackmisc/icon.h" #include "blackmisc/loghandler.h" #include "blackmisc/project.h" @@ -23,6 +24,7 @@ #include using namespace BlackMisc; +using namespace BlackMisc::Network; using namespace BlackCore; using namespace BlackGui; using namespace BlackGui::Components; @@ -31,7 +33,7 @@ CSwiftData::CSwiftData(QWidget *parent) : QMainWindow(parent), CIdentifiable(this), ui(new Ui::CSwiftData), - m_webDataReader(new CWebDataServices(CWebReaderFlags::AllSwiftDbReaders)) + m_webDataReader(new CWebDataServices(CWebReaderFlags::AllSwiftDbReaders, 500)) { ui->setupUi(this); this->init(); @@ -103,7 +105,7 @@ void CSwiftData::initReaders() Q_ASSERT_X(this->m_webDataReader, Q_FUNC_INFO, "Missing reader"); this->ui->comp_MainInfoArea->setProvider(this->m_webDataReader); this->ui->comp_InfoBar->setProvider(this->m_webDataReader); - this->m_webDataReader->readAllInBackground(1000); // kick of readers a little delayed + // web data will be read automatically when setup is syncronized } void CSwiftData::initMenu() @@ -113,6 +115,7 @@ void CSwiftData::initMenu() this->ui->menu_WindowMinimize->setIcon(this->style()->standardIcon(QStyle::SP_TitleBarMinButton)); connect(this->ui->menu_FileExit, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_FileReloadStyleSheets, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_FileResetSettings, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_SettingsDirectory, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_SettingsFiles, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); @@ -132,7 +135,8 @@ void CSwiftData::initMenu() connect(this->ui->menu_InternalsEnvVars, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_InternalsMetatypes, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_InternalsSetup, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); - connect(this->ui->menu_InternalsJsonBootstrapTemplate, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_JsonBootstrapTemplate, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_JsonDownloadTemplate, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); } void CSwiftData::performGracefulShutdown() diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index dbdc37691..934e51d84 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -14,6 +14,8 @@ #include "blackcore/context_runtime.h" #include "blackcore/data/globalsetup.h" +#include "blackcore/data/download.h" +#include "blackcore/setupreader.h" #include "blackgui/systemtraywindow.h" #include "blackgui/managedstatusbar.h" #include "blackmisc/statusmessage.h" @@ -53,6 +55,9 @@ private slots: //! Menu clicked void ps_onMenuClicked(); + //! Setup has been changed + void ps_setupChanged(); + private: void init(); void initLogDisplay(); @@ -68,7 +73,8 @@ private: QScopedPointer ui; BlackGui::CManagedStatusBar m_statusBar; BlackCore::CWebDataServices *m_webDataReader = nullptr; - BlackCore::CData m_setup {this}; //!< setup cache + BlackCore::CData m_setup {this, &CSwiftData::ps_setupChanged}; //!< setup cache + BlackCore::CData m_download { this }; // download data }; #endif // guard diff --git a/src/swiftdata/swiftdata.ui b/src/swiftdata/swiftdata.ui index 1e45529a5..1f9ba9ee0 100644 --- a/src/swiftdata/swiftdata.ui +++ b/src/swiftdata/swiftdata.ui @@ -128,7 +128,14 @@ Internals - + + + Templates + + + + + @@ -211,7 +218,7 @@ Debug metatypes (to console) - + JSON bootstrap template @@ -276,6 +283,11 @@ Reset + + + JSON download template + + diff --git a/src/swiftdata/swiftdata_menus.cpp b/src/swiftdata/swiftdata_menus.cpp index a41eda8d3..68cd7412a 100644 --- a/src/swiftdata/swiftdata_menus.cpp +++ b/src/swiftdata/swiftdata_menus.cpp @@ -29,9 +29,6 @@ using namespace BlackCore; using namespace BlackGui::Components; using namespace BlackMisc; -/* - * Menu clicked - */ void CSwiftData::ps_onMenuClicked() { QObject *sender = QObject::sender(); @@ -103,12 +100,18 @@ void CSwiftData::ps_onMenuClicked() CDbMappingComponent *mappingComponent = this->ui->comp_MainInfoArea->getMappingComponent(); mappingComponent->resizeForMapping(); } - else if (sender == this->ui->menu_InternalsJsonBootstrapTemplate) + else if (sender == this->ui->menu_JsonBootstrapTemplate) { QString json(m_setup.get().toJsonString()); this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(json); this->displayConsole(); } + else if (sender == this->ui->menu_JsonDownloadTemplate) + { + QString json(m_download.get().toJsonString()); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(json); + this->displayConsole(); + } else if (sender == this->ui->menu_InternalsMetatypes) { QString metadata(getAllUserMetatypesTypes()); @@ -135,6 +138,11 @@ void CSwiftData::ps_onMenuClicked() } } +void CSwiftData::ps_setupChanged() +{ + CLogMessage(this).debug() << "Setup changed"; +} + void CSwiftData::initDynamicMenus() { Q_ASSERT(this->ui->menu_InfoAreas);