HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1410:143f4d9b5628

Updated Meson build definitions...

jeandet -

r1410:143f4d9b5628

parent child

Context file:

r1410:143f4d9b5628

subprojects/catalogicpp.wrap created 644 +5 0

@@ -0,0 +1,5
	1	[wrap-git]
	2	directory = catalogicpp
	3	url = https://github.com/jeandet/catalogicpp.git
	4	revision = master
	5

subprojects/stduuid.wrap created 644 +5 0

@@ -0,0 +1,5
	1	[wrap-git]
	2	directory = stduuid
	3	url = https://github.com/jeandet/stduuid.git
	4	revision = meson
	5

app/src/MainWindow.cpp +1 -1

             /*------------------------------------------------------------------------------
             -- This file is a part of the SciQLop Software
             -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
             --
             -- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "MainWindow.h"
             #include "ui_MainWindow.h"
             #include <Catalogue/CatalogueController.h>
-            #include <Catalogue/CatalogueExplorer.h>
+            //#include <Catalogue/CatalogueExplorer.h>
             #include <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceWidget.h>
             #include <Settings/SqpSettingsDialog.h>
             #include <Settings/SqpSettingsGeneralWidget.h>
             #include <SidePane/SqpSidePane.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <TimeWidget/TimeWidget.h>
             #include <Variable/Variable.h>
             #include <Visualization/VisualizationController.h>
             #include <QAction>
             #include <QCloseEvent>
             #include <QDate>
             #include <QDir>
             #include <QFileDialog>
             #include <QMessageBox>
             #include <QToolBar>
             #include <QToolButton>
             #include <memory.h>
             #include "iostream"
             Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow")
             namespace
             {
             const auto LEFTMAININSPECTORWIDGETSPLITTERINDEX = 0;
             const auto LEFTINSPECTORSIDEPANESPLITTERINDEX = 1;
             const auto VIEWPLITTERINDEX = 2;
             const auto RIGHTINSPECTORSIDEPANESPLITTERINDEX = 3;
             const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4;
             }
             class MainWindow::MainWindowPrivate
             {
             public:
                 explicit MainWindowPrivate(MainWindow* mainWindow)
                         : m_LastOpenLeftInspectorSize {}
                         , m_LastOpenRightInspectorSize {}
                         , m_GeneralSettingsWidget { new SqpSettingsGeneralWidget { mainWindow } }
                         , m_SettingsDialog { new SqpSettingsDialog { mainWindow } }
                 //, m_CatalogExplorer { new CatalogueExplorer { mainWindow } }
                 {
                 }
                 QSize m_LastOpenLeftInspectorSize;
                 QSize m_LastOpenRightInspectorSize;
                 /// General settings widget. MainWindow has the ownership
                 SqpSettingsGeneralWidget* m_GeneralSettingsWidget;
                 /// Settings dialog. MainWindow has the ownership
                 SqpSettingsDialog* m_SettingsDialog;
                 /// Catalogue dialog. MainWindow has the ownership
                 // CatalogueExplorer* m_CatalogExplorer;
                 bool checkDataToSave(QWidget* parentWidget);
             };
             MainWindow::MainWindow(QWidget* parent)
                     : QMainWindow { parent }
                     , m_Ui { new Ui::MainWindow }
                     , impl { spimpl::make_unique_impl<MainWindowPrivate>(this) }
             {
                 m_Ui->setupUi(this);
                 m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false);
                 m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false);
                 // impl->m_CatalogExplorer->setVisualizationWidget(m_Ui->view);
                 auto spacerLeftTop = new QWidget {};
                 spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerLeftBottom = new QWidget {};
                 spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerRightTop = new QWidget {};
                 spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerRightBottom = new QWidget {};
                 spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto openInspector = [this](bool checked, bool right, auto action) {
                     action->setIcon(
                         QIcon { (checked ^ right) ? ":/icones/next.png" : ":/icones/previous.png" });
                     auto& lastInspectorSize
                         = right ? impl->m_LastOpenRightInspectorSize : impl->m_LastOpenLeftInspectorSize;
                     auto nextInspectorSize = right ? m_Ui->rightMainInspectorWidget->size()
                                                    : m_Ui->leftMainInspectorWidget->size();
                     // Update of the last opened geometry
                     if (checked)
                     {
                         lastInspectorSize = nextInspectorSize;
                     }
                     auto startSize = lastInspectorSize;
                     auto endSize = startSize;
                     endSize.setWidth(0);
                     auto splitterInspectorIndex
                         = right ? RIGHTMAININSPECTORWIDGETSPLITTERINDEX : LEFTMAININSPECTORWIDGETSPLITTERINDEX;
                     auto currentSizes = m_Ui->splitter->sizes();
                     if (checked)
                     {
                         // adjust sizes individually here, e.g.
                         currentSizes[splitterInspectorIndex] -= lastInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] += lastInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                     else
                     {
                         // adjust sizes individually here, e.g.
                         currentSizes[splitterInspectorIndex] += lastInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] -= lastInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                 };
                 // //////////////// //
                 // Menu and Toolbar //
                 // //////////////// //
                 this->menuBar()->addAction(tr("File"));
                 auto toolsMenu = this->menuBar()->addMenu(tr("Tools"));
                 toolsMenu->addAction(tr("Settings..."), [this]() {
                     // Loads settings
                     impl->m_SettingsDialog->loadSettings();
                     // Open settings dialog and save settings if the dialog is accepted
                     if (impl->m_SettingsDialog->exec() == QDialog::Accepted)
                     {
                         impl->m_SettingsDialog->saveSettings();
                     }
                 });
                 auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar"));
                 auto timeWidget = new TimeWidget {};
                 mainToolBar->addWidget(timeWidget);
                 // Interaction modes
                 auto actionPointerMode = new QAction { QIcon(":/icones/pointer.png"), "Move", this };
                 actionPointerMode->setCheckable(true);
                 actionPointerMode->setChecked(
                     sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::None);
                 connect(actionPointerMode, &QAction::triggered,
                     []() { sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::None); });
                 auto actionZoomMode = new QAction { QIcon(":/icones/zoom.png"), "Zoom", this };
                 actionZoomMode->setCheckable(true);
                 actionZoomMode->setChecked(
                     sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::ZoomBox);
                 connect(actionZoomMode, &QAction::triggered,
                     []() { sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::ZoomBox); });
                 auto actionOrganisationMode = new QAction { QIcon(":/icones/drag.png"), "Organize", this };
                 actionOrganisationMode->setCheckable(true);
                 actionOrganisationMode->setChecked(
                     sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::DragAndDrop);
                 connect(actionOrganisationMode, &QAction::triggered, []() {
                     sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::DragAndDrop);
                 });
                 auto actionZonesMode = new QAction { QIcon(":/icones/rectangle.png"), "Zones", this };
                 actionZonesMode->setCheckable(true);
                 actionZonesMode->setChecked(
                     sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones);
                 connect(actionZonesMode, &QAction::triggered, []() {
                     sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::SelectionZones);
                 });
                 auto modeActionGroup = new QActionGroup { this };
                 modeActionGroup->addAction(actionZoomMode);
                 modeActionGroup->addAction(actionZonesMode);
                 modeActionGroup->addAction(actionOrganisationMode);
                 modeActionGroup->addAction(actionPointerMode);
                 modeActionGroup->setExclusive(true);
                 mainToolBar->addSeparator();
                 mainToolBar->addAction(actionPointerMode);
                 mainToolBar->addAction(actionZoomMode);
                 mainToolBar->addAction(actionOrganisationMode);
                 mainToolBar->addAction(actionZonesMode);
                 mainToolBar->addSeparator();
                 // Cursors
                 auto btnCursor = new QToolButton { this };
                 btnCursor->setIcon(QIcon(":/icones/cursor.png"));
                 btnCursor->setText("Cursor");
                 btnCursor->setToolTip("Cursor");
                 btnCursor->setPopupMode(QToolButton::InstantPopup);
                 auto cursorMenu = new QMenu("CursorMenu", this);
                 btnCursor->setMenu(cursorMenu);
                 auto noCursorAction = cursorMenu->addAction("No Cursor");
                 noCursorAction->setCheckable(true);
                 noCursorAction->setChecked(
                     sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::NoCursor);
                 connect(noCursorAction, &QAction::triggered,
                     []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::NoCursor); });
                 cursorMenu->addSeparator();
                 auto verticalCursorAction = cursorMenu->addAction("Vertical Cursor");
                 verticalCursorAction->setCheckable(true);
                 verticalCursorAction->setChecked(
                     sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Vertical);
                 connect(verticalCursorAction, &QAction::triggered,
                     []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Vertical); });
                 auto temporalCursorAction = cursorMenu->addAction("Temporal Cursor");
                 temporalCursorAction->setCheckable(true);
                 temporalCursorAction->setChecked(
                     sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Temporal);
                 connect(temporalCursorAction, &QAction::triggered,
                     []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Temporal); });
                 auto horizontalCursorAction = cursorMenu->addAction("Horizontal Cursor");
                 horizontalCursorAction->setCheckable(true);
                 horizontalCursorAction->setChecked(
                     sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Horizontal);
                 connect(horizontalCursorAction, &QAction::triggered,
                     []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Horizontal); });
                 auto crossCursorAction = cursorMenu->addAction("Cross Cursor");
                 crossCursorAction->setCheckable(true);
                 crossCursorAction->setChecked(
                     sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Cross);
                 connect(crossCursorAction, &QAction::triggered,
                     []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Cross); });
                 mainToolBar->addWidget(btnCursor);
                 auto cursorModeActionGroup = new QActionGroup { this };
                 cursorModeActionGroup->setExclusive(true);
                 cursorModeActionGroup->addAction(noCursorAction);
                 cursorModeActionGroup->addAction(verticalCursorAction);
                 cursorModeActionGroup->addAction(temporalCursorAction);
                 cursorModeActionGroup->addAction(horizontalCursorAction);
                 cursorModeActionGroup->addAction(crossCursorAction);
                 // Catalog
                 mainToolBar->addSeparator();
                 //    mainToolBar->addAction(QIcon(":/icones/catalogue.png"), "Catalogues",
                 //        [this]() { impl->m_CatalogExplorer->show(); });
                 // //////// //
                 // Settings //
                 // //////// //
                 // Registers "general settings" widget to the settings dialog
                 impl->m_SettingsDialog->registerWidget(
                     QStringLiteral("General"), impl->m_GeneralSettingsWidget);
                 // /////////// //
                 // Connections //
                 // /////////// //
                 // Controllers / controllers connections
                 //    connect(&sqpApp->timeController(), SIGNAL(timeUpdated(DateTimeRange)),
                 //    &sqpApp->variableController(),
                 //            SLOT(onDateTimeOnSelection(DateTimeRange)));
                 // Widgets / controllers connections
                 // DataSource
                 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem*)),
                     m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem*)));
                 // Time
                 connect(timeWidget, SIGNAL(timeUpdated(DateTimeRange)), &sqpApp->timeController(),
                     SLOT(onTimeToUpdate(DateTimeRange)));
                 // Visualization
                 connect(&sqpApp->visualizationController(),
                     SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), m_Ui->view,
                     SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>)));
                 connect(&sqpApp->visualizationController(),
                     SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange&)), m_Ui->view,
                     SLOT(onRangeChanged(std::shared_ptr<Variable>, const DateTimeRange&)));
                 // Widgets / widgets connections
                 // For the following connections, we use DirectConnection to allow each widget that can
                 // potentially attach a menu to the variable's menu to do so before this menu is displayed.
                 // The order of connections is also important, since it determines the order in which each
                 // widget will attach its menu
                 connect(m_Ui->variableInspectorWidget,
                     SIGNAL(tableMenuAboutToBeDisplayed(QMenu*, const QVector<std::shared_ptr<Variable>>&)),
                     m_Ui->view, SLOT(attachVariableMenu(QMenu*, const QVector<std::shared_ptr<Variable>>&)),
                     Qt::DirectConnection);
             }
             MainWindow::~MainWindow() {}
             void MainWindow::changeEvent(QEvent* e)
             {
                 QMainWindow::changeEvent(e);
                 switch (e->type())
                 {
                     case QEvent::LanguageChange:
                         m_Ui->retranslateUi(this);
                         break;
                     default:
                         break;
                 }
             }
             void MainWindow::closeEvent(QCloseEvent* event)
             {
                 if (!impl->checkDataToSave(this))
                 {
                     event->ignore();
                 }
                 else
                 {
                     event->accept();
                 }
             }
             void MainWindow::keyPressEvent(QKeyEvent* event)
             {
                 switch (event->key())
                 {
                     case Qt::Key_F11:
                         if (this->isFullScreen())
                         {
                             this->showNormal();
                         }
                         else
                         {
                             this->showFullScreen();
                         }
                         break;
                     default:
                         break;
                 }
             }
             bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget* parentWidget)
             {
                 //    auto hasChanges = sqpApp->catalogueController().hasChanges();
                 //    if (hasChanges)
                 //    {
                 //        // There are some unsaved changes
                 //        switch (QMessageBox::question(parentWidget, tr("Save changes"),
                 //            tr("The catalogue controller has unsaved changes.\nDo you want to save them ?"),
                 //            QMessageBox::SaveAll | QMessageBox::Discard | QMessageBox::Cancel,
                 //            QMessageBox::SaveAll))
                 //        {
                 //            case QMessageBox::SaveAll:
                 //                sqpApp->catalogueController().saveAll();
                 //                break;
                 //            case QMessageBox::Discard:
                 //                break;
                 //            case QMessageBox::Cancel:
                 //            default:
                 //                return false;
                 //        }
                 //    }
                 return true;
             }

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 0093c733b640e07ebeaf204c1ed1279db095aa9f		1	Subproject commit 24f31ec545d2e177fc2212ecdb457e01533b6fbb

gui/meson.build +127 -104

@@ -1,145 +1,168
1		1
2	gui_moc_headers = [	2	gui_moc_headers = [
3	'include/DataSource/DataSourceWidget.h',	3	'./include/Common/VisualizationDef.h',
4	'include/Settings/SqpSettingsDialog.h',	4	'./include/Common/ColorUtils.h',
5	'include/Settings/SqpSettingsGeneralWidget.h',	5	'./include/DragAndDrop/DragDropGuiController.h',
6	'include/SidePane/SqpSidePane.h',	6	'./include/DragAndDrop/DragDropTabSwitcher.h',
7	'include/SqpApplication.h',	7	'./include/DragAndDrop/DragDropScroller.h',
8	'include/DragAndDrop/DragDropScroller.h',	8	'./include/Settings/SqpSettingsDialog.h',
9	'include/DragAndDrop/DragDropTabSwitcher.h',	9	'./include/Settings/SqpSettingsGeneralWidget.h',
10	'include/TimeWidget/TimeWidget.h',	10	'./include/DataSource/DataSourceTreeWidgetHelper.h',
11	'include/Variable/VariableInspectorWidget.h',	11	'./include/DataSource/DataSourceTreeWidget.h',
12	'include/Variable/RenameVariableDialog.h',	12	'./include/DataSource/DataSourceTreeWidgetItem.h',
13	'include/Visualization/qcustomplot.h',	13	'./include/DataSource/DataSourceWidget.h',
14	'include/Visualization/VisualizationGraphWidget.h',	14	'./include/Catalogue2/repositoriestreeview.h',
15	'include/Visualization/VisualizationTabWidget.h',	15	'./include/Catalogue2/browser.h',
16	'include/Visualization/VisualizationWidget.h',	16	'./include/Catalogue2/eventeditor.h',
17	'include/Visualization/VisualizationZoneWidget.h',	17	'./include/Catalogue2/eventsmodel.h',
18	'include/Visualization/VisualizationDragDropContainer.h',	18	'./include/Catalogue2/eventstreeview.h',
19	'include/Visualization/VisualizationDragWidget.h',	19	'./include/Catalogue2/repositoriesmodel.h',
20	'include/Visualization/ColorScaleEditor.h',	20	'./include/TimeWidget/TimeWidget.h',
21	'include/Visualization/VisualizationSelectionZoneItem.h',	21	'./include/SqpApplication.h',
22	'include/Actions/SelectionZoneAction.h',	22	'./include/SidePane/SqpSidePane.h',
23	'include/Visualization/VisualizationMultiZoneSelectionDialog.h',	23	'./include/Variable/RenameVariableDialog.h',
24	'include/Catalogue/CatalogueExplorer.h',	24	'./include/Variable/VariableInspectorWidget.h',
25	'include/Catalogue/CatalogueEventsWidget.h',	25	'./include/Variable/VariableInspectorTableView.h',
26	'include/~~Catalogue/CatalogueSideBa~~rWidget.h',	26	'./include/Variable/VariableMenuHeaderWidget.h',
27	'include/Catalogue/CatalogueInspectorWidget.h',	27	'./include/Visualization/VisualizationDragWidget.h',
28	'include/Catalogue/CatalogueEventsModel.h',	28	'./include/Visualization/VisualizationZoneWidget.h',
29	'include/Catalogue/CatalogueTreeModel.h',	29	'./include/Visualization/operations/GenerateVariableMenuOperation.h',
30	'include/Actions/FilteringAction.h'	30	'./include/Visualization/operations/RescaleAxeOperation.h',
		31	'./include/Visualization/operations/RemoveVariableOperation.h',
		32	'./include/Visualization/operations/MenuBuilder.h',
		33	'./include/Visualization/operations/FindVariableOperation.h',
		34	'./include/Visualization/VisualizationDefs.h',
		35	'./include/Visualization/IVisualizationWidgetVisitor.h',
		36	'./include/Visualization/SqpColorScale.h',
		37	'./include/Visualization/VisualizationGraphRenderingDelegate.h',
		38	'./include/Visualization/VisualizationGraphWidget.h',
		39	'./include/Visualization/MacScrollBarStyle.h',
		40	'./include/Visualization/IVisualizationWidget.h',
		41	'./include/Visualization/qcustomplot.h',
		42	'./include/Visualization/IGraphSynchronizer.h',
		43	'./include/Visualization/QCPColorMapIterator.h',
		44	'./include/Visualization/VisualizationActionManager.h',
		45	'./include/Visualization/VisualizationTabWidget.h',
		46	'./include/Visualization/IVariableContainer.h',
		47	'./include/Visualization/AxisRenderingUtils.h',
		48	'./include/Visualization/VisualizationMultiZoneSelectionDialog.h',
		49	'./include/Visualization/VisualizationCursorItem.h',
		50	'./include/Visualization/VisualizationWidget.h',
		51	'./include/Visualization/PlottablesRenderingUtils.h',
		52	'./include/Visualization/VisualizationSelectionZoneManager.h',
		53	'./include/Visualization/QCustomPlotSynchronizer.h',
		54	'./include/Visualization/VisualizationSelectionZoneItem.h',
		55	'./include/Visualization/VisualizationDragDropContainer.h',
		56	'./include/Visualization/ColorScaleEditor.h',
		57	'./include/Visualization/VisualizationGraphHelper.h',
		58	'./include/Actions/ActionsGuiController.h',
		59	'./include/Actions/FilteringAction.h',
		60	'./include/Actions/SelectionZoneAction.h'
31	]	61	]
32		62
33	gui_ui_files = [	63	gui_ui_files = [
34	'ui/DataSource/DataSourceWidget.ui',	64	'./ui/Settings/SqpSettingsGeneralWidget.ui',
35	'ui/Settings/SqpSettingsDialog.ui',	65	'./ui/Settings/SqpSettingsDialog.ui',
36	'ui/Settings/SqpSettingsGeneralWidget.ui',	66	'./ui/DataSource/DataSourceWidget.ui',
37	'ui/SidePane/SqpSidePane.ui',	67	'./ui/Catalogue2/browser.ui',
38	'ui/TimeWidget/TimeWidget.ui',	68	'./ui/Catalogue2/eventeditor.ui',
39	'ui/Variable/VariableInspectorWidget.ui',	69	'./ui/TimeWidget/TimeWidget.ui',
40	'ui/Variable/RenameVariableDialog.ui',	70	'./ui/SidePane/SqpSidePane.ui',
41	'ui/Variable/Variable~~MenuHeaderWidget~~.ui',	71	'./ui/Variable/RenameVariableDialog.ui',
42	'ui/Visualization/VisualizationGraphWidget.ui',	72	'./ui/Variable/VariableInspectorWidget.ui',
43	'ui/Visualization/VisualizationTabWidget.ui',	73	'./ui/Variable/VariableMenuHeaderWidget.ui',
44	'ui/Visualization/~~VisualizationWidget~~.ui',	74	'./ui/Visualization/ColorScaleEditor.ui',
45	'ui/Visualization/VisualizationZoneWidget.ui',	75	'./ui/Visualization/VisualizationZoneWidget.ui',
46	'ui/Visualization/ColorScaleEditor.ui',	76	'./ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
47	'ui/Visualization/Visualization~~MultiZoneSelectionDialog~~.ui',	77	'./ui/Visualization/VisualizationGraphWidget.ui',
48	'ui/Catalogue/CatalogueExplorer.ui',	78	'./ui/Visualization/VisualizationWidget.ui',
49	'ui/Catalogue/CatalogueEventsWidget.ui',	79	'./ui/Visualization/VisualizationTabWidget.ui'
50	'ui/Catalogue/CatalogueSideBarWidget.ui',
51	'ui/Catalogue/CatalogueInspectorWidget.ui'
52	]	80	]
53		81
54	gui_qresources = ['resources/sqpguiresources.qrc']	82	gui_qresources = ['resources/sqpguiresources.qrc']
55		83
56	rcc_gen = generator(rcc,	84	rcc_gen = generator(rcc,
57	output : 'qrc_@BASENAME@.cpp',	85	output : 'qrc_@BASENAME@.cpp',
58	arguments : [	86	arguments : [
59	'--output',	87	'--output',
60	'@OUTPUT@',	88	'@OUTPUT@',
61	'@INPUT@',	89	'@INPUT@',
62	'@EXTRA_ARGS@'])	90	'@EXTRA_ARGS@'])
63		91
64	rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources'])	92	rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources'])
65		93
66	gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,	94	gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
67	ui_files : gui_ui_files)	95	ui_files : gui_ui_files)
68		96
69	gui_sources = [	97	gui_sources = [
70	'src/SqpApplication.cpp',	98	'./src/Common/ColorUtils.cpp',
71	'src/DragAndDrop/DragDropGuiController.cpp',	99	'./src/Common/VisualizationDef.cpp',
72	'src/DragAndDrop/DragDropScroller.cpp',	100	'./src/SqpApplication.cpp',
73	'src/DragAndDrop/DragDropTabSwitcher.cpp',	101	'./src/DragAndDrop/DragDropTabSwitcher.cpp',
74	'src/Common/ColorUtils.cpp',	102	'./src/DragAndDrop/DragDropScroller.cpp',
75	'src/Common/VisualizationDef.cpp',	103	'./src/DragAndDrop/DragDropGuiController.cpp',
76	'src/DataSource/DataSourceTreeWidgetItem.cpp',	104	'./src/Settings/SqpSettingsGeneralWidget.cpp',
77	'src/DataSource/DataSourceTreeWidgetHelper.cpp',	105	'./src/Settings/SqpSettingsDialog.cpp',
78	'src/DataSource/DataSourceWidget.cpp',	106	'./src/DataSource/DataSourceTreeWidgetItem.cpp',
79	'src/DataSource/DataSourceTreeWidget.cpp',	107	'./src/DataSource/DataSourceTreeWidgetHelper.cpp',
80	'src/Settings/SqpSettingsDialog.cpp',	108	'./src/DataSource/DataSourceWidget.cpp',
81	'src/Settings/SqpSettingsGeneralWidget.cpp',	109	'./src/DataSource/DataSourceTreeWidget.cpp',
82	'src/SidePane/SqpSidePane.cpp',	110	'./src/Catalogue2/eventstreeview.cpp',
83	'src/TimeWidget/TimeWidget.cpp',	111	'./src/Catalogue2/eventeditor.cpp',
84	'src/Variable/VariableInspectorWidget.cpp',	112	'./src/Catalogue2/repositoriestreeview.cpp',
85	'src/Variable/VariableInspectorTableView.cpp',	113	'./src/Catalogue2/browser.cpp',
86	'src/Variable/VariableMenuHeaderWidget.cpp',	114	'./src/Catalogue2/eventsmodel.cpp',
87	'src/Variable/RenameVariableDialog.cpp',	115	'./src/Catalogue2/repositoriesmodel.cpp',
88	'src/Visualization/VisualizationGraphHelper.cpp',	116	'./src/TimeWidget/TimeWidget.cpp',
89	'src/Visualization/VisualizationGraphRenderingDelegate.cpp',	117	'./src/SidePane/SqpSidePane.cpp',
90	'src/Visualization/VisualizationGraphWidget.cpp',	118	'./src/Variable/VariableInspectorTableView.cpp',
91	'src/Visualization/VisualizationTabWidget.cpp',	119	'./src/Variable/VariableInspectorWidget.cpp',
92	'src/Visualization/VisualizationWidget.cpp',	120	'./src/Variable/RenameVariableDialog.cpp',
93	'src/Visualization/VisualizationZoneWidget.cpp',	121	'./src/Variable/VariableMenuHeaderWidget.cpp',
94	'src/Visualization/~~qcustomplo~~t.cpp',	122	'./src/Visualization/VisualizationGraphWidget.cpp',
95	'src/Visualization/~~QCustomPlotSynchronizer~~.cpp',	123	'./src/Visualization/PlottablesRenderingUtils.cpp',
96	'src/Visualization/operations/FindVariableOperation.cpp',	124	'./src/Visualization/AxisRenderingUtils.cpp',
97	'src/Visualization/operations/GenerateVariableMenuOperation.cpp',	125	'./src/Visualization/VisualizationWidget.cpp',
98	'src/Visualization/~~operations/MenuBuilder~~.cpp',	126	'./src/Visualization/qcustomplot.cpp',
99	'src/Visualization/~~operations/RemoveVariableOperation~~.cpp',	127	'./src/Visualization/VisualizationDragWidget.cpp',
100	'src/Visualization/~~operations/RescaleAxeOperation~~.cpp',	128	'./src/Visualization/VisualizationActionManager.cpp',
101	'src/Visualization/~~VisualizationDragDropContainer~~.cpp',	129	'./src/Visualization/MacScrollBarStyle.cpp',
102	'src/Visualization/Visualization~~DragWidget~~.cpp',	130	'./src/Visualization/VisualizationSelectionZoneManager.cpp',
103	'src/Visualization/~~AxisRenderingUtils~~.cpp',	131	'./src/Visualization/operations/FindVariableOperation.cpp',
104	'src/Visualization/~~PlottablesRenderingUtils~~.cpp',	132	'./src/Visualization/operations/RescaleAxeOperation.cpp',
105	'src/Visualization/MacScrollBarStyle.cpp',	133	'./src/Visualization/operations/MenuBuilder.cpp',
106	'src/Visualization/VisualizationCursorItem.cpp',	134	'./src/Visualization/operations/GenerateVariableMenuOperation.cpp',
107	'src/Visualization/~~ColorScaleEditor~~.cpp',	135	'./src/Visualization/operations/RemoveVariableOperation.cpp',
108	'src/Visualization/SqpColorScale.cpp',	136	'./src/Visualization/VisualizationSelectionZoneItem.cpp',
109	'src/Visualization/~~QCPColorMapIterator~~.cpp',	137	'./src/Visualization/VisualizationCursorItem.cpp',
110	'src/Visualization/VisualizationSelectionZoneItem.cpp',	138	'./src/Visualization/QCPColorMapIterator.cpp',
111	'src/Visualization/VisualizationSelectionZoneManager.cpp',	139	'./src/Visualization/QCustomPlotSynchronizer.cpp',
112	'src/Actions/SelectionZoneAction.cpp',	140	'./src/Visualization/ColorScaleEditor.cpp',
113	'src/Actions/ActionsGuiController.cpp',	141	'./src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
114	'src/Actions/FilteringAction.cpp',	142	'./src/Visualization/VisualizationTabWidget.cpp',
115	'src/Visualization/Visualization~~ActionManag~~er.cpp',	143	'./src/Visualization/VisualizationGraphHelper.cpp',
116	'src/Visualization/Visualization~~MultiZoneSelectionDialog~~.cpp',	144	'./src/Visualization/VisualizationGraphRenderingDelegate.cpp',
117	'src/Catalogue/CatalogueExplorer.cpp',	145	'./src/Visualization/VisualizationDragDropContainer.cpp',
118	'src/Catalogue/CatalogueEventsWidget.cpp',	146	'./src/Visualization/VisualizationZoneWidget.cpp',
119	'src/Catalogue/CatalogueSideBarWidget.cpp',	147	'./src/Visualization/SqpColorScale.cpp',
120	'src/Catalogue/CatalogueInspectorWidget.cpp',	148	'./src/Actions/FilteringAction.cpp',
121	'src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp',	149	'./src/Actions/SelectionZoneAction.cpp',
122	'src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp',	150	'./src/Actions/ActionsGuiController.cpp',
123	'src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp',
124	'src/Catalogue/CatalogueEventsModel.cpp',
125	'src/Catalogue/CatalogueExplorerHelper.cpp',
126	'src/Catalogue/CatalogueActionManager.cpp',
127	'src/Catalogue/CatalogueTreeModel.cpp'
128	]	151	]
129		152
130	gui_inc = include_directories(['include', 'include/Visualization'])	153	gui_inc = include_directories(['include', 'include/Visualization'])
131		154
132	sciqlop_gui_lib = library('sciqlopgui',	155	sciqlop_gui_lib = library('sciqlopgui',
133	gui_sources,	156	gui_sources,
134	gui_moc_files,	157	gui_moc_files,
135	rcc_files,	158	rcc_files,
136	include_directories : [gui_inc],	159	include_directories : [gui_inc],
137	dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],	160	dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
138	install : true	161	install : true
139	)	162	)
140		163
141	sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,	164	sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
142	include_directories : gui_inc,	165	include_directories : gui_inc,
143	dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])	166	dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])
144		167
145		168

gui/include/Catalogue/CatalogueActionManager.h removed 0 -20

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueEventsModel.h removed 0 -85

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueEventsWidget.h removed 0 -72

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueExplorer.h removed 0 -43

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueExplorerHelper.h removed 0 -13

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueInspectorWidget.h removed 0 -51

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueSideBarWidget.h removed 0 -57

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h removed 0 -36

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h removed 0 -23

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueTreeItems/CatalogueTreeItem.h removed 0 -29

NO CONTENT: file was removed

gui/include/Catalogue/CatalogueTreeModel.h removed 0 -59

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueActionManager.cpp removed 0 -190

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueEventsModel.cpp removed 0 -502

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (502 lines changed) Show them Hide them

gui/src/Catalogue/CatalogueEventsWidget.cpp removed 0 -615

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (615 lines changed) Show them Hide them

gui/src/Catalogue/CatalogueExplorer.cpp removed 0 -207

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueExplorerHelper.cpp removed 0 -30

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueInspectorWidget.cpp removed 0 -236

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueSideBarWidget.cpp removed 0 -461

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp removed 0 -87

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp removed 0 -59

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp removed 0 -132

NO CONTENT: file was removed

gui/src/Catalogue/CatalogueTreeModel.cpp removed 0 -219

NO CONTENT: file was removed

gui/ui/Catalogue/CatalogueEventsWidget.ui removed 0 -144

NO CONTENT: file was removed

gui/ui/Catalogue/CatalogueExplorer.ui removed 0 -83

NO CONTENT: file was removed

gui/ui/Catalogue/CatalogueInspectorWidget.ui removed 0 -219

NO CONTENT: file was removed

gui/ui/Catalogue/CatalogueSideBarWidget.ui removed 0 -105

NO CONTENT: file was removed

subprojects/QxOrm.wrap removed 0 -5

NO CONTENT: file was removed

subprojects/libcatalogs.wrap removed 0 -4

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages