HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r204:418c600ae7b7

Merge branch 'feature/WidgetsNames' into develop

Alexandre Leroux -

r204:418c600ae7b7

parent child

Context file:

r204:418c600ae7b7

Collapse all files

gui/include/Visualization/VisualizationGraphWidget.h +1 -1

             #ifndef SCIQLOP_VISUALIZATIONGRAPHWIDGET_H
             #define SCIQLOP_VISUALIZATIONGRAPHWIDGET_H
             #include "Visualization/IVisualizationWidget.h"
             #include <QWidget>
             #include <memory>
             #include <Common/spimpl.h>
             class Variable;
             namespace Ui {
             class VisualizationGraphWidget;
             } // namespace Ui
             class VisualizationGraphWidget : public QWidget, public IVisualizationWidget {
                 Q_OBJECT
             public:
-                explicit VisualizationGraphWidget(QWidget *parent = 0);
+                explicit VisualizationGraphWidget(const QString name = {}, QWidget *parent = 0);
                 virtual ~VisualizationGraphWidget();
                 void addVariable(std::shared_ptr<Variable> variable);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidget *visitor) override;
                 void close() override;
                 QString name() const;
             private:
                 Ui::VisualizationGraphWidget *ui;
                 class VisualizationGraphWidgetPrivate;
                 spimpl::unique_impl_ptr<VisualizationGraphWidgetPrivate> impl;
             private slots:
                 /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done
                 void onMouseWheel(QWheelEvent *event) noexcept;
             };
             #endif // SCIQLOP_VISUALIZATIONGRAPHWIDGET_H

gui/include/Visualization/VisualizationTabWidget.h +14 -3

             #ifndef SCIQLOP_VISUALIZATIONTABWIDGET_H
             #define SCIQLOP_VISUALIZATIONTABWIDGET_H
             #include "Visualization/IVisualizationWidget.h"
+            #include <Common/spimpl.h>
             #include <QWidget>
+            class Variable;
             class VisualizationZoneWidget;
             namespace Ui {
             class VisualizationTabWidget;
             } // namespace Ui
             class VisualizationTabWidget : public QWidget, public IVisualizationWidget {
                 Q_OBJECT
             public:
-                explicit VisualizationTabWidget(QWidget *parent = 0);
+                explicit VisualizationTabWidget(const QString &name = {}, QWidget *parent = 0);
                 virtual ~VisualizationTabWidget();
                 /// Add a zone widget
                 void addZone(VisualizationZoneWidget *zoneWidget);
-                /// Create a zone using a Variable
+                /**
-                VisualizationZoneWidget *createZone();
+                 * Creates a zone using a variable. The variable will be displayed in a new graph of the new
+                 * zone.
+                 * @param variable the variable for which to create the zone
+                 * @return the pointer to the created zone
+                 */
+                VisualizationZoneWidget *createZone(std::shared_ptr<Variable> variable);
                 /// Remove a zone
                 void removeZone(VisualizationZoneWidget *zone);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidget *visitor) override;
                 void close() override;
                 QString name() const override;
             private:
                 Ui::VisualizationTabWidget *ui;
+                class VisualizationTabWidgetPrivate;
+                spimpl::unique_impl_ptr<VisualizationTabWidgetPrivate> impl;
             };
             #endif // SCIQLOP_VISUALIZATIONTABWIDGET_H

gui/include/Visualization/VisualizationZoneWidget.h +10 -5

             #ifndef SCIQLOP_VISUALIZATIONZONEWIDGET_H
             #define SCIQLOP_VISUALIZATIONZONEWIDGET_H
             #include "Visualization/IVisualizationWidget.h"
-            class VisualizationGraphWidget;
             #include <QWidget>
             namespace Ui {
             class VisualizationZoneWidget;
             } // Ui
+            class Variable;
+            class VisualizationGraphWidget;
             class VisualizationZoneWidget : public QWidget, public IVisualizationWidget {
                 Q_OBJECT
             public:
-                explicit VisualizationZoneWidget(QWidget *parent = 0);
+                explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0);
                 virtual ~VisualizationZoneWidget();
                 /// Add a graph widget
                 void addGraph(VisualizationGraphWidget *graphWidget);
-                /// Create a graph using a Variable
+                /**
-                VisualizationGraphWidget *createGraph();
+                 * Creates a graph using a variable. The variable will be displayed in the new graph.
+                 * @param variable the variable for which to create the graph
+                 * @return the pointer to the created graph
+                 */
+                VisualizationGraphWidget *createGraph(std::shared_ptr<Variable> variable);
                 /// Remove a graph
                 void removeGraph(VisualizationGraphWidget *graph);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidget *visitor) override;
                 void close() override;
                 QString name() const override;
             private:
                 Ui::VisualizationZoneWidget *ui;
             };
             #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H

gui/src/Visualization/VisualizationGraphWidget.cpp +11 -2

             #include "Visualization/VisualizationGraphWidget.h"
             #include "Visualization/GraphPlottablesFactory.h"
             #include "ui_VisualizationGraphWidget.h"
             #include <Variable/Variable.h>
             #include <unordered_map>
             namespace {
             /// Key pressed to enable zoom on horizontal axis
             const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
             /// Key pressed to enable zoom on vertical axis
             const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier;
             } // namespace
             struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
                 // 1 variable -> n qcpplot
                 std::unordered_map<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMap;
             };
-            VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)
+            VisualizationGraphWidget::VisualizationGraphWidget(const QString name, QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::VisualizationGraphWidget},
                       impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
             {
                 ui->setupUi(this);
+                // qcpplot title
+                ui->widget->plotLayout()->insertRow(0);
+                ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name});
                 // Set qcpplot properties :
                 // - Drag (on x-axis) and zoom are enabled
                 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
                 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
                 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
                 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
             }
             VisualizationGraphWidget::~VisualizationGraphWidget()
             {
                 delete ui;
             }
             void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
             {
                 // Uses delegate to create the qcpplot components according to the variable
                 auto createdPlottables = GraphPlottablesFactory::create(variable, *ui->widget);
                 for (auto createdPlottable : qAsConst(createdPlottables)) {
                     impl->m_VariableToPlotMap.insert({variable, createdPlottable});
                 }
             }
             void VisualizationGraphWidget::accept(IVisualizationWidget *visitor)
             {
                 // TODO: manage the visitor
             }
             void VisualizationGraphWidget::close()
             {
                 // The main view cannot be directly closed.
                 return;
             }
             QString VisualizationGraphWidget::name() const
             {
-                return QStringLiteral("MainView");
+                if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) {
+                    return title->text();
+                }
+                else {
+                    return QString{};
+                }
             }
             void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
             {
                 auto zoomOrientations = QFlags<Qt::Orientation>{};
                 // Lambda that enables a zoom orientation if the key modifier related to this orientation has
                 // been pressed
                 auto enableOrientation
                     = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
                           auto orientationEnabled = event->modifiers().testFlag(modifier);
                           zoomOrientations.setFlag(orientation, orientationEnabled);
                       };
                 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
                 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
                 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
             }

gui/src/Visualization/VisualizationTabWidget.cpp +33 -5

             #include "Visualization/VisualizationTabWidget.h"
             #include "ui_VisualizationTabWidget.h"
             #include "Visualization/VisualizationZoneWidget.h"
+            namespace {
-            VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
+            /// Generates a default name for a new zone, according to the number of zones already displayed in
-                    : QWidget{parent}, ui{new Ui::VisualizationTabWidget}
+            /// the tab
+            QString defaultZoneName(const QLayout &layout)
+            {
+                auto count = 0;
+                for (auto i = 0; i < layout.count(); ++i) {
+                    if (dynamic_cast<VisualizationZoneWidget *>(layout.itemAt(i)->widget())) {
+                        count++;
+                    }
+                }
+                return QObject::tr("Zone %1").arg(count + 1);
+            }
+            } // namespace
+            struct VisualizationTabWidget::VisualizationTabWidgetPrivate {
+                explicit VisualizationTabWidgetPrivate(const QString &name) : m_Name{name} {}
+                QString m_Name;
+            };
+            VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent)
+                    : QWidget{parent},
+                      ui{new Ui::VisualizationTabWidget},
+                      impl{spimpl::make_unique_impl<VisualizationTabWidgetPrivate>(name)}
             {
                 ui->setupUi(this);
             }
             VisualizationTabWidget::~VisualizationTabWidget()
             {
                 delete ui;
             }
             void VisualizationTabWidget::addZone(VisualizationZoneWidget *zoneWidget)
             {
                 this->layout()->addWidget(zoneWidget);
             }
-            VisualizationZoneWidget *VisualizationTabWidget::createZone()
+            VisualizationZoneWidget *VisualizationTabWidget::createZone(std::shared_ptr<Variable> variable)
             {
-                auto zoneWidget = new VisualizationZoneWidget{this};
+                auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*layout()), this};
                 this->addZone(zoneWidget);
+                // Creates a new graph into the zone
+                zoneWidget->createGraph(variable);
                 return zoneWidget;
             }
             void VisualizationTabWidget::removeZone(VisualizationZoneWidget *zone)
             {
             }
             void VisualizationTabWidget::accept(IVisualizationWidget *visitor)
             {
                 // TODO: manage the visitor
             }
             void VisualizationTabWidget::close()
             {
                 // The main view cannot be directly closed.
                 return;
             }
             QString VisualizationTabWidget::name() const
             {
-                return QStringLiteral("MainView");
+                return impl->m_Name;
             }

