Summary query widget : config can be saved/loaded

This commit is contained in:
Claveau Joshua
2020-06-21 16:17:35 +02:00
parent 64f3001c86
commit 0587c56bba
4 changed files with 86 additions and 3 deletions

View File

@@ -17,7 +17,6 @@
*/ */
#include "summaryquerywidget.h" #include "summaryquerywidget.h"
#include "ui_summaryquerywidget.h" #include "ui_summaryquerywidget.h"
#include "qetapp.h" #include "qetapp.h"
#include <QListWidgetItem> #include <QListWidgetItem>
@@ -31,10 +30,12 @@ SummaryQueryWidget::SummaryQueryWidget(QWidget *parent) :
ui(new Ui::SummaryQueryWidget) ui(new Ui::SummaryQueryWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->m_config_gb->setDisabled(true);
setUpItems(); setUpItems();
fillSavedQuery(); fillSavedQuery();
connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &SummaryQueryWidget::saveConfig);
connect(ui->m_config_gb, &ConfigSaveLoaderWidget::loadClicked, this, &SummaryQueryWidget::loadConfig);
} }
/** /**
@@ -133,10 +134,20 @@ void SummaryQueryWidget::setUpItems()
/** /**
* @brief SummaryQueryWidget::fillSavedQuery * @brief SummaryQueryWidget::fillSavedQuery
* Fill the combo box of the saved query
*/ */
void SummaryQueryWidget::fillSavedQuery() void SummaryQueryWidget::fillSavedQuery()
{ {
QFile file(QETApp::configDir() + "/summary.json");
if (file.open(QFile::ReadOnly))
{
QJsonDocument jsd(QJsonDocument::fromJson(file.readAll()));
QJsonObject jso = jsd.object();
for (auto it = jso.begin() ; it != jso.end() ; ++it) {
ui->m_config_gb->addItem(it.key());
}
}
} }
/** /**
@@ -273,3 +284,62 @@ void SummaryQueryWidget::reset()
} }
ui->m_user_query_le->clear(); ui->m_user_query_le->clear();
} }
/**
* @brief SummaryQueryWidget::saveConfig
*/
void SummaryQueryWidget::saveConfig()
{
QFile file_(QETApp::configDir() + "/summary.json");
if (file_.open(QFile::ReadWrite))
{
QJsonDocument doc_(QJsonDocument::fromJson(file_.readAll()));
QJsonObject root_object;
if (!doc_.isEmpty())
{
root_object = doc_.object();
if (root_object.contains(ui->m_config_gb->text())) {
root_object.remove(ui->m_config_gb->text());
}
}
QJsonObject object_;
object_.insert("query", queryStr());
root_object[ui->m_config_gb->text()] = object_;
doc_.setObject(root_object);
file_.resize(0);
file_.write(doc_.toJson());
}
}
/**
* @brief SummaryQueryWidget::loadConfig
*/
void SummaryQueryWidget::loadConfig()
{
auto name = ui->m_config_gb->selectedText();
if (name.isEmpty()) {
return;
}
QFile file_(QETApp::configDir() + "/summary.json");
if (!file_.open(QFile::ReadOnly)) {
return;
}
QJsonDocument doc_(QJsonDocument::fromJson(file_.readAll()));
QJsonObject object_ = doc_.object();
auto value = object_.value(name);
if (!value.isObject()) {
return;
}
auto value_object = value.toObject();
if (value_object.value("query").isString()) {
setQuery(value_object.value("query").toString());
}
}

View File

@@ -53,6 +53,8 @@ class SummaryQueryWidget : public QWidget
void on_m_down_pb_clicked(); void on_m_down_pb_clicked();
void on_m_edit_sql_query_cb_clicked(); void on_m_edit_sql_query_cb_clicked();
void reset(); void reset();
void saveConfig();
void loadConfig();
private: private:
Ui::SummaryQueryWidget *ui; Ui::SummaryQueryWidget *ui;

View File

@@ -17,6 +17,18 @@
<item> <item>
<widget class="QWidget" name="m_info_widget" native="true"> <widget class="QWidget" name="m_info_widget" native="true">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QListWidget" name="m_choosen_list"/> <widget class="QListWidget" name="m_choosen_list"/>
</item> </item>

View File

@@ -43,7 +43,6 @@ AddTableDialog::AddTableDialog(QWidget *content_widget, QWidget *parent) :
connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &AddTableDialog::saveConfig); connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &AddTableDialog::saveConfig);
connect(ui->m_config_gb, &ConfigSaveLoaderWidget::loadClicked, this, &AddTableDialog::loadConfig); connect(ui->m_config_gb, &ConfigSaveLoaderWidget::loadClicked, this, &AddTableDialog::loadConfig);
} }
/** /**