GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r262:aa248a9c406a

Merge pull request from SCIQLOP-Initialisation develop...

perrinel -

r262:aa248a9c406a

parent child

Context file:

r262:aa248a9c406a

app/src/Main.cpp +5 -3

              #if __GNUC__
              #if __x86_64__ || __ppc64__
-                 pluginDir.cd("../lib64/SciQlop");
+                 if (!pluginDir.cd("../lib64/SciQlop")) {
+                     pluginDir.cd("../lib64/sciqlop");
+                 }
              #else
-                 pluginDir.cd("../lib/SciQlop");
-             #endif
+                 __x86_64__ || __ppc64__ if (!pluginDir.cd("../lib/SciQlop")) { pluginDir.cd("../lib/sciqlop"); }
+                 #endif
              #endif
                  qCDebug(LOG_PluginManager())
                      << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());

core/include/Data/SqpDateTime.h +5 0

                  {
                      return (m_TStart <= dateTime.m_TStart && m_TEnd >= dateTime.m_TEnd);
                  }
+                 bool intersect(const SqpDateTime &dateTime)
+                 {
+                     return (m_TEnd >= dateTime.m_TStart && m_TStart <= dateTime.m_TEnd);
+                 }
              };
              // Required for using shared_ptr in signals/slots

core/include/Variable/Variable.h +2 0

                  QString mission() const noexcept;
                  QString unit() const noexcept;
                  SqpDateTime dateTime() const noexcept;
+                 void setDateTime(const SqpDateTime &dateTime) noexcept;
                  /// @return the data of the variable, nullptr if there is no data
                  IDataSeries *dataSeries() const noexcept;
                  bool contains(const SqpDateTime &dateTime);
+                 bool intersect(const SqpDateTime &dateTime);
                  void setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept;
              public slots:

core/src/Variable/Variable.cpp +10 -12

                  return impl->m_DateTime;
              }
+             void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
+             {
+                 impl->m_DateTime = dateTime;
+             }
              void Variable::setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept
              {
                  if (!impl->m_DataSeries) {
              bool Variable::contains(const SqpDateTime &dateTime)
              {
-                 if (!impl->m_DateTime.contains(dateTime)) {
-                     // The current variable dateTime isn't enough to display the dateTime requested.
-                     // We have to update it to the new dateTime requested.
-                     // the correspondant new data to display will be given by the cache if possible and the
-                     // provider if necessary.
-                     qCInfo(LOG_Variable()) << "NEW DATE NEEDED";
-                     impl->m_DateTime = dateTime;
-                     return false;
+                 }
+                 return impl->m_DateTime.contains(dateTime);
+             }
-                 return true;
+             bool Variable::intersect(const SqpDateTime &dateTime)
+             {
+                 return impl->m_DateTime.intersect(dateTime);
              }

gui/src/Visualization/VisualizationGraphWidget.cpp +39 -7

                  for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                       it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                      auto variable = it->first;
-                     auto tolerance = 0.1 * (t2.upper - t2.lower);
-                     auto dateTime = SqpDateTime{t2.lower - tolerance, t2.upper + tolerance};
+                     qCInfo(LOG_VisualizationGraphWidget())
+                         << tr("TORM: VisualizationGraphWidget::onRangeChanged")
+                         << variable->dataSeries()->xAxisData()->size();
+                     auto dateTime = SqpDateTime{t2.lower, t2.upper};
-                     qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
-                                                            << variable->dataSeries()->xAxisData()->size();
                      if (!variable->contains(dateTime)) {
-                         sqpApp->variableController().requestDataLoading(variable, dateTime);
+                         auto variableDateTimeWithTolerance = dateTime;
+                         if (variable->intersect(dateTime)) {
+                             auto variableDateTime = variable->dateTime();
+                             if (variableDateTime.m_TStart < dateTime.m_TStart) {
+                                 dateTime.m_TStart = variableDateTime.m_TStart;
+                                 // START is set to the old one. tolerance have to be added to the right
+                                 // add 10% tolerance for right (end) side
+                                 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                 variableDateTimeWithTolerance.m_TEnd += tolerance;
+                             }
+                             if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
+                                 dateTime.m_TEnd = variableDateTime.m_TEnd;
+                                 // END is set to the old one. tolerance have to be added to the left
+                                 // add 10% tolerance for left (start) side
+                                 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                 variableDateTimeWithTolerance.m_TStart -= tolerance;
+                             }
+                         }
+                         else {
+                             // add 10% tolerance for each side
+                             auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                             variableDateTimeWithTolerance.m_TStart -= tolerance;
+                             variableDateTimeWithTolerance.m_TEnd += tolerance;
+                         }
+                         variable->setDateTime(dateTime);
+                         // CHangement detected, we need to ask controller to request data loading
+                         sqpApp->variableController().requestDataLoading(variable,
+                                                                         variableDateTimeWithTolerance);
                      }
                  }
              }
              {
                  auto zoomOrientations = QFlags<Qt::Orientation>{};
-                 // Lambda that enables a zoom orientation if the key modifier related to this orientation has
+                 // 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) {
              void VisualizationGraphWidget::onDataCacheVariableUpdated()
              {
                  // NOTE:
-                 //    We don't want to call the method for each component of a variable unitarily, but for all
+                 //    We don't want to call the method for each component of a variable unitarily, but for
+                 //    all
                  //    its components at once (eg its three components in the case of a vector).
                  //    The unordered_multimap does not do this easily, so the question is whether to:

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