diff --git a/src/kdefrontend/datasources/ImportDatasetWidget.cpp b/src/kdefrontend/datasources/ImportDatasetWidget.cpp index 8e1d2f344..f5dbe6868 100644 --- a/src/kdefrontend/datasources/ImportDatasetWidget.cpp +++ b/src/kdefrontend/datasources/ImportDatasetWidget.cpp @@ -1,451 +1,450 @@ /*************************************************************************** File : ImportDatasetWidget.cpp Project : LabPlot Description : import online dataset widget -------------------------------------------------------------------- Copyright : (C) 2019 Kovacs Ferencz (kferike98@gmail.com) ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ -#include "ImportDatasetWidget.h" -#include "DatasetMetadataManagerDialog.h" -#include "QJsonDocument" -#include "QJsonArray" -#include "QJsonObject" -#include "QJsonValue" -#include "QStandardPaths" -#include "QFile" -#include "QDebug" -#include "QTreeWidget" -#include "backend/datasources/DatasetHandler.h" -#include "QMessageBox" -#include "QDir" +#include "src/backend/datasources/DatasetHandler.h" +#include "src/kdefrontend/datasources/ImportDatasetWidget.h" +#include "src/kdefrontend/datasources/DatasetMetadataManagerDialog.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include "KNS3/DownloadDialog" -#include "KNewStuff3/KNS3/DownloadDialog" -#include "KNS3/DownloadManager" -#include "KNS3/UploadDialog" +#include +#include +#include +#include ImportDatasetWidget::ImportDatasetWidget(QWidget* parent) : QWidget(parent), m_categoryCompleter(new QCompleter), m_datasetCompleter(new QCompleter), - m_loadingCategories(false) -{ - QString baseDir = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first(); + m_loadingCategories(false) { + const QString baseDir = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first(); QString containingDir = "labplot_data"; - m_jsonDir=baseDir + QDir::separator() + containingDir + QDir::separator(); + m_jsonDir = baseDir + QDir::separator() + containingDir + QDir::separator(); ui.setupUi(this); if(!QFile(m_jsonDir + "DatasetCategories.json").exists()) downloadCategoryFile(); loadDatasetCategoriesFromJson(); ui.lwDatasets->setSelectionMode(QAbstractItemView::SingleSelection); ui.twCategories->setSelectionMode(QAbstractItemView::SingleSelection); connect(ui.twCategories, &QTreeWidget::itemDoubleClicked, this, &ImportDatasetWidget::listDatasetsForSubcategory); connect(ui.twCategories, &QTreeWidget::itemSelectionChanged, [this] { if(!m_loadingCategories) listDatasetsForSubcategory(ui.twCategories->selectedItems().first()); }); connect(ui.leSearchDatasets, &QLineEdit::textChanged, this, &ImportDatasetWidget::scrollToDatasetListItem); connect(ui.bClearCache, &QPushButton::clicked, this, &ImportDatasetWidget::clearCache); connect(ui.leSearchCategories, &QLineEdit::textChanged, this, &ImportDatasetWidget::scrollToCategoryTreeItem); connect(ui.bRefresh, &QPushButton::clicked, this, &ImportDatasetWidget::refreshCategories); connect(ui.bNewDataset, &QPushButton::clicked, this, &ImportDatasetWidget::showDatasetMetadataManager); connect(ui.lwDatasets, &QListWidget::itemSelectionChanged, [this]() { emit datasetSelected(); }); } ImportDatasetWidget::~ImportDatasetWidget() { if(m_categoryCompleter != nullptr) delete m_categoryCompleter; if(m_datasetCompleter != nullptr) delete m_datasetCompleter; } -QString ImportDatasetWidget::locateCategoryJsonFile() { +QString ImportDatasetWidget::locateCategoryJsonFile() const { qDebug() << "Locating category file" << QStandardPaths::locate(QStandardPaths::AppDataLocation, "datasets/DatasetCategories.json"); return QStandardPaths::locate(QStandardPaths::AppDataLocation, "datasets/DatasetCategories.json"); } void ImportDatasetWidget::loadDatasetCategoriesFromJson() { qDebug() << "loading Categories"; QString filePath = m_jsonDir + "DatasetCategories.json"; QFile file(filePath); if (file.open(QIODevice::ReadOnly)) { m_loadingCategories = true; ui.lwDatasets->clear(); ui.twCategories->clear(); m_datasetsMap.clear(); QJsonDocument document = QJsonDocument::fromJson(file.readAll()); QJsonArray categoryArray = document.object().value("categories").toArray(); for(int i = 0 ; i < categoryArray.size(); ++i) { - QJsonObject currentCategory = categoryArray[i].toObject(); - QString categoryName = currentCategory.value("category_name").toString(); - QTreeWidgetItem* currentCategoryItem= new QTreeWidgetItem(QStringList(categoryName)); + const QJsonObject currentCategory = categoryArray[i].toObject(); + const QString categoryName = currentCategory.value("category_name").toString(); + QTreeWidgetItem* const currentCategoryItem = new QTreeWidgetItem(QStringList(categoryName)); + const QJsonArray subcategories = currentCategory.value("subcategories").toArray(); ui.twCategories->addTopLevelItem(currentCategoryItem); - QJsonArray subcategories = currentCategory.value("subcategories").toArray(); for(int j = 0; j < subcategories.size(); ++j) { QJsonObject currentSubCategory = subcategories[j].toObject(); QString subcategoryName = currentSubCategory.value("subcategory_name").toString(); currentCategoryItem->addChild(new QTreeWidgetItem(QStringList(subcategoryName))); - QJsonArray datasetArray= currentSubCategory.value("datasets").toArray(); + const QJsonArray datasetArray = currentSubCategory.value("datasets").toArray(); + + // TODO remove? QVector datasets; - for(int k = 0; k < datasetArray.size(); ++k) { - QString datasetName = datasetArray[k].toString(); - m_datasetsMap[categoryName][subcategoryName].push_back(datasetName); + for (const auto& dataset : datasetArray) { + m_datasetsMap[categoryName][subcategoryName].push_back(dataset.toString()); } } } updateCategoryCompleter(); m_loadingCategories = false; restoreSelectedSubcategory(); file.close(); } else { qDebug("Couldn't open dataset category file"); } } void ImportDatasetWidget::restoreSelectedSubcategory() { if(m_datasetsMap.keys().contains(m_selectedCategory)) { - QTreeWidgetItem* categoryItem = ui.twCategories->findItems(m_selectedCategory, Qt::MatchExactly).first(); + const QTreeWidgetItem* const categoryItem = ui.twCategories->findItems(m_selectedCategory, Qt::MatchExactly).first(); if(m_datasetsMap[m_selectedCategory].keys().contains(m_selectedSubcategory)) { for(int i = 0; i < categoryItem->childCount(); ++i) { if(categoryItem->child(i)->text(0).compare(m_selectedSubcategory) == 0) { - QTreeWidgetItem* subcategoryItem = categoryItem->child(i); + QTreeWidgetItem* const subcategoryItem = categoryItem->child(i); ui.twCategories->setCurrentItem(subcategoryItem); subcategoryItem->setSelected(true); m_selectedSubcategory.clear(); listDatasetsForSubcategory(subcategoryItem); break; } } } } } -void ImportDatasetWidget::listDatasetsForSubcategory(QTreeWidgetItem *item) { +void ImportDatasetWidget::listDatasetsForSubcategory(QTreeWidgetItem* item) { if(item->childCount() == 0) { if(m_selectedSubcategory.compare(item->text(0)) != 0) { m_selectedSubcategory = item->text(0); m_selectedCategory = item->parent()->text(0); QString categoryName = item->parent()->text(0); ui.lwDatasets->clear(); for(QString dataset : m_datasetsMap[categoryName][m_selectedSubcategory]) { ui.lwDatasets->addItem(new QListWidgetItem(dataset)); } updateDatasetCompleter(); highlightLocalMetadataFiles(); } } else { if(item->text(0).compare(m_selectedCategory) != 0) { m_selectedCategory = item->text(0); m_selectedSubcategory = ""; ui.lwDatasets->clear(); item->setExpanded(true); } } } void ImportDatasetWidget::updateDatasetCompleter() { QStringList datasetList; for(int i = 0; i count(); ++i) { datasetList.append(ui.lwDatasets->item(i)->text()); } - if(m_datasetCompleter != nullptr) - delete m_datasetCompleter; - if(!datasetList.isEmpty()) { + if(m_datasetCompleter != nullptr) + delete m_datasetCompleter; + m_datasetCompleter = new QCompleter(datasetList); m_datasetCompleter->setCompletionMode(QCompleter::PopupCompletion); m_datasetCompleter->setCaseSensitivity(Qt::CaseSensitive); ui.leSearchDatasets->setCompleter(m_datasetCompleter); } else ui.leSearchDatasets->setCompleter(nullptr); } void ImportDatasetWidget::updateCategoryCompleter() { QStringList categoryList; for (int i = 0; i < ui.twCategories->topLevelItemCount(); ++i) { categoryList.append(ui.twCategories->topLevelItem(i)->text(0)); for(int j = 0; j < ui.twCategories->topLevelItem(i)->childCount(); ++j) { - categoryList.append(ui.twCategories->topLevelItem(i)->text(0) + ":" + ui.twCategories->topLevelItem(i)->child(j)->text(0)); + categoryList.append(ui.twCategories->topLevelItem(i)->text(0) + QLatin1Char(':') + ui.twCategories->topLevelItem(i)->child(j)->text(0)); } } - if(m_categoryCompleter != nullptr) - delete m_categoryCompleter; - if(!categoryList.isEmpty()) { + if(m_categoryCompleter != nullptr) + delete m_categoryCompleter; + m_categoryCompleter = new QCompleter(categoryList); m_categoryCompleter->setCompletionMode(QCompleter::PopupCompletion); m_categoryCompleter->setCaseSensitivity(Qt::CaseSensitive); ui.leSearchCategories->setCompleter(m_categoryCompleter); } else ui.leSearchCategories->setCompleter(nullptr); } void ImportDatasetWidget::scrollToCategoryTreeItem(const QString& rootName) { int topItemIdx = -1; for (int i = 0; i < ui.twCategories->topLevelItemCount(); ++i) if (rootName.startsWith(ui.twCategories->topLevelItem(i)->text(0))) { topItemIdx = i; break; } if (topItemIdx >= 0) { - if(!rootName.contains(":")) { + if(!rootName.contains(QLatin1Char(':'))) { ui.twCategories->scrollToItem(ui.twCategories->topLevelItem(topItemIdx), QAbstractItemView::ScrollHint::PositionAtTop); } else { int childIdx = -1; for(int j = 0; j < ui.twCategories->topLevelItem(topItemIdx)->childCount(); ++j) { if(rootName.endsWith(ui.twCategories->topLevelItem(topItemIdx)->child(j)->text(0))) { childIdx = j; break; } } if(childIdx >= 0) { ui.twCategories->scrollToItem(ui.twCategories->topLevelItem(topItemIdx)->child(childIdx), QAbstractItemView::ScrollHint::PositionAtTop); } else { ui.twCategories->scrollToItem(ui.twCategories->topLevelItem(topItemIdx), QAbstractItemView::ScrollHint::PositionAtTop); } } } } void ImportDatasetWidget::scrollToDatasetListItem(const QString& rootName) { int itemIdx = -1; for (int i = 0; i < ui.lwDatasets->count(); ++i) if (ui.lwDatasets->item(i)->text() == rootName) { itemIdx = i; break; } if (itemIdx >= 0) ui.lwDatasets->scrollToItem(ui.lwDatasets->item(itemIdx), QAbstractItemView::ScrollHint::PositionAtTop); } -QString ImportDatasetWidget::getSelectedDataset() { +QString ImportDatasetWidget::getSelectedDataset() const { if (ui.lwDatasets->selectedItems().count() > 0) { return ui.lwDatasets->selectedItems().at(0)->text(); } else return QString(); } void ImportDatasetWidget::loadDatasetToProcess(DatasetHandler* datasetHandler) { - QString fileName = getSelectedDataset() + ".json"; + const QString fileName = getSelectedDataset() + QLatin1String(".json"); downloadDatasetFile(fileName); QString filePath = m_jsonDir + m_selectedCategory + QDir::separator() + m_selectedSubcategory + QDir::separator() + fileName; if(QFile::exists(filePath)) { datasetHandler->processMetadata(filePath); } else { QMessageBox::critical(this, i18n("Can't locate file"), i18n("The metadata file for the choosen dataset can't be located")); } } AbstractFileFilter* ImportDatasetWidget::currentFileFilter() const { return m_currentFilter.get(); } void ImportDatasetWidget::showDatasetMetadataManager() { - DatasetMetadataManagerDialog* dlg = new DatasetMetadataManagerDialog(this, m_datasetsMap); if (dlg->exec() == QDialog::Accepted) { - QString pathToJson = m_jsonDir + "DatasetCategories.json"; - QString dirPath = QFileInfo(pathToJson).dir().absolutePath(); + const QString pathToJson = m_jsonDir + QLatin1String("DatasetCategories.json"); + const QString dirPath = QFileInfo(pathToJson).dir().absolutePath(); dlg->updateDocument(pathToJson); dlg->createNewMetadata(dirPath); uploadCategoryFile(); uploadDatasetFile(dlg->getMetadataFilePath()); loadDatasetCategoriesFromJson(); } delete dlg; } void ImportDatasetWidget::downloadCategoryFile() { qDebug() << "Downloading category file"; - QString fileNameOld = QStandardPaths::locate(QStandardPaths::AppDataLocation, "datasets/DatasetCategories.json"); - QString fileNameNew =m_jsonDir + "DatasetCategories.json"; - - QString parentDir = m_jsonDir.left(m_jsonDir.left(m_jsonDir.length() - 1).lastIndexOf(QDir::separator())); + const QString fileNameOld = QStandardPaths::locate(QStandardPaths::AppDataLocation, "datasets/DatasetCategories.json"); + const QString fileNameNew =m_jsonDir + QLatin1String("DatasetCategories.json"); + const QString parentDir = m_jsonDir.left(m_jsonDir.left(m_jsonDir.length() - 1).lastIndexOf(QDir::separator())); if(!QDir(m_jsonDir).exists()) { qDebug() << parentDir; - QDir(parentDir).mkdir("labplot_data"); + QDir(parentDir).mkdir(QLatin1String("labplot_data")); } + QFile::copy(fileNameOld, fileNameNew); } -void ImportDatasetWidget::downloadDatasetFile(const QString &datasetName) { - QString fileNameOld = QStandardPaths::locate(QStandardPaths::AppDataLocation, QString("datasets") + QDir::separator() + datasetName); +void ImportDatasetWidget::downloadDatasetFile(const QString& datasetName) { + const QString fileNameOld = QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String("datasets") + QDir::separator() + datasetName); QString pathToNewFile = m_jsonDir + m_selectedCategory; if(!QDir(m_jsonDir + m_selectedCategory).exists()) { qDebug() <count(); ++i) { - QListWidgetItem* currentItem = ui.lwDatasets->item(i); - QFile file(filePath + currentItem->text() + ".json"); + QListWidgetItem* const currentItem = ui.lwDatasets->item(i); + const QFile file(filePath + currentItem->text() + QLatin1String(".json")); if(file.exists()) currentItem->setBackgroundColor(Qt::yellow); else currentItem->setBackgroundColor(Qt::white); } } void ImportDatasetWidget::uploadCategoryFile() { /*KNS3::UploadDialog dialog("labplot2_datasets.knsrc", this); QFile file(m_jsonDir + "DatasetCategories.json"); qDebug() << "file " << m_jsonDir + "DatasetCategories.json "<< file.exists(); qDebug() << "file can be opened: " << file.open(QIODevice::ReadOnly) << " " << file.errorString(); file.close(); QUrl payloadFile ="file:" + m_jsonDir + "DatasetCategories.json"; QFile file2(payloadFile.toLocalFile()); qDebug() << "Local file: " << payloadFile.toLocalFile(); if (!file2.open(QIODevice::ReadOnly)) { qDebug() << i18n("File not found: %1 ", payloadFile.url()); } else { qDebug() << i18n("File found: %1 ", payloadFile.url()); } file2.close(); dialog.setUploadFile("file:" + m_jsonDir + "DatasetCategories.json"); qDebug("Upload file set!"); dialog.setUploadName("Dataset Categories"); qDebug() << "Upload name set: "; dialog.exec();*/ } void ImportDatasetWidget::uploadDatasetFile(const QString& filePath) { /*KNS3::UploadDialog dialog("labplot2_datasets.knsrc", this); QFile file(filePath); qDebug() << filePath + " " << file.exists(); qDebug() << "file can be opened: " << file.open(QIODevice::ReadOnly) << " " << file.errorString(); file.close(); QUrl payloadFile ="file:" + filePath; QFile file2(payloadFile.toLocalFile()); qDebug() << "Local file: " << payloadFile.toLocalFile(); if (!file2.open(QIODevice::ReadOnly)) { qDebug() << i18n("File not found: %1 ", payloadFile.url()); } else { qDebug() << i18n("File found: %1 ", payloadFile.url()); } file2.close(); dialog.setUploadFile("file:" + filePath); qDebug("Upload file set!"); dialog.setUploadName("Dataset Categories"); qDebug() << "Upload name set: "; dialog.exec();*/ } diff --git a/src/kdefrontend/datasources/ImportDatasetWidget.h b/src/kdefrontend/datasources/ImportDatasetWidget.h index 8df29e88d..24577d1b6 100644 --- a/src/kdefrontend/datasources/ImportDatasetWidget.h +++ b/src/kdefrontend/datasources/ImportDatasetWidget.h @@ -1,88 +1,88 @@ /*************************************************************************** File : ImportDatasetWidget.h Project : LabPlot Description : import online dataset widget -------------------------------------------------------------------- Copyright : (C) 2019 Kovacs Ferencz (kferike98@gmail.com) ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #ifndef IMPORTDATASETWIDGET_H #define IMPORTDATASETWIDGET_H #include "ui_importdatasetwidget.h" #include "QWidget" #include "backend/datasources/filters/AbstractFileFilter.h" #include "QMap" -#include "QCompleter" + +class QCompleter; class DatasetHandler; class ImportDatasetWidget : public QWidget { Q_OBJECT public: explicit ImportDatasetWidget(QWidget* parent); ~ImportDatasetWidget() override; AbstractFileFilter* currentFileFilter() const ; - QString getSelectedDataset(); + QString getSelectedDataset() const; void loadDatasetToProcess(DatasetHandler* datasetHandler); - QString locateCategoryJsonFile(); - + QString locateCategoryJsonFile() const; private: Ui::ImportDatasetWidget ui; mutable std::unique_ptr m_currentFilter; QMap>> m_datasetsMap; QString m_selectedSubcategory; QCompleter* m_categoryCompleter; QCompleter* m_datasetCompleter; - QString m_jsonDir=""; + QString m_jsonDir; bool m_loadingCategories; QString m_selectedCategory; void downloadCategoryFile(); void downloadDatasetFile(const QString&); void uploadCategoryFile(); void uploadDatasetFile(const QString&); void updateDatasetCompleter(); void updateCategoryCompleter(); void loadDatasetCategoriesFromJson(); void listDatasetsForSubcategory(QTreeWidgetItem* item); void restoreSelectedSubcategory(); void highlightLocalMetadataFiles(); private slots: void scrollToCategoryTreeItem(const QString& rootName); void scrollToDatasetListItem(const QString& rootName); void showDatasetMetadataManager(); void refreshCategories(); void clearCache(); signals: void datasetSelected(); }; #endif // IMPORTDATASETWIDGET_H