HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r188:a02da6065266

Fixes after review

Alexandre Leroux -

r188:a02da6065266

parent child

Context file:

r188:a02da6065266

Collapse all files

core/include/Data/DataSeries.h +4 -4

             #ifndef SCIQLOP_DATASERIES_H
             #define SCIQLOP_DATASERIES_H
             #include <Data/ArrayData.h>
             #include <Data/IDataSeries.h>
             #include <memory>
             /**
              * @brief The DataSeries class is the base (abstract) implementation of IDataSeries.
              *
              * It proposes to set a dimension for the values data
              *
              * @tparam Dim The dimension of the values data
              *
              */
             template <int Dim>
             class DataSeries : public IDataSeries {
             public:
                 /// @sa IDataSeries::xAxisData()
                 std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; }
                 /// @sa IDataSeries::xAxisUnit()
                 Unit xAxisUnit() const override { return m_XAxisUnit; }
                 /// @return the values dataset
                 std::shared_ptr<ArrayData<Dim> > valuesData() const { return m_ValuesData; }
                 /// @sa IDataSeries::valuesUnit()
                 Unit valuesUnit() const override { return m_ValuesUnit; }
             protected:
                 /// Protected ctor (DataSeries is abstract)
-                explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, Unit xAxisUnit,
+                explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, const Unit &xAxisUnit,
-                                    std::shared_ptr<ArrayData<Dim> > valuesData, Unit valuesUnit)
+                                    std::shared_ptr<ArrayData<Dim> > valuesData, const Unit &valuesUnit)
                         : m_XAxisData{xAxisData},
-                          m_XAxisUnit{std::move(xAxisUnit)},
+                          m_XAxisUnit{xAxisUnit},
                           m_ValuesData{valuesData},
-                          m_ValuesUnit{std::move(valuesUnit)}
+                          m_ValuesUnit{valuesUnit}
                 {
                 }
             private:
                 std::shared_ptr<ArrayData<1> > m_XAxisData;
                 Unit m_XAxisUnit;
                 std::shared_ptr<ArrayData<Dim> > m_ValuesData;
                 Unit m_ValuesUnit;
             };
             #endif // SCIQLOP_DATASERIES_H

core/include/Data/ScalarSeries.h +1 -1

             #ifndef SCIQLOP_SCALARSERIES_H
             #define SCIQLOP_SCALARSERIES_H
             #include <Data/DataSeries.h>
             /**
              * @brief The ScalarSeries class is the implementation for a data series representing a scalar.
              */
             class ScalarSeries : public DataSeries<1> {
             public:
                 /**
                  * Ctor
                  * @param size the number of data the series will hold
                  * @param xAxisUnit x-axis unit
                  * @param valuesUnit values unit
                  */
-                explicit ScalarSeries(int size, Unit xAxisUnit, Unit valuesUnit);
+                explicit ScalarSeries(int size, const Unit &xAxisUnit, const Unit &valuesUnit);
                 /**
                  * Sets data for a specific index. The index has to be valid to be effective
                  * @param index the index to which the data will be set
                  * @param x the x-axis data
                  * @param value the value data
                  */
                 void setData(int index, double x, double value) noexcept;
             };
             #endif // SCIQLOP_SCALARSERIES_H

core/src/Data/ScalarSeries.cpp +3 -3

             #include <Data/ScalarSeries.h>
-            ScalarSeries::ScalarSeries(int size, Unit xAxisUnit, Unit valuesUnit)
+            ScalarSeries::ScalarSeries(int size, const Unit &xAxisUnit, const Unit &valuesUnit)
-                    : DataSeries{std::make_shared<ArrayData<1> >(size), std::move(xAxisUnit),
+                    : DataSeries{std::make_shared<ArrayData<1> >(size), xAxisUnit,
-                                 std::make_shared<ArrayData<1> >(size), std::move(valuesUnit)}
+                                 std::make_shared<ArrayData<1> >(size), valuesUnit}
             {
             }
             void ScalarSeries::setData(int index, double x, double value) noexcept
             {
                 xAxisData()->setData(index, x);
                 valuesData()->setData(index, value);
             }

gui/src/Visualization/VisualizationWidget.cpp +8 -8

             #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 enableMinimunCornerWidgetSize = [this](bool enable) {
+                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, enableMinimunCornerWidgetSize]() {
+                auto addTabView = [this, enableMinimumCornerWidgetSize]() {
                     auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
                                                        QString("View %1").arg(ui->tabWidget->count() + 1));
                     if (ui->tabWidget->count() > 0) {
-                        enableMinimunCornerWidgetSize(false);
+                        enableMinimumCornerWidgetSize(false);
                     }
                     qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index);
                 };
-                auto removeTabView = [this, enableMinimunCornerWidgetSize](int index) {
+                auto removeTabView = [this, enableMinimumCornerWidgetSize](int index) {
                     if (ui->tabWidget->count() == 1) {
-                        enableMinimunCornerWidgetSize(true);
+                        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);
             }
             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 (auto newGraph = newZone->createGraph()) {
                             newGraph->addVariable(variable);
                         }
                         else {
-                            qCDebug(LOG_VisualizationWidget())
+                            qCCritical(LOG_VisualizationWidget())
                                 << tr("Can't display the variable : can't create the graph");
                         }
                     }
                     else {
-                        qCDebug(LOG_VisualizationWidget())
+                        qCCritical(LOG_VisualizationWidget())
                             << tr("Can't display the variable : can't create a new zone in the current tab");
                     }
                 }
                 else {
-                    qCDebug(LOG_VisualizationWidget())
+                    qCCritical(LOG_VisualizationWidget())
                         << tr("Can't display the variable : there is no current tab");
                 }
             }

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