From 9bc87db31c2cf83ee05dd17cf92ee5bc18b0e969 2017-12-07 14:51:54 From: Thibaud Rabillard Date: 2017-12-07 14:51:54 Subject: [PATCH] Sub widget classes --- diff --git a/app/ui/MainWindow.ui b/app/ui/MainWindow.ui index 79fbee1..61ed24e 100644 --- a/app/ui/MainWindow.ui +++ b/app/ui/MainWindow.ui @@ -132,7 +132,7 @@ 0 0 800 - 28 + 21 diff --git a/gui/include/Catalogue/CatalogueEventsWidget.h b/gui/include/Catalogue/CatalogueEventsWidget.h new file mode 100644 index 0000000..721001e --- /dev/null +++ b/gui/include/Catalogue/CatalogueEventsWidget.h @@ -0,0 +1,21 @@ +#ifndef CATALOGUEEVENTSWIDGET_H +#define CATALOGUEEVENTSWIDGET_H + +#include + +namespace Ui { +class CatalogueEventsWidget; +} + +class CatalogueEventsWidget : public QWidget { + Q_OBJECT + +public: + explicit CatalogueEventsWidget(QWidget *parent = 0); + ~CatalogueEventsWidget(); + +private: + Ui::CatalogueEventsWidget *ui; +}; + +#endif // CATALOGUEEVENTSWIDGET_H diff --git a/gui/include/Catalogue/CatalogueInspectorWidget.h b/gui/include/Catalogue/CatalogueInspectorWidget.h new file mode 100644 index 0000000..d08f208 --- /dev/null +++ b/gui/include/Catalogue/CatalogueInspectorWidget.h @@ -0,0 +1,21 @@ +#ifndef CATALOGUEINSPECTORWIDGET_H +#define CATALOGUEINSPECTORWIDGET_H + +#include + +namespace Ui { +class CatalogueInspectorWidget; +} + +class CatalogueInspectorWidget : public QWidget { + Q_OBJECT + +public: + explicit CatalogueInspectorWidget(QWidget *parent = 0); + ~CatalogueInspectorWidget(); + +private: + Ui::CatalogueInspectorWidget *ui; +}; + +#endif // CATALOGUEINSPECTORWIDGET_H diff --git a/gui/include/Catalogue/CatalogueSideBarWidget.h b/gui/include/Catalogue/CatalogueSideBarWidget.h new file mode 100644 index 0000000..c4d8b53 --- /dev/null +++ b/gui/include/Catalogue/CatalogueSideBarWidget.h @@ -0,0 +1,21 @@ +#ifndef CATALOGUESIDEBARWIDGET_H +#define CATALOGUESIDEBARWIDGET_H + +#include + +namespace Ui { +class CatalogueSideBarWidget; +} + +class CatalogueSideBarWidget : public QWidget { + Q_OBJECT + +public: + explicit CatalogueSideBarWidget(QWidget *parent = 0); + ~CatalogueSideBarWidget(); + +private: + Ui::CatalogueSideBarWidget *ui; +}; + +#endif // CATALOGUESIDEBARWIDGET_H diff --git a/gui/meson.build b/gui/meson.build index ee7f16c..55e755d 100644 --- a/gui/meson.build +++ b/gui/meson.build @@ -20,7 +20,10 @@ gui_moc_headers = [ 'include/Visualization/ColorScaleEditor.h', 'include/Actions/SelectionZoneAction.h', 'include/Visualization/VisualizationMultiZoneSelectionDialog.h', - 'include/Catalogue/CatalogueExplorer.h' + 'include/Catalogue/CatalogueExplorer.h', + 'include/Catalogue/CatalogueEventsWidget.h', + 'include/Catalogue/CatalogueSideBarWidget.h', + 'include/Catalogue/CatalogueInspectorWidget.h' ] gui_ui_files = [ @@ -38,7 +41,10 @@ gui_ui_files = [ 'ui/Visualization/VisualizationZoneWidget.ui', 'ui/Visualization/ColorScaleEditor.ui', 'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui', - 'ui/Catalogue/CatalogueExplorer.ui' + 'ui/Catalogue/CatalogueExplorer.ui', + 'ui/Catalogue/CatalogueEventsWidget.ui', + 'ui/Catalogue/CatalogueSideBarWidget.ui', + 'ui/Catalogue/CatalogueInspectorWidget.ui' ] gui_qresources = ['resources/sqpguiresources.qrc'] @@ -94,7 +100,10 @@ gui_sources = [ 'src/Actions/ActionsGuiController.cpp', 'src/Visualization/VisualizationActionManager.cpp', 'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp', - 'src/Catalogue/CatalogueExplorer.cpp' + 'src/Catalogue/CatalogueExplorer.cpp', + 'src/Catalogue/CatalogueEventsWidget.cpp', + 'src/Catalogue/CatalogueSideBarWidget.cpp', + 'src/Catalogue/CatalogueInspectorWidget.cpp' ] gui_inc = include_directories(['include']) diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp new file mode 100644 index 0000000..0ee7227 --- /dev/null +++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp @@ -0,0 +1,13 @@ +#include "Catalogue/CatalogueEventsWidget.h" +#include "ui_CatalogueEventsWidget.h" + +CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent) + : QWidget(parent), ui(new Ui::CatalogueEventsWidget) +{ + ui->setupUi(this); +} + +CatalogueEventsWidget::~CatalogueEventsWidget() +{ + delete ui; +} diff --git a/gui/src/Catalogue/CatalogueInspectorWidget.cpp b/gui/src/Catalogue/CatalogueInspectorWidget.cpp new file mode 100644 index 0000000..1e3ee05 --- /dev/null +++ b/gui/src/Catalogue/CatalogueInspectorWidget.cpp @@ -0,0 +1,13 @@ +#include "Catalogue/CatalogueInspectorWidget.h" +#include "ui_CatalogueInspectorWidget.h" + +CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent) + : QWidget(parent), ui(new Ui::CatalogueInspectorWidget) +{ + ui->setupUi(this); +} + +CatalogueInspectorWidget::~CatalogueInspectorWidget() +{ + delete ui; +} diff --git a/gui/src/Catalogue/CatalogueSideBarWidget.cpp b/gui/src/Catalogue/CatalogueSideBarWidget.cpp new file mode 100644 index 0000000..0be4394 --- /dev/null +++ b/gui/src/Catalogue/CatalogueSideBarWidget.cpp @@ -0,0 +1,13 @@ +#include "Catalogue/CatalogueSideBarWidget.h" +#include "ui_CatalogueSideBarWidget.h" + +CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent) + : QWidget(parent), ui(new Ui::CatalogueSideBarWidget) +{ + ui->setupUi(this); +} + +CatalogueSideBarWidget::~CatalogueSideBarWidget() +{ + delete ui; +} diff --git a/gui/ui/Catalogue/CatalogueEventsWidget.ui b/gui/ui/Catalogue/CatalogueEventsWidget.ui new file mode 100644 index 0000000..51335c3 --- /dev/null +++ b/gui/ui/Catalogue/CatalogueEventsWidget.ui @@ -0,0 +1,19 @@ + + + CatalogueEventsWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + diff --git a/gui/ui/Catalogue/CatalogueExplorer.ui b/gui/ui/Catalogue/CatalogueExplorer.ui index 3a12e78..70fe42d 100644 --- a/gui/ui/Catalogue/CatalogueExplorer.ui +++ b/gui/ui/Catalogue/CatalogueExplorer.ui @@ -6,14 +6,51 @@ 0 0 - 403 - 300 + 775 + 512 - Dialog + Catalogue Explorer + + + + + Qt::Horizontal + + + + + Qt::Vertical + + + + + + + + + + CatalogueSideBarWidget + QWidget +
Catalogue/CatalogueSideBarWidget.h
+ 1 +
+ + CatalogueEventsWidget + QWidget +
Catalogue/CatalogueEventsWidget.h
+ 1 +
+ + CatalogueInspectorWidget + QWidget +
Catalogue/CatalogueInspectorWidget.h
+ 1 +
+
diff --git a/gui/ui/Catalogue/CatalogueInspectorWidget.ui b/gui/ui/Catalogue/CatalogueInspectorWidget.ui new file mode 100644 index 0000000..9a27c23 --- /dev/null +++ b/gui/ui/Catalogue/CatalogueInspectorWidget.ui @@ -0,0 +1,19 @@ + + + CatalogueInspectorWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + diff --git a/gui/ui/Catalogue/CatalogueSideBarWidget.ui b/gui/ui/Catalogue/CatalogueSideBarWidget.ui new file mode 100644 index 0000000..4fd27b2 --- /dev/null +++ b/gui/ui/Catalogue/CatalogueSideBarWidget.ui @@ -0,0 +1,19 @@ + + + CatalogueSideBarWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + +