From 10a45fa6051989b0d78f23311b417af9469ce0ff 2017-06-23 15:33:04 From: mperrinel Date: 2017-06-23 15:33:04 Subject: [PATCH] Merge branch 'feature/VariableCache' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation into feature/VariableCache --- diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index 6747bda..c60b0f4 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -67,8 +67,7 @@ void VisualizationGraphWidget::addVariable(std::shared_ptr variable) impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable}); } - connect(variable.get(), &Variable::dataCacheUpdated, this, - &VisualizationGraphWidget::onDataCacheVariableUpdated); + connect(variable.get(), SIGNAL(dataCacheUpdated()), this, SLOT(onDataCacheVariableUpdated())); } void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor) diff --git a/plugins/mockplugin/src/CosinusProvider.cpp b/plugins/mockplugin/src/CosinusProvider.cpp index d661359..d142c18 100644 --- a/plugins/mockplugin/src/CosinusProvider.cpp +++ b/plugins/mockplugin/src/CosinusProvider.cpp @@ -45,7 +45,7 @@ void CosinusProvider::requestDataLoading(const QVector &dateTimeLis } -std::shared_ptr retrieveDataSeries(const SqpDateTime &dateTime) +std::shared_ptr CosinusProvider::retrieveDataSeries(const SqpDateTime &dateTime) { // Gets the timerange from the parameters