From cee2ad93ade98b53525c1e66f958267afbdd1c74 2017-12-07 14:51:25 From: Thibaud Rabillard Date: 2017-12-07 14:51:25 Subject: [PATCH] Adds the new CatalogueExplorer dialog --- diff --git a/gui/include/Catalogue/CatalogueExplorer.h b/gui/include/Catalogue/CatalogueExplorer.h new file mode 100644 index 0000000..0e433f2 --- /dev/null +++ b/gui/include/Catalogue/CatalogueExplorer.h @@ -0,0 +1,21 @@ +#ifndef SCIQLOP_CATALOGUEEXPLORER_H +#define SCIQLOP_CATALOGUEEXPLORER_H + +#include + +namespace Ui { +class CatalogueExplorer; +} + +class CatalogueExplorer : public QDialog { + Q_OBJECT + +public: + explicit CatalogueExplorer(QWidget *parent = 0); + virtual ~CatalogueExplorer(); + +private: + Ui::CatalogueExplorer *ui; +}; + +#endif // SCIQLOP_CATALOGUEEXPLORER_H diff --git a/gui/meson.build b/gui/meson.build index 6e63bb2..ee7f16c 100644 --- a/gui/meson.build +++ b/gui/meson.build @@ -19,7 +19,8 @@ gui_moc_headers = [ 'include/Visualization/VisualizationDragWidget.h', 'include/Visualization/ColorScaleEditor.h', 'include/Actions/SelectionZoneAction.h', - 'include/Visualization/VisualizationMultiZoneSelectionDialog.h' + 'include/Visualization/VisualizationMultiZoneSelectionDialog.h', + 'include/Catalogue/CatalogueExplorer.h' ] gui_ui_files = [ @@ -36,7 +37,8 @@ gui_ui_files = [ 'ui/Visualization/VisualizationWidget.ui', 'ui/Visualization/VisualizationZoneWidget.ui', 'ui/Visualization/ColorScaleEditor.ui', - 'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui' + 'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui', + 'ui/Catalogue/CatalogueExplorer.ui' ] gui_qresources = ['resources/sqpguiresources.qrc'] @@ -91,7 +93,8 @@ gui_sources = [ 'src/Actions/SelectionZoneAction.cpp', 'src/Actions/ActionsGuiController.cpp', 'src/Visualization/VisualizationActionManager.cpp', - 'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp' + 'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp', + 'src/Catalogue/CatalogueExplorer.cpp' ] gui_inc = include_directories(['include']) diff --git a/gui/src/Catalogue/CatalogueExplorer.cpp b/gui/src/Catalogue/CatalogueExplorer.cpp new file mode 100644 index 0000000..e4aeeeb --- /dev/null +++ b/gui/src/Catalogue/CatalogueExplorer.cpp @@ -0,0 +1,13 @@ +#include "Catalogue/CatalogueExplorer.h" +#include "ui_CatalogueExplorer.h" + +CatalogueExplorer::CatalogueExplorer(QWidget *parent) + : QDialog(parent), ui(new Ui::CatalogueExplorer) +{ + ui->setupUi(this); +} + +CatalogueExplorer::~CatalogueExplorer() +{ + delete ui; +} diff --git a/gui/ui/Catalogue/CatalogueExplorer.ui b/gui/ui/Catalogue/CatalogueExplorer.ui new file mode 100644 index 0000000..3a12e78 --- /dev/null +++ b/gui/ui/Catalogue/CatalogueExplorer.ui @@ -0,0 +1,19 @@ + + + CatalogueExplorer + + + + 0 + 0 + 403 + 300 + + + + Dialog + + + + +