HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1475:d1ba435fd66a

Removed useless Visualization CTRLR component...

jeandet -

r1475:d1ba435fd66a

parent child

Context file:

r1475:d1ba435fd66a

app/src/MainWindow.cpp 0 -10

             /*------------------------------------------------------------------------------
             -- 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 <Catalogue2/browser.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 <Visualization/VisualizationController.h>
             #include "toolbar.h"
             #include <QAction>
             #include <QCloseEvent>
             #include <QDate>
             #include <QDir>
             #include <QFileDialog>
             #include <QMessageBox>
             #include <QToolBar>
             #include <QToolButton>
             #include <memory.h>
             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 CataloguesBrowser { 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
                 CataloguesBrowser* 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);
                 setWindowTitle(QString("SciQLop v%1").arg(SCIQLOP_VERSION));
                 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 = new ToolBar(this);
                 this->addToolBar(mainToolBar);
                 connect(mainToolBar, &ToolBar::setPlotsInteractionMode, sqpApp,
                     &SqpApplication::setPlotsInteractionMode);
                 connect(mainToolBar, &ToolBar::setPlotsCursorMode, sqpApp, &SqpApplication::setPlotsCursorMode);
                 connect(mainToolBar, &ToolBar::showCataloguesBrowser,
                     [this]() { impl->m_CatalogExplorer->show(); });
                 // //////// //
                 // Settings //
                 // //////// //
                 // Registers "general settings" widget to the settings dialog
                 impl->m_SettingsDialog->registerWidget(
                     QStringLiteral("General"), impl->m_GeneralSettingsWidget);
                 // /////////// //
                 // Connections //
                 // /////////// //
                 // 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)));
                 connect(mainToolBar, &ToolBar::timeUpdated, &sqpApp->timeController(),
                     &TimeController::setDateTimeRange);
-                // Visualization
-                connect(&sqpApp->visualizationController(),
-                    SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable2>)), m_Ui->view,
-                    SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable2>)));
-                connect(&sqpApp->visualizationController(),
-                    SIGNAL(rangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)), m_Ui->view,
-                    SLOT(onRangeChanged(std::shared_ptr<Variable2>, 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 521f9540ac01f61c92600a4aa6c8d3c148abc74a		1	Subproject commit 64a22e9756a85346e7aef52d26bc5c50c4778d86

gui/include/SqpApplication.h 0 -4

             #ifndef SCIQLOP_SQPAPPLICATION_H
             #define SCIQLOP_SQPAPPLICATION_H
             #include "SqpApplication.h"
             #include <QAction>
             #include <QApplication>
             #include <QLoggingCategory>
             #include <QMenuBar>
             #include <QProxyStyle>
             #include <QStyleOption>
             #include <QWidget>
             #include <QWidgetAction>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication)
             #if defined(sqpApp)
             #undef sqpApp
             #endif
             #define sqpApp (static_cast<SqpApplication*>(QCoreApplication::instance()))
             class DataSourceController;
             class NetworkController;
             class TimeController;
             class VariableController;
             class VariableController2;
             class VariableModel2;
-            class VisualizationController;
             class DragDropGuiController;
             class ActionsGuiController;
             class CatalogueController;
             /* stolen from here https://forum.qt.io/topic/90403/show-tooltip-immediatly/6 */
             class MyProxyStyle : public QProxyStyle
             {
             public:
                 using QProxyStyle::QProxyStyle;
                 int styleHint(StyleHint hint, const QStyleOption* option = nullptr,
                     const QWidget* widget = nullptr, QStyleHintReturn* returnData = nullptr) const override
                 {
                     if (widget)
                         auto cname = widget->metaObject()->className();
                     if (hint == QStyle::SH_ToolButton_PopupDelay && widget
                         /*&& widget->inherits(QWidgetAction::staticMetaObject.className())*/)
                     {
                         return 0;
                     }
                     return QProxyStyle::styleHint(hint, option, widget, returnData);
                 }
             };
             /**
              * @brief The SqpApplication class aims to make the link between SciQlop
              * and its plugins. This is the intermediate class that SciQlop has to use
              * in the way to connect a data source. Please first use load method to initialize
              * a plugin specified by its metadata name (JSON plugin source) then others specifics
              * method will be able to access it.
              * You can load a data source driver plugin then create a data source.
              */
             class SqpApplication : public QApplication
             {
                 Q_OBJECT
             public:
                 explicit SqpApplication(int& argc, char** argv);
                 ~SqpApplication() override;
                 void initialize();
                 /// Accessors for the differents sciqlop controllers
                 DataSourceController& dataSourceController() noexcept;
                 NetworkController& networkController() noexcept;
                 TimeController& timeController() noexcept;
                 VariableController2& variableController() noexcept;
                 std::shared_ptr<VariableController2> variableControllerOwner() noexcept;
-                //@TODO there should not be any global model it's just GUI impl detail
-                //    VariableModel2 &variableModel() noexcept;
-                VisualizationController& visualizationController() noexcept;
                 CatalogueController& catalogueController() noexcept;
                 /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but
                 /// doesn't live in a thread and access gui
                 DragDropGuiController& dragDropGuiController() noexcept;
                 ActionsGuiController& actionsGuiController() noexcept;
                 enum class PlotsInteractionMode
                 {
                     None,
                     ZoomBox,
                     DragAndDrop,
                     SelectionZones
                 };
                 enum class PlotsCursorMode
                 {
                     NoCursor,
                     Vertical,
                     Temporal,
                     Horizontal,
                     Cross
                 };
                 PlotsInteractionMode plotsInteractionMode() const;
                 void setPlotsInteractionMode(PlotsInteractionMode mode);
                 PlotsCursorMode plotsCursorMode() const;
                 void setPlotsCursorMode(PlotsCursorMode mode);
             private:
                 class SqpApplicationPrivate;
                 spimpl::unique_impl_ptr<SqpApplicationPrivate> impl;
             };
             #endif // SCIQLOP_SQPAPPLICATION_H

gui/src/SqpApplication.cpp 0 -37

             #include "SqpApplication.h"
             #include <Actions/ActionsGuiController.h>
             #include <Catalogue/CatalogueController.h>
             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
             #include <DragAndDrop/DragDropGuiController.h>
             #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>
             #include <Variable/VariableController2.h>
             #include <Variable/VariableModel2.h>
-            #include <Visualization/VisualizationController.h>
             Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
             class SqpApplication::SqpApplicationPrivate
             {
             public:
                 SqpApplicationPrivate()
                         : m_VariableController { std::make_shared<VariableController2>() }
                         , m_PlotInterractionMode(SqpApplication::PlotsInteractionMode::None)
                         , m_PlotCursorMode(SqpApplication::PlotsCursorMode::NoCursor)
                 {
                     // /////////////////////////////// //
                     // Connections between controllers //
                     // /////////////////////////////// //
                     // VariableController <-> DataSourceController
                     connect(&m_DataSourceController, &DataSourceController::createVariable,
                         [](const QString& variableName, const QVariantHash& variableMetadata,
                             std::shared_ptr<IDataProvider> variableProvider) {
                             sqpApp->variableController().createVariable(variableName, variableMetadata,
                                 variableProvider, sqpApp->timeController().dateTime());
                         });
-                    // VariableController <-> VisualizationController
-                    //        connect(m_VariableController.get(),
-                    //                SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
-                    //                m_VisualizationController.get(),
-                    //                SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
-                    //                Qt::DirectConnection);
-                    //        connect(m_VariableController.get(),
-                    //                SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)),
-                    //                m_VisualizationController.get(),
-                    //                SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)));
                     m_DataSourceController.moveToThread(&m_DataSourceControllerThread);
                     m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
                     m_NetworkController.moveToThread(&m_NetworkControllerThread);
                     m_NetworkControllerThread.setObjectName("NetworkControllerThread");
-                    m_VisualizationController.moveToThread(&m_VisualizationControllerThread);
-                    m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
                     // Additionnal init
                     // m_VariableController->setTimeController(m_TimeController.get());
                 }
                 virtual ~SqpApplicationPrivate()
                 {
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
                     m_NetworkControllerThread.quit();
                     m_NetworkControllerThread.wait();
-                    m_VisualizationControllerThread.quit();
-                    m_VisualizationControllerThread.wait();
                 }
                 DataSourceController m_DataSourceController;
                 std::shared_ptr<VariableController2> m_VariableController;
                 TimeController m_TimeController;
                 NetworkController m_NetworkController;
-                VisualizationController m_VisualizationController;
                 CatalogueController m_CatalogueController;
                 QThread m_DataSourceControllerThread;
                 QThread m_NetworkControllerThread;
-                QThread m_VisualizationControllerThread;
                 DragDropGuiController m_DragDropGuiController;
                 ActionsGuiController m_ActionsGuiController;
                 SqpApplication::PlotsInteractionMode m_PlotInterractionMode;
                 SqpApplication::PlotsCursorMode m_PlotCursorMode;
             };
             SqpApplication::SqpApplication(int& argc, char** argv)
                     : QApplication { argc, argv }, impl { spimpl::make_unique_impl<SqpApplicationPrivate>() }
             {
                 this->setStyle(new MyProxyStyle(this->style()));
                 qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread();
                 QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
                 connect(&impl->m_DataSourceControllerThread, &QThread::started, &impl->m_DataSourceController,
                     &DataSourceController::initialize);
                 connect(&impl->m_DataSourceControllerThread, &QThread::finished, &impl->m_DataSourceController,
                     &DataSourceController::finalize);
                 connect(&impl->m_NetworkControllerThread, &QThread::started, &impl->m_NetworkController,
                     &NetworkController::initialize);
                 connect(&impl->m_NetworkControllerThread, &QThread::finished, &impl->m_NetworkController,
                     &NetworkController::finalize);
-                connect(&impl->m_VisualizationControllerThread, &QThread::started,
-                    &impl->m_VisualizationController, &VisualizationController::initialize);
-                connect(&impl->m_VisualizationControllerThread, &QThread::finished,
-                    &impl->m_VisualizationController, &VisualizationController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
-                impl->m_VisualizationControllerThread.start();
-                // impl->m_CatalogueController.initialize();
             }
             SqpApplication::~SqpApplication() {}
             void SqpApplication::initialize() {}
             DataSourceController& SqpApplication::dataSourceController() noexcept
             {
                 return impl->m_DataSourceController;
             }
             NetworkController& SqpApplication::networkController() noexcept
             {
                 return impl->m_NetworkController;
             }
             TimeController& SqpApplication::timeController() noexcept
             {
                 return impl->m_TimeController;
             }
             VariableController2& SqpApplication::variableController() noexcept
             {
                 return *impl->m_VariableController;
             }
             std::shared_ptr<VariableController2> SqpApplication::variableControllerOwner() noexcept
             {
                 return impl->m_VariableController;
             }
-            // VariableModel2 &SqpApplication::variableModel() noexcept
-            //{
-            //    return impl->m_VariableModel;
-            //}
-            VisualizationController& SqpApplication::visualizationController() noexcept
-                return impl->m_VisualizationController;
             CatalogueController& SqpApplication::catalogueController() noexcept
             {
                 return impl->m_CatalogueController;
             }
             DragDropGuiController& SqpApplication::dragDropGuiController() noexcept
             {
                 return impl->m_DragDropGuiController;
             }
             ActionsGuiController& SqpApplication::actionsGuiController() noexcept
             {
                 return impl->m_ActionsGuiController;
             }
             SqpApplication::PlotsInteractionMode SqpApplication::plotsInteractionMode() const
             {
                 return impl->m_PlotInterractionMode;
             }
             void SqpApplication::setPlotsInteractionMode(SqpApplication::PlotsInteractionMode mode)
             {
                 impl->m_PlotInterractionMode = mode;
             }
             SqpApplication::PlotsCursorMode SqpApplication::plotsCursorMode() const
             {
                 return impl->m_PlotCursorMode;
             }
             void SqpApplication::setPlotsCursorMode(SqpApplication::PlotsCursorMode mode)
             {
                 impl->m_PlotCursorMode = mode;
             }

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