GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r638:75b3f966c96e

Merge pull request from SCIQLOP-Initialisation develop...

perrinel -

r638:75b3f966c96e

parent child

Context file:

r638:75b3f966c96e

core/src/Variable/VariableModel.cpp +6 -3

                          /// that contains the time value to display
                          auto dateTimeVariant = [variable](const auto &getValueFun) {
                              if (auto dataSeries = variable->dataSeries()) {
+                                 dataSeries->lockRead();
                                  auto it = getValueFun(*dataSeries);
-                                 return (it != dataSeries->cend())
-                                            ? DateUtils::dateTime(it->x()).toString(DATETIME_FORMAT)
-                                            : QVariant{};
+                                 auto resVariant = (it != dataSeries->cend())
+                                                       ? DateUtils::dateTime(it->x()).toString(DATETIME_FORMAT)
+                                                       : QVariant{};
+                                 dataSeries->unlock();
+                                 return resVariant;
                              }
                              else {
                                  return QVariant{};

core/tests/meson.build +7 -7

              tests = [
-               [['Data/TestDataSeries.cpp'],['test_data'],['DataSeries test']],
-               [['Data/TestOneDimArrayData.cpp'],['test_1d'],['One Dim Array test']],
-               [['Data/TestTwoDimArrayData.cpp'],['test_2d'],['Two Dim Array test']],
-               [['DataSource/TestDataSourceController.cpp'],['test_data_source'],['DataSourceController test']],
-               [['Variable/TestVariableCacheController.cpp'],['test_variable_cache'],['VariableCacheController test']],
-               [['Variable/TestVariable.cpp'],['test_variable'],['Variable test']]
+               [['Data/TestDataSeries.cpp'],'test_data','DataSeries test'],
+               [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
+               [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
+               [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
+               [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
+               [['Variable/TestVariable.cpp'],'test_variable','Variable test']
              ]
              foreach unit_test : tests
                                        link_with : sciqlop_core,
                                        include_directories : core_inc,
                                        dependencies : [qt5core, qt5widgets, qt5network,qt5test])
-               test(unit_test[2], test_exe)
+               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
              endforeach

gui/src/Visualization/VisualizationGraphHelper.cpp +6 -2

                  }
              }
-             /// Sets axes properties according to the properties of a data series
+             /// Sets axes properties according to the properties of a data series. Not thread safe
              template <int Dim>
              void setAxesProperties(const DataSeries<Dim> &dataSeries, QCustomPlot &plot) noexcept
              {
                      PlottablesMap result{};
                      // Gets the number of components of the data series
+                     dataSeries.lockRead();
                      auto componentCount = dataSeries.valuesData()->componentCount();
+                     dataSeries.unlock();
                      auto colors = ColorUtils::colors(Qt::blue, Qt::red, componentCount);
                      }
                      // Axes properties
+                     dataSeries.lockRead();
                      setAxesProperties(dataSeries, plot);
+                     dataSeries.unlock();
                      plot.replot();
                  static void updatePlottables(T &dataSeries, PlottablesMap &plottables, const SqpRange &range,
                                               bool rescaleAxes)
                  {
-                     dataSeries.lockRead();
                      // For each plottable to update, resets its data
                      std::map<int, QSharedPointer<SqpDataContainer> > dataContainers{};
                              dataContainers.insert({plottable.first, dataContainer});
                          }
                      }
+                     dataSeries.lockRead();
                      // - Gets the data of the series included in the current range
                      // - Updates each plottable by adding, for each data item, a point that takes x-axis data

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

                  // get y using variable range
                  if (auto dataSeries = variable->dataSeries()) {
-                     auto valuesBounds = dataSeries->valuesBounds(range.m_TStart, range.m_TEnd);
+                     dataSeries->lockRead();
+                     auto valuesBounds
+                         = dataSeries->valuesBounds(variable->range().m_TStart, variable->range().m_TEnd);
                      auto end = dataSeries->cend();
                      if (valuesBounds.first != end && valuesBounds.second != end) {
                          auto rangeValue = [](const auto &value) { return std::isnan(value) ? 0. : value; };
                          graphWidget->setYRange(SqpRange{minValue, maxValue});
                      }
+                     dataSeries->unlock();
                  }
                  return graphWidget;

meson.build +1 -2

              if cppcheck.found()
                run_target('cppcheck',
                            command : [cppcheck, '--enable=all',
-                           '--project=' + join_paths(meson.build_root(), 'compile_commands.json')],
-                           build_by_default : true
+                           '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
                            )
              endif

plugins/amda/meson.build +4 -4

              tests = [
-               [['tests/TestAmdaParser.cpp'],['test_amda_parser'],['AMDA parser test']],
-               [['tests/TestAmdaResultParser.cpp'],['test_amda_result_parser'],['AMDA result parser test']],
-               [['tests/TestAmdaAcquisition.cpp'],['test_amda_acquisition'],['AMDA Acquisition test']]
+               [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
+               [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
+               [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
              ]
              foreach unit_test : tests
                                        include_directories : [core_inc, amdaplugin_inc, gui_inc],
                                        cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
                                        dependencies : [qt5core, qt5widgets, qt5network,qt5test])
-               test(unit_test[2], test_exe,timeout: 3 * 60)
+               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
              endforeach

plugins/mockplugin/src/CosinusProvider.cpp +1 -1

                  auto dataIndex = 0;
                  // Gets the timerange from the parameters
-                 double freq = 100.0;
+                 double freq = 1.0;
                  double start = std::ceil(dataRangeRequested.m_TStart * freq); // 100 htz
                  double end = std::floor(dataRangeRequested.m_TEnd * freq);    // 100 htz

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