##// END OF EJS Templates
Bump Core...
Bump Core Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

File last commit:

r1475:d1ba435fd66a
r1476:ba2a77ddca4c master
Show More
MainWindow.cpp
281 lines | 9.4 KiB | text/x-c | CppLexer
Initialisation de l'application multithread avec le spimpl....
r21 /*------------------------------------------------------------------------------
Refactoring of app module to avoir vera++ warning and to dispatch sources files in the corrects paths
r54 -- This file is a part of the SciQLop Software
-- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
Initialisation de l'application multithread avec le spimpl....
r21 --
-- 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
----------------------------------------------------------------------------*/
Refactoring of app module to avoir vera++ warning and to dispatch sources files in the corrects paths
r54 #include "MainWindow.h"
#include "ui_MainWindow.h"
Alexandre Leroux
Connects data source widget to data source controller
r84
Check unsaved data on close
r1239 #include <Catalogue/CatalogueController.h>
Set revision to 1.1.0 some work to bring back catalogs...
r1460 #include <Catalogue2/browser.h>
Alexandre Leroux
Connects data source widget to data source controller
r84 #include <DataSource/DataSourceController.h>
#include <DataSource/DataSourceWidget.h>
Alexandre Leroux
Creates settings dialog and adds it to a new menu in MainWindow...
r463 #include <Settings/SqpSettingsDialog.h>
Alexandre Leroux
Creates widget for "general settings" and registers it to the dialog
r465 #include <Settings/SqpSettingsGeneralWidget.h>
Add button on the SidePane widgets to open left or right inspectors
r101 #include <SidePane/SqpSidePane.h>
Alexandre Leroux
Connects data source widget to data source controller
r84 #include <SqpApplication.h>
add TimeWidget connection
r192 #include <Time/TimeController.h>
Modificaiton of the sidepane :...
r133 #include <TimeWidget/TimeWidget.h>
Alexandre Leroux
Connects data source widget to data source controller
r84
Refactored main toolbar to make it suck less :)...
r1462 #include "toolbar.h"
Initialisation de l'application multithread avec le spimpl....
r21 #include <QAction>
Check unsaved data on close
r1239 #include <QCloseEvent>
Initialisation de l'application multithread avec le spimpl....
r21 #include <QDate>
#include <QDir>
#include <QFileDialog>
Check unsaved data on close
r1239 #include <QMessageBox>
Add button on the SidePane widgets to open left or right inspectors
r101 #include <QToolBar>
Factorisation of the lambda connected to the side pane button
r138 #include <QToolButton>
Add button on the SidePane widgets to open left or right inspectors
r101 #include <memory.h>
Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow")
New Catalogue API WIP, basic models and views implemented...
r1406 namespace
{
PRC: add tr on text...
r102 const auto LEFTMAININSPECTORWIDGETSPLITTERINDEX = 0;
const auto LEFTINSPECTORSIDEPANESPLITTERINDEX = 1;
const auto VIEWPLITTERINDEX = 2;
const auto RIGHTINSPECTORSIDEPANESPLITTERINDEX = 3;
const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4;
}
New Catalogue API WIP, basic models and views implemented...
r1406 class MainWindow::MainWindowPrivate
{
Add button on the SidePane widgets to open left or right inspectors
r101 public:
New Catalogue API WIP, basic models and views implemented...
r1406 explicit MainWindowPrivate(MainWindow* mainWindow)
: m_LastOpenLeftInspectorSize {}
, m_LastOpenRightInspectorSize {}
, m_GeneralSettingsWidget { new SqpSettingsGeneralWidget { mainWindow } }
, m_SettingsDialog { new SqpSettingsDialog { mainWindow } }
Set revision to 1.1.0 some work to bring back catalogs...
r1460 , m_CatalogExplorer { new CataloguesBrowser { mainWindow } }
Alexandre Leroux
Creates settings dialog and adds it to a new menu in MainWindow...
r463 {
}
Add button on the SidePane widgets to open left or right inspectors
r101 QSize m_LastOpenLeftInspectorSize;
QSize m_LastOpenRightInspectorSize;
Alexandre Leroux
Creates widget for "general settings" and registers it to the dialog
r465 /// General settings widget. MainWindow has the ownership
New Catalogue API WIP, basic models and views implemented...
r1406 SqpSettingsGeneralWidget* m_GeneralSettingsWidget;
Alexandre Leroux
Creates settings dialog and adds it to a new menu in MainWindow...
r463 /// Settings dialog. MainWindow has the ownership
New Catalogue API WIP, basic models and views implemented...
r1406 SqpSettingsDialog* m_SettingsDialog;
Add a button in the application toolbar to open the catalogues
r1094 /// Catalogue dialog. MainWindow has the ownership
Set revision to 1.1.0 some work to bring back catalogs...
r1460 CataloguesBrowser* m_CatalogExplorer;
Check unsaved data on close
r1239
New Catalogue API WIP, basic models and views implemented...
r1406 bool checkDataToSave(QWidget* parentWidget);
Add button on the SidePane widgets to open left or right inspectors
r101 };
New Catalogue API WIP, basic models and views implemented...
r1406 MainWindow::MainWindow(QWidget* parent)
: QMainWindow { parent }
, m_Ui { new Ui::MainWindow }
, impl { spimpl::make_unique_impl<MainWindowPrivate>(this) }
Initialisation de l'application multithread avec le spimpl....
r21 {
Refactoring of app module to avoir vera++ warning and to dispatch sources files in the corrects paths
r54 m_Ui->setupUi(this);
Set SciQLop Version to 1.0.0 🍾...
r1458 setWindowTitle(QString("SciQLop v%1").arg(SCIQLOP_VERSION));
Add skelleton of the gui
r56
PRC: add tr on text...
r102 m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false);
m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false);
Add button on the SidePane widgets to open left or right inspectors
r101
New Catalogue API WIP, basic models and views implemented...
r1406 // impl->m_CatalogExplorer->setVisualizationWidget(m_Ui->view);
Removed side bars which were too big......
r1375
Modificaiton of the sidepane :...
r133
New Catalogue API WIP, basic models and views implemented...
r1406 auto spacerLeftTop = new QWidget {};
Modificaiton of the sidepane :...
r133 spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
New Catalogue API WIP, basic models and views implemented...
r1406 auto spacerLeftBottom = new QWidget {};
Modificaiton of the sidepane :...
r133 spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
New Catalogue API WIP, basic models and views implemented...
r1406 auto spacerRightTop = new QWidget {};
Modificaiton of the sidepane :...
r133 spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
New Catalogue API WIP, basic models and views implemented...
r1406 auto spacerRightBottom = new QWidget {};
Modificaiton of the sidepane :...
r133 spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
Factorisation of the lambda connected to the side pane button
r138 auto openInspector = [this](bool checked, bool right, auto action) {
New Catalogue API WIP, basic models and views implemented...
r1406 action->setIcon(
QIcon { (checked ^ right) ? ":/icones/next.png" : ":/icones/previous.png" });
Modificaiton of the sidepane :...
r133
New Catalogue API WIP, basic models and views implemented...
r1406 auto& lastInspectorSize
Factorisation of the lambda connected to the side pane button
r138 = right ? impl->m_LastOpenRightInspectorSize : impl->m_LastOpenLeftInspectorSize;
auto nextInspectorSize = right ? m_Ui->rightMainInspectorWidget->size()
: m_Ui->leftMainInspectorWidget->size();
Add button on the SidePane widgets to open left or right inspectors
r101
// Update of the last opened geometry
New Catalogue API WIP, basic models and views implemented...
r1406 if (checked)
{
Factorisation of the lambda connected to the side pane button
r138 lastInspectorSize = nextInspectorSize;
Add button on the SidePane widgets to open left or right inspectors
r101 }
Factorisation of the lambda connected to the side pane button
r138 auto startSize = lastInspectorSize;
Add button on the SidePane widgets to open left or right inspectors
r101 auto endSize = startSize;
endSize.setWidth(0);
Factorisation of the lambda connected to the side pane button
r138 auto splitterInspectorIndex
= right ? RIGHTMAININSPECTORWIDGETSPLITTERINDEX : LEFTMAININSPECTORWIDGETSPLITTERINDEX;
PRC: add tr on text...
r102 auto currentSizes = m_Ui->splitter->sizes();
New Catalogue API WIP, basic models and views implemented...
r1406 if (checked)
{
Add button on the SidePane widgets to open left or right inspectors
r101 // adjust sizes individually here, e.g.
Factorisation of the lambda connected to the side pane button
r138 currentSizes[splitterInspectorIndex] -= lastInspectorSize.width();
currentSizes[VIEWPLITTERINDEX] += lastInspectorSize.width();
Add button on the SidePane widgets to open left or right inspectors
r101 m_Ui->splitter->setSizes(currentSizes);
}
New Catalogue API WIP, basic models and views implemented...
r1406 else
{
Add button on the SidePane widgets to open left or right inspectors
r101 // adjust sizes individually here, e.g.
Factorisation of the lambda connected to the side pane button
r138 currentSizes[splitterInspectorIndex] += lastInspectorSize.width();
currentSizes[VIEWPLITTERINDEX] -= lastInspectorSize.width();
Add button on the SidePane widgets to open left or right inspectors
r101 m_Ui->splitter->setSizes(currentSizes);
}
};
Modificaiton of the sidepane :...
r133
Toolbar for interactions modes
r957 // //////////////// //
// Menu and Toolbar //
// //////////////// //
PRC: add tr on text...
r102 this->menuBar()->addAction(tr("File"));
Alexandre Leroux
Creates settings dialog and adds it to a new menu in MainWindow...
r463 auto toolsMenu = this->menuBar()->addMenu(tr("Tools"));
toolsMenu->addAction(tr("Settings..."), [this]() {
Alexandre Leroux
Settings binding (4)...
r469 // Loads settings
impl->m_SettingsDialog->loadSettings();
// Open settings dialog and save settings if the dialog is accepted
New Catalogue API WIP, basic models and views implemented...
r1406 if (impl->m_SettingsDialog->exec() == QDialog::Accepted)
{
Alexandre Leroux
Settings binding (4)...
r469 impl->m_SettingsDialog->saveSettings();
}
Alexandre Leroux
Creates settings dialog and adds it to a new menu in MainWindow...
r463 });
Refactored main toolbar to make it suck less :)...
r1462 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,
Set revision to 1.1.0 some work to bring back catalogs...
r1460 [this]() { impl->m_CatalogExplorer->show(); });
Add a button in the application toolbar to open the catalogues
r1094
Alexandre Leroux
Creates widget for "general settings" and registers it to the dialog
r465 // //////// //
// Settings //
// //////// //
// Registers "general settings" widget to the settings dialog
New Catalogue API WIP, basic models and views implemented...
r1406 impl->m_SettingsDialog->registerWidget(
QStringLiteral("General"), impl->m_GeneralSettingsWidget);
Alexandre Leroux
Creates widget for "general settings" and registers it to the dialog
r465
Alexandre Leroux
Creates settings dialog and adds it to a new menu in MainWindow...
r463 // /////////// //
// Connections //
// /////////// //
Alexandre Leroux
Connects data source widget to data source controller
r84 // Widgets / controllers connections
add TimeWidget connection
r192
// DataSource
New Catalogue API WIP, basic models and views implemented...
r1406 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem*)),
m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem*)));
Alexandre Leroux
Connects data source widget to data source controller
r84
add TimeWidget connection
r192 // Time
Refactored main toolbar to make it suck less :)...
r1462 // connect(timeWidget, SIGNAL(timeUpdated(DateTimeRange)), &sqpApp->timeController(),
// SLOT(onTimeToUpdate(DateTimeRange)));
connect(mainToolBar, &ToolBar::timeUpdated, &sqpApp->timeController(),
&TimeController::setDateTimeRange);
add TimeWidget connection
r192
Alexandre Leroux
Connects variable widget to visualization widget...
r249 // 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
New Catalogue API WIP, basic models and views implemented...
r1406 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>>&)),
Alexandre Leroux
Changes signal to pass a list of variables...
r288 Qt::DirectConnection);
Initialisation de l'application multithread avec le spimpl....
r21 }
New Catalogue API WIP, basic models and views implemented...
r1406 MainWindow::~MainWindow() {}
Initialisation de l'application multithread avec le spimpl....
r21
New Catalogue API WIP, basic models and views implemented...
r1406 void MainWindow::changeEvent(QEvent* e)
Initialisation de l'application multithread avec le spimpl....
r21 {
QMainWindow::changeEvent(e);
New Catalogue API WIP, basic models and views implemented...
r1406 switch (e->type())
{
Initialisation de l'application multithread avec le spimpl....
r21 case QEvent::LanguageChange:
Refactoring of app module to avoir vera++ warning and to dispatch sources files in the corrects paths
r54 m_Ui->retranslateUi(this);
Initialisation de l'application multithread avec le spimpl....
r21 break;
default:
break;
}
}
Check unsaved data on close
r1239
New Catalogue API WIP, basic models and views implemented...
r1406 void MainWindow::closeEvent(QCloseEvent* event)
Check unsaved data on close
r1239 {
New Catalogue API WIP, basic models and views implemented...
r1406 if (!impl->checkDataToSave(this))
{
Check unsaved data on close
r1239 event->ignore();
}
New Catalogue API WIP, basic models and views implemented...
r1406 else
{
Check unsaved data on close
r1239 event->accept();
}
}
New Catalogue API WIP, basic models and views implemented...
r1406 void MainWindow::keyPressEvent(QKeyEvent* event)
Restored graph D&D and added full screen mode (F11)...
r1376 {
switch (event->key())
{
New Catalogue API WIP, basic models and views implemented...
r1406 case Qt::Key_F11:
if (this->isFullScreen())
{
this->showNormal();
}
else
{
this->showFullScreen();
}
break;
default:
break;
Restored graph D&D and added full screen mode (F11)...
r1376 }
}
New Catalogue API WIP, basic models and views implemented...
r1406 bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget* parentWidget)
Check unsaved data on close
r1239 {
New Catalogue API WIP, basic models and views implemented...
r1406 // 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;
// }
// }
Check unsaved data on close
r1239
return true;
}