GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r136:a642436e9414

Merge branch 'feature/timeWidgetAndSidePane' into develop

perrinel -

r136:a642436e9414

parent child

Context file:

r136:a642436e9414

gui/include/TimeWidget/TimeWidget.h created 644 +23 0

@@ -0,0 +1,23
	1	#ifndef SCIQLOP_TIMEWIDGET_H
	2	#define SCIQLOP_TIMEWIDGET_H
	3
	4	#include <QWidget>
	5
	6	namespace Ui {
	7	class TimeWidget;
	8	} // Ui
	9
	10	class TimeWidget;
	11
	12	class TimeWidget : public QWidget {
	13	Q_OBJECT
	14
	15	public:
	16	explicit TimeWidget(QWidget *parent = 0);
	17	virtual ~TimeWidget();
	18
	19	private:
	20	Ui::TimeWidget *ui;
	21	};
	22
	23	#endif // SCIQLOP_ SQPSIDEPANE_H

gui/resources/icones/next.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

gui/resources/icones/previous.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

gui/src/TimeWidget/TimeWidget.cpp created 644 +12 0

@@ -0,0 +1,12
	1	#include "TimeWidget/TimeWidget.h"
	2	#include "ui_TimeWidget.h"
	3
	4	TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}
	5	{
	6	ui->setupUi(this);
	7	}
	8
	9	TimeWidget::~TimeWidget()
	10	{
	11	delete ui;
	12	}

gui/ui/TimeWidget/TimeWidget.ui created 644 +85 0

@@ -0,0 +1,85
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>TimeWidget</class>
	4	<widget class="QWidget" name="TimeWidget">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>716</width>
	10	<height>48</height>
	11	</rect>
	12	</property>
	13	<property name="sizePolicy">
	14	<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
	15	<horstretch>0</horstretch>
	16	<verstretch>0</verstretch>
	17	</sizepolicy>
	18	</property>
	19	<property name="windowTitle">
	20	<string>Form</string>
	21	</property>
	22	<layout class="QHBoxLayout" name="horizontalLayout_2">
	23	<item>
	24	<widget class="QLabel" name="label">
	25	<property name="sizePolicy">
	26	<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
	27	<horstretch>0</horstretch>
	28	<verstretch>0</verstretch>
	29	</sizepolicy>
	30	</property>
	31	<property name="text">
	32	<string>TStart :</string>
	33	</property>
	34	</widget>
	35	</item>
	36	<item>
	37	<widget class="QDateTimeEdit" name="startDateTimeEdit">
	38	<property name="sizePolicy">
	39	<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
	40	<horstretch>0</horstretch>
	41	<verstretch>0</verstretch>
	42	</sizepolicy>
	43	</property>
	44	<property name="displayFormat">
	45	<string>dd/MM/yyyy HH:mm:ss:zzz</string>
	46	</property>
	47	<property name="calendarPopup">
	48	<bool>true</bool>
	49	</property>
	50	</widget>
	51	</item>
	52	<item>
	53	<widget class="QLabel" name="label_2">
	54	<property name="sizePolicy">
	55	<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
	56	<horstretch>0</horstretch>
	57	<verstretch>0</verstretch>
	58	</sizepolicy>
	59	</property>
	60	<property name="text">
	61	<string>TEnd :</string>
	62	</property>
	63	</widget>
	64	</item>
	65	<item>
	66	<widget class="QDateTimeEdit" name="endDateTimeEdit">
	67	<property name="sizePolicy">
	68	<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
	69	<horstretch>0</horstretch>
	70	<verstretch>0</verstretch>
	71	</sizepolicy>
	72	</property>
	73	<property name="displayFormat">
	74	<string>dd/MM/yyyy HH:mm:ss:zzz</string>
	75	</property>
	76	<property name="calendarPopup">
	77	<bool>true</bool>
	78	</property>
	79	</widget>
	80	</item>
	81	</layout>
	82	</widget>
	83	<resources/>
	84	<connections/>
	85	</ui>

app/src/MainWindow.cpp +71 -19

             /*------------------------------------------------------------------------------
             -- 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 <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceWidget.h>
             #include <SidePane/SqpSidePane.h>
             #include <SqpApplication.h>
+            #include <TimeWidget/TimeWidget.h>
             #include <QAction>
             #include <QDate>
             #include <QDateTime>
             #include <QDir>
             #include <QFileDialog>
             #include <QToolBar>
             #include <memory.h>
             //#include <omp.h>
             //#include <network/filedownloader.h>
             //#include <qlopdatabase.h>
             //#include <qlopsettings.h>
             //#include <qlopgui.h>
             //#include <spacedata.h>
             //#include "qlopcore.h"
             //#include "qlopcodecmanager.h"
             //#include "cdfcodec.h"
             //#include "amdatxtcodec.h"
             //#include <qlopplotmanager.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:
                 QSize m_LastOpenLeftInspectorSize;
                 QSize m_LastOpenRightInspectorSize;
             };
             MainWindow::MainWindow(QWidget *parent)
                     : QMainWindow{parent},
                       m_Ui{new Ui::MainWindow},
                       impl{spimpl::make_unique_impl<MainWindowPrivate>()}
             {
                 m_Ui->setupUi(this);
                 m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false);
                 m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false);
+                auto leftSidePane = m_Ui->leftInspectorSidePane->sidePane();
+                auto openLeftInspectorAction = new QAction(
+                    QIcon{
+                        ":/icones/previous.png",
+                    },
+                    tr("Show/hide the left inspector"), this);
+                QWidget *spacerLeftTop = new QWidget();
+                spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                QWidget *spacerLeftBottom = new QWidget();
+                spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                leftSidePane->addWidget(spacerLeftTop);
+                leftSidePane->addAction(openLeftInspectorAction);
+                leftSidePane->addWidget(spacerLeftBottom);
+                auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane();
+                auto openRightInspectorAction = new QAction(
+                    QIcon{
+                        ":/icones/next.png",
+                    },
+                    tr("Show/hide the right inspector"), this);
+                QWidget *spacerRightTop = new QWidget();
+                spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                QWidget *spacerRightBottom = new QWidget();
+                spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                rightSidePane->addWidget(spacerRightTop);
+                rightSidePane->addAction(openRightInspectorAction);
+                rightSidePane->addWidget(spacerRightBottom);
+                openLeftInspectorAction->setCheckable(true);
+                openRightInspectorAction->setCheckable(true);
                 // NOTE: These lambda could be factorized. Be careful of theirs parameters
                 // Lambda that defines what's happened when clicking on the leftSidePaneInspector open button
-                auto openLeftInspector = [this](bool checked) {
+                auto openLeftInspector = [this, openLeftInspectorAction](bool checked) {
+                    if (checked) {
+                        openLeftInspectorAction->setIcon(QIcon{
+                            ":/icones/next.png",
+                        });
+                    }
+                    else {
+                        openLeftInspectorAction->setIcon(QIcon{
+                            ":/icones/previous.png",
+                        });
+                    }
                     // Update of the last opened geometry
                     if (checked) {
                         impl->m_LastOpenLeftInspectorSize = m_Ui->leftMainInspectorWidget->size();
                     }
                     auto startSize = impl->m_LastOpenLeftInspectorSize;
                     auto endSize = startSize;
                     endSize.setWidth(0);
                     auto currentSizes = m_Ui->splitter->sizes();
                     if (checked) {
                         // adjust sizes individually here, e.g.
                         currentSizes[LEFTMAININSPECTORWIDGETSPLITTERINDEX]
                             -= impl->m_LastOpenLeftInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] += impl->m_LastOpenLeftInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                     else {
                         // adjust sizes individually here, e.g.
                         currentSizes[LEFTMAININSPECTORWIDGETSPLITTERINDEX]
                             += impl->m_LastOpenLeftInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] -= impl->m_LastOpenLeftInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                 };
                 // Lambda that defines what's happened when clicking on the SidePaneInspector open button
-                auto openRightInspector = [this](bool checked) {
+                auto openRightInspector = [this, openRightInspectorAction](bool checked) {
+                    if (checked) {
+                        openRightInspectorAction->setIcon(QIcon{
+                            ":/icones/previous.png",
+                        });
+                    }
+                    else {
+                        openRightInspectorAction->setIcon(QIcon{
+                            ":/icones/next.png",
+                        });
+                    }
                     // Update of the last opened geometry
                     if (checked) {
                         impl->m_LastOpenRightInspectorSize = m_Ui->rightMainInspectorWidget->size();
                     }
                     auto startSize = impl->m_LastOpenRightInspectorSize;
                     auto endSize = startSize;
                     endSize.setWidth(0);
                     auto currentSizes = m_Ui->splitter->sizes();
                     if (checked) {
                         // adjust sizes individually here, e.g.
                         currentSizes[RIGHTMAININSPECTORWIDGETSPLITTERINDEX]
                             -= impl->m_LastOpenRightInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] += impl->m_LastOpenRightInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                     else {
                         // adjust sizes individually here, e.g.
                         currentSizes[RIGHTMAININSPECTORWIDGETSPLITTERINDEX]
                             += impl->m_LastOpenRightInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] -= impl->m_LastOpenRightInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                 };
-                QToolBar *leftSidePane = m_Ui->leftInspectorSidePane->sidePane();
+                connect(openLeftInspectorAction, &QAction::triggered, openLeftInspector);
-                auto openLeftInspectorAction = leftSidePane->addAction(
+                connect(openRightInspectorAction, &QAction::triggered, openRightInspector);
-                    QIcon{
-                        ":/icones/openInspector.png",
-                    },
-                    tr("Show/hide the left inspector"), openLeftInspector);
-                openLeftInspectorAction->setCheckable(true);
-                auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane();
-                auto openRightInspectorAction = rightSidePane->addAction(
-                    QIcon{
-                        ":/icones/openInspector.png",
-                    },
-                    tr("Show/hide the right inspector"), openRightInspector);
-                openRightInspectorAction->setCheckable(true);
                 this->menuBar()->addAction(tr("File"));
                 auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar"));
-                mainToolBar->addAction(QStringLiteral("A1"));
+                mainToolBar->addWidget(new TimeWidget());
                 // Widgets / controllers connections
                 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
                         m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
                     this->m_progressWidget = new QWidget();
                     this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
                     this->m_progressWidget->setLayout(this->m_progressLayout);
                     this->m_progressWidget->setWindowModality(Qt::WindowModal);
                     m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
                     for(int i=0;i<OMP_THREADS;i++)
                     {
                         this->m_progress.append(new QProgressBar(this->m_progressWidget));
                         this->m_progress.last()->setMinimum(0);
                         this->m_progress.last()->setMaximum(100);
                         this->m_progressLayout->addWidget(this->m_progress.last());
                         this->m_progressWidget->hide();
                         this->m_progressThreadIds[i] = -1;
                     }
                     this->m_progressWidget->setWindowTitle("Loading File");
                     const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
                             << QLopCore::self()
                             << QLopPlotManager::self()
                             << QLopCodecManager::self()
                             << FileDownloader::self()
                             << QLopDataBase::self()
                             << SpaceData::self();
                     CDFCodec::registerToManager();
                     AMDATXTCodec::registerToManager();
                     for(int i=0;i<ServicesToLoad.count();i++)
                     {
                         qDebug()<<ServicesToLoad.at(i)->serviceName();
                         ServicesToLoad.at(i)->initialize(); //must be called before getGUI
                         QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
                         if(wdgt)
                         {
                             wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
                             this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
                         }
                         PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
                     }*/
             }
             MainWindow::~MainWindow()
             {
             }
             void MainWindow::changeEvent(QEvent *e)
             {
                 QMainWindow::changeEvent(e);
                 switch (e->type()) {
                     case QEvent::LanguageChange:
                         m_Ui->retranslateUi(this);
                         break;
                     default:
                         break;
                 }
             }

core/src/Variable/VariableController.cpp +4 -4

             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <QMutex>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
             struct VariableController::VariableControllerPrivate {
                 explicit VariableControllerPrivate()
                         : m_WorkingMutex{}, m_VariableModel{std::make_unique<VariableModel>()}
                 {
                 }
                 QMutex m_WorkingMutex;
                 std::unique_ptr<VariableModel> m_VariableModel;
             };
             VariableController::VariableController(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>()}
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << tr("VariableController construction")
-                    << tr("VariableController construction") << QThread::currentThread();
+                                                  << QThread::currentThread();
             }
             VariableController::~VariableController()
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << tr("VariableController destruction")
-                    << tr("VariableController destruction") << QThread::currentThread();
+                                                  << QThread::currentThread();
                 this->waitForFinish();
             }
             Variable *VariableController::createVariable(const QString &name) noexcept
             {
                 return impl->m_VariableModel->createVariable(name);
             }
             void VariableController::initialize()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_VariableController()) << tr("VariableController init END");
             }
             void VariableController::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             void VariableController::waitForFinish()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }

gui/resources/sqpguiresources.qrc +2 0

             <RCC>
                 <qresource prefix="/">
                     <file>icones/openInspector.png</file>
+                    <file>icones/next.png</file>
+                    <file>icones/previous.png</file>
                 </qresource>
             </RCC>

gui/src/SidePane/SqpSidePane.cpp 0 -7

             #include "SidePane/SqpSidePane.h"
             #include "ui_SqpSidePane.h"
             #include <QAction>
             #include <QLayout>
             #include <QToolBar>
             namespace {
             static const QString SQPSIDEPANESTYLESHEET
                 = "QToolBar {"
                   " background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,"
                   "                              stop: 0.0 #5a5a5a,"
                   "                              stop: 1.0 #414141);"
                   " border: none;"
                   " border-left: 1px solid #424242;"
                   "border-right: 1px solid #393939;"
                   " }"
                   " QToolButton {"
                   "background: none;"
                   "border: none;"
                   " }";
             }
             SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane}
             {
                 //    QVBoxLayout *sidePaneLayout = new QVBoxLayout(this);
                 //    sidePaneLayout->setContentsMargins(0, 0, 0, 0);
                 //    this->setLayout(sidePaneLayout);
                 ui->setupUi(this);
                 m_SidePaneToolbar = new QToolBar();
                 m_SidePaneToolbar->setOrientation(Qt::Vertical);
                 this->layout()->addWidget(m_SidePaneToolbar);
                 m_SidePaneToolbar->setStyleSheet(SQPSIDEPANESTYLESHEET);
-                this->setStyleSheet(
-                    " QWidget {"
-                    "background: red;"
-                    "border: 1px;"
-                    " }");
             }
             SqpSidePane::~SqpSidePane()
             {
                 delete ui;
             }
             QToolBar *SqpSidePane::sidePane()
             {
                 return m_SidePaneToolbar;
             }

gui/ui/SidePane/SqpSidePane.ui ~~gui/ui/Sidepane/SqpSidePane.ui~~ renamed 0 0

NO CONTENT: file renamed from gui/ui/Sidepane/SqpSidePane.ui to gui/ui/SidePane/SqpSidePane.ui

plugins/mockplugin/src/CosinusProvider.cpp +2 0

             #include "CosinusProvider.h"
             #include <Data/DataProviderParameters.h>
             #include <Data/ScalarSeries.h>
+            #include <cmath>
             std::unique_ptr<IDataSeries>
             CosinusProvider::retrieveData(const DataProviderParameters &parameters) const
             {
                 // Gets the timerange from the parameters
                 auto start = parameters.m_TStart;
                 auto end = parameters.m_TEnd;
                 // We assure that timerange is valid
                 if (end < start) {
                     std::swap(start, end);
                 }
                 // Generates scalar series containing cosinus values (one value per second)
                 auto scalarSeries
                     = std::make_unique<ScalarSeries>(end - start, QStringLiteral("t"), QStringLiteral(""));
                 for (auto time = start; time < end; ++time) {
                     auto dataIndex = time - start;
                     scalarSeries->setData(dataIndex, time, std::cos(time));
                 }
                 return scalarSeries;
             }

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