GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r447:00ae2619d35f

Correction for MR

perrinel -

r447:00ae2619d35f

parent child

Context file:

r447:00ae2619d35f

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

                  void removeVariable(std::shared_ptr<Variable> variable) noexcept;
                  void setRange(std::shared_ptr<Variable> variable, const SqpDateTime &range);
-                 SqpDateTime graphRange();
+                 SqpDateTime graphRange() const noexcept;
                  void setGraphRange(const SqpDateTime &range);
                  // IVisualizationWidget interface

gui/src/Variable/VariableInspectorWidget.cpp +3 -4

                              auto buttonRect = QRect(progressRect.right(), option.rect.top(), cancelButtonWidth,
                                                      option.rect.height());
-                             QMouseEvent *e = (QMouseEvent *)event;
-                             int clickX = e->x();
-                             int clickY = e->y();
+                             auto e = (QMouseEvent *)event;
+                             auto clickX = e->x();
+                             auto clickY = e->y();
                              auto x = buttonRect.left();   // the X coordinate
                              auto y = buttonRect.top();    // the Y coordinate
                              if (clickX > x && clickX < x + w) {
                                  if (clickY > y && clickY < y + h) {
-                                     qCritical(LOG_VariableInspectorWidget()) << tr("editorEvent CLIC");
                                      auto variableModel = sqpApp->variableController().variableModel();
                                      variableModel->abortProgress(index);
                                  }

gui/src/Visualization/VisualizationGraphWidget.cpp +6 -4

              struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
-                 explicit VisualizationGraphWidgetPrivate() : m_DoSynchronize(true), m_IsCalibration(false) {}
+                 explicit VisualizationGraphWidgetPrivate() : m_DoSynchronize{true}, m_IsCalibration{false} {}
                  // Return the operation when range changed
                  auto variableDateTimeWithTolerance = dateTime;
-                 // add 10% tolerance for each side
-                 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                 // add 20% tolerance for each side
+                 auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
                  variableDateTimeWithTolerance.m_TStart -= tolerance;
                  variableDateTimeWithTolerance.m_TEnd += tolerance;
              void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable,
                                                      const SqpDateTime &range)
              {
+                 // Note: in case of different axes that depends on variable, we could start with a code like
+                 // that:
                  //    auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
                  //    for (auto it = componentsIt.first; it != componentsIt.second;) {
                  //    }
                  ui->widget->replot();
              }
-             SqpDateTime VisualizationGraphWidget::graphRange()
+             SqpDateTime VisualizationGraphWidget::graphRange() const noexcept
              {
                  auto grapheRange = ui->widget->xAxis->range();
                  return SqpDateTime{grapheRange.lower, grapheRange.upper};

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

              void VisualizationWidget::onRangeChanged(std::shared_ptr<Variable> variable,
                                                       const SqpDateTime &range) noexcept
              {
-                 // Calls the operation of removing all references to the variable in the visualization
+                 // Calls the operation of rescaling all graph that contrains variable in the visualization
                  auto rescaleVariableOperation = RescaleAxeOperation{variable, range};
                  accept(&rescaleVariableOperation);
              }

gui/src/Visualization/operations/RescaleAxeOperation.cpp +2 -2

              struct RescaleAxeOperation::RescaleAxeOperationPrivate {
                  explicit RescaleAxeOperationPrivate(std::shared_ptr<Variable> variable,
                                                      const SqpDateTime &range)
-                         : m_Variable(variable), m_Range(range)
+                         : m_Variable{variable}, m_Range{range}
                  {
                  }
              void RescaleAxeOperation::visit(VisualizationGraphWidget *graphWidget)
              {
                  if (graphWidget) {
-                     // If the widget contains the variable, removes it
+                     // If the widget contains the variable, rescale it
                      if (impl->m_Variable && graphWidget->contains(*impl->m_Variable)) {
                          graphWidget->setRange(impl->m_Variable, impl->m_Range);
                      }

plugins/amda/tests/TestAmdaResultParser.cpp +4 -4

                             QVector<double>{-2.71850, -2.52150}};
                  // Invalid files
-                 QTest::newRow("Invalid file (unexisting file)")
-                     << QStringLiteral("UnexistingFile.txt") << ExpectedResults{};
+                 QTest::newRow("Invalid file (unexisting file)") << QStringLiteral("UnexistingFile.txt")
+                                                                 << ExpectedResults{};
-                 QTest::newRow("Invalid file (file not found on server)")
-                     << QStringLiteral("FileNotFound.txt") << ExpectedResults{};
+                 QTest::newRow("Invalid file (file not found on server)") << QStringLiteral("FileNotFound.txt")
+                                                                          << ExpectedResults{};
              }
              void TestAmdaResultParser::testReadTxt()

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