gui/src/Visualization/VisualizationWidget.cpp +7 -12

             #include "Visualization/VisualizationWidget.h"
             #include "Visualization/VisualizationGraphWidget.h"
             #include "Visualization/VisualizationTabWidget.h"
             #include "Visualization/VisualizationZoneWidget.h"
             #include "Visualization/qcustomplot.h"
             #include "ui_VisualizationWidget.h"
             #include <QToolButton>
             Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
             VisualizationWidget::VisualizationWidget(QWidget *parent)
                     : QWidget{parent}, ui{new Ui::VisualizationWidget}
             {
                 ui->setupUi(this);
                 auto addTabViewButton = new QToolButton{ui->tabWidget};
                 addTabViewButton->setText(tr("Add View"));
                 addTabViewButton->setCursor(Qt::ArrowCursor);
                 ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);
                 auto enableMinimumCornerWidgetSize = [this](bool enable) {
                     auto tabViewCornerWidget = ui->tabWidget->cornerWidget();
                     auto width = enable ? tabViewCornerWidget->width() : 0;
                     auto height = enable ? tabViewCornerWidget->height() : 0;
                     tabViewCornerWidget->setMinimumHeight(height);
                     tabViewCornerWidget->setMinimumWidth(width);
                     ui->tabWidget->setMinimumHeight(height);
                     ui->tabWidget->setMinimumWidth(width);
                 };
                 auto addTabView = [this, enableMinimumCornerWidgetSize]() {
-                    auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
+                    auto widget = new VisualizationTabWidget{QString{"View %1"}.arg(ui->tabWidget->count() + 1),
-                                                       QString("View %1").arg(ui->tabWidget->count() + 1));
+                                                             ui->tabWidget};
+                    auto index = ui->tabWidget->addTab(widget, widget->name());
                     if (ui->tabWidget->count() > 0) {
                         enableMinimumCornerWidgetSize(false);
                     }
                     qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index);
                 };
                 auto removeTabView = [this, enableMinimumCornerWidgetSize](int index) {
                     if (ui->tabWidget->count() == 1) {
                         enableMinimumCornerWidgetSize(true);
                     }
                     ui->tabWidget->removeTab(index);
                     qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index);
                 };
                 ui->tabWidget->setTabsClosable(true);
                 connect(addTabViewButton, &QToolButton::clicked, addTabView);
                 connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
+                // Adds default tab
+                addTabView();
             }
             VisualizationWidget::~VisualizationWidget()
             {
                 delete ui;
             }
             void VisualizationWidget::addTab(VisualizationTabWidget *tabWidget)
             {
                 // NOTE: check is this method has to be deleted because of its dupplicated version visible as
                 // lambda function (in the constructor)
             }
             VisualizationTabWidget *VisualizationWidget::createTab()
             {
             }
             void VisualizationWidget::removeTab(VisualizationTabWidget *tab)
             {
                 // NOTE: check is this method has to be deleted because of its dupplicated version visible as
                 // lambda function (in the constructor)
             }
             void VisualizationWidget::accept(IVisualizationWidget *visitor)
             {
                 // TODO: manage the visitor
             }
             void VisualizationWidget::close()
             {
                 // The main view cannot be directly closed.
                 return;
             }
             QString VisualizationWidget::name() const
             {
                 return QStringLiteral("MainView");
             }
             void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) {
-                    if (auto newZone = currentTab->createZone()) {
+                    if (!currentTab->createZone(variable)) {
-                        if (auto newGraph = newZone->createGraph()) {
-                            newGraph->addVariable(variable);
-                        else {
-                            qCCritical(LOG_VisualizationWidget())
-                                << tr("Can't display the variable : can't create the graph");
-                    else {
                         qCCritical(LOG_VisualizationWidget())
                             << tr("Can't display the variable : can't create a new zone in the current tab");
                     }
                 }
                 else {
                     qCCritical(LOG_VisualizationWidget())
                         << tr("Can't display the variable : there is no current tab");
                 }
             }

gui/src/Visualization/VisualizationZoneWidget.cpp +27 -4

             #include "Visualization/VisualizationZoneWidget.h"
             #include "ui_VisualizationZoneWidget.h"
             #include "Visualization/VisualizationGraphWidget.h"
-            VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
+            namespace {
+            /// Generates a default name for a new graph, according to the number of graphs already displayed in
+            /// the zone
+            QString defaultGraphName(const QLayout &layout)
+            {
+                auto count = 0;
+                for (auto i = 0; i < layout.count(); ++i) {
+                    if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) {
+                        count++;
+                    }
+                }
+                return QObject::tr("Graph %1").arg(count + 1);
+            }
+            } // namespace
+            VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                     : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
             {
                 ui->setupUi(this);
+                ui->zoneNameLabel->setText(name);
             }
             VisualizationZoneWidget::~VisualizationZoneWidget()
             {
                 delete ui;
             }
             void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget)
             {
                 ui->visualizationZoneFrame->layout()->addWidget(graphWidget);
             }
-            VisualizationGraphWidget *VisualizationZoneWidget::createGraph()
+            VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)
             {
-                auto graphWidget = new VisualizationGraphWidget{this};
+                auto graphWidget = new VisualizationGraphWidget{
+                    defaultGraphName(*ui->visualizationZoneFrame->layout()), this};
                 this->addGraph(graphWidget);
+                graphWidget->addVariable(variable);
                 return graphWidget;
             }
             void VisualizationZoneWidget::removeGraph(VisualizationGraphWidget *graph)
             {
             }
             void VisualizationZoneWidget::accept(IVisualizationWidget *visitor)
             {
                 // TODO: manage the visitor
             }
             void VisualizationZoneWidget::close()
             {
                 // The main view cannot be directly closed.
                 return;
             }
             QString VisualizationZoneWidget::name() const
             {
-                return QStringLiteral("MainView");
+                return ui->zoneNameLabel->text();
             }

gui/ui/Visualization/VisualizationWidget.ui +1 -14

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>VisualizationWidget</class>
              <widget class="QWidget" name="VisualizationWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>400</width>
                 <height>300</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout">
                <item>
                 <widget class="QTabWidget" name="tabWidget">
                  <property name="currentIndex">
-                  <number>0</number>
+                  <number>-1</number>
                  </property>
-                 <widget class="VisualizationTabWidget" name="firstView">
-                  <attribute name="title">
-                   <string>View 1</string>
-                  </attribute>
-                 </widget>
                 </widget>
                </item>
               </layout>
              </widget>
-             <customwidgets>
-              <customwidget>
-               <class>VisualizationTabWidget</class>
-               <extends>QWidget</extends>
-               <header location="global">Visualization/VisualizationTabWidget.h</header>
-               <container>1</container>
-              </customwidget>
-             </customwidgets>
              <resources/>
              <connections/>
             </ui>

gui/ui/Visualization/VisualizationZoneWidget.ui +41 -15

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>VisualizationZoneWidget</class>
              <widget class="QWidget" name="VisualizationZoneWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>400</width>
                 <height>300</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_2">
-               <property name="spacing">
+               <item>
-                <number>3</number>
+                <widget class="QWidget" name="infobar" native="true">
-               </property>
+                 <property name="sizePolicy">
-               <property name="leftMargin">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <number>0</number>
+                   <horstretch>0</horstretch>
-               </property>
+                   <verstretch>0</verstretch>
-               <property name="topMargin">
+                  </sizepolicy>
-                <number>0</number>
+                 </property>
-               </property>
+                 <layout class="QHBoxLayout" name="horizontalLayout">
-               <property name="rightMargin">
+                  <property name="leftMargin">
-                <number>0</number>
+                   <number>0</number>
-               </property>
+                  </property>
-               <property name="bottomMargin">
+                  <property name="topMargin">
-                <number>0</number>
+                   <number>0</number>
-               </property>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="zoneNameLabel">
+                    <property name="styleSheet">
+                     <string notr="true">color: rgb(127, 127, 127);
+            </string>
+                    </property>
+                    <property name="text">
+                     <string>TextLabel</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
                <item>
                 <widget class="QFrame" name="visualizationZoneFrame">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
                  <property name="frameShape">
                   <enum>QFrame::Box</enum>
                  </property>
                  <property name="frameShadow">
                   <enum>QFrame::Raised</enum>
                  </property>
                  <property name="lineWidth">
                   <number>1</number>
                  </property>
                  <layout class="QVBoxLayout" name="verticalLayout"/>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

gui/vera-exclusions/exclusions.txt +2 0

             \.h:\d+:.IPSIS_S04.*found: ui
             qcustomplot\.h:\d+:.IPSIS
             qcustomplot\.cpp:\d+:.IPSIS
             # Ignore false positive relative to App macro
             SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
             SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
             # Ignore false positive relative to unnamed namespace
             DataSourceTreeWidgetItem\.cpp:\d+:.*IPSIS_F13.*
+            VisualizationTabWidget\.cpp:\d+:.*IPSIS_F13.*
+            VisualizationZoneWidget\.cpp:\d+:.*IPSIS_F13.*

	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