From f3d61f9f6572708b3b9d36ba9e41a435503459bf 2017-07-20 15:40:18 From: mperrinel Date: 2017-07-20 15:40:18 Subject: [PATCH] Merge branch 'feature/AmdaAnalysis' into develop --- diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp index fb2c553..c439435 100644 --- a/core/src/Variable/VariableController.cpp +++ b/core/src/Variable/VariableController.cpp @@ -161,6 +161,8 @@ void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime) if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { selectedVariable->setDateTime(dateTime); this->onRequestDataLoading(selectedVariable, dateTime); + + // notify that rescale operation has to be done emit rangeChanged(selectedVariable, dateTime); } } diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index 81d03e6..490203f 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -186,8 +186,8 @@ void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) { - qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged") - << QThread::currentThread()->objectName(); + qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged") + << QThread::currentThread()->objectName(); for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); it != impl->m_VariableToPlotMultiMap.cend(); ++it) { @@ -202,8 +202,8 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) variableDateTimeWithTolerance.m_TStart -= tolerance; variableDateTimeWithTolerance.m_TEnd += tolerance; - qCInfo(LOG_VisualizationGraphWidget()) << "v" << dateTime; - qCInfo(LOG_VisualizationGraphWidget()) << "vtol" << variableDateTimeWithTolerance; + qCDebug(LOG_VisualizationGraphWidget()) << "v" << dateTime; + qCDebug(LOG_VisualizationGraphWidget()) << "vtol" << variableDateTimeWithTolerance; // If new range with tol is upper than variable datetime parameters. we need to request new // data if (!variable->contains(variableDateTimeWithTolerance)) { @@ -212,7 +212,7 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) if (!variable->isInside(dateTime)) { auto variableDateTime = variable->dateTime(); if (variableDateTime.m_TStart < dateTime.m_TStart) { - qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:"); + qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:"); auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd; dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta; @@ -222,7 +222,7 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) variableDateTimeWithTolerance.m_TEnd += tolerance; } else if (variableDateTime.m_TEnd > dateTime.m_TEnd) { - qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: "); + qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: "); auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart; dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta; // Tolerance have to be added to the left @@ -231,29 +231,29 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) variableDateTimeWithTolerance.m_TStart -= tolerance; } else { - qCWarning(LOG_VisualizationGraphWidget()) + qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection anormal zoom detection: "); } } else { - qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: "); + qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: "); // add 10% tolerance for each side tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart); variableDateTimeWithTolerance.m_TStart -= tolerance; variableDateTimeWithTolerance.m_TEnd += tolerance; } if (!variable->contains(dateTimeRange)) { - qCInfo(LOG_VisualizationGraphWidget()) + qCDebug(LOG_VisualizationGraphWidget()) << "TORM: Modif on variable datetime detected" << dateTime; variable->setDateTime(dateTime); } - qCInfo(LOG_VisualizationGraphWidget()) << tr("Request data detection: "); + qCDebug(LOG_VisualizationGraphWidget()) << tr("Request data detection: "); // CHangement detected, we need to ask controller to request data loading emit requestDataLoading(variable, variableDateTimeWithTolerance); } else { - qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: "); + qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: "); } } } @@ -293,10 +293,10 @@ void VisualizationGraphWidget::onDataCacheVariableUpdated() for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); it != impl->m_VariableToPlotMultiMap.cend(); ++it) { auto variable = it->first; - qCInfo(LOG_VisualizationGraphWidget()) + qCDebug(LOG_VisualizationGraphWidget()) << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated S" << variable->dateTime(); - qCInfo(LOG_VisualizationGraphWidget()) + qCDebug(LOG_VisualizationGraphWidget()) << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime; if (dateTime.contains(variable->dateTime()) || dateTime.intersect(variable->dateTime())) { diff --git a/plugins/amda/src/AmdaProvider.cpp b/plugins/amda/src/AmdaProvider.cpp index d9392b0..6191106 100644 --- a/plugins/amda/src/AmdaProvider.cpp +++ b/plugins/amda/src/AmdaProvider.cpp @@ -26,7 +26,7 @@ const auto AMDA_URL_FORMAT = QStringLiteral( "timeFormat=ISO8601&gzip=0"); /// Dates format passed in the URL (e.g 2013-09-23T09:00) -const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:ss"); +const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss"); /// Formats a time to a date that can be passed in URL QString dateFormat(double sqpDateTime) noexcept @@ -81,6 +81,7 @@ void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime, const qCCritical(LOG_AmdaProvider()) << tr("Can't retrieve data: unknown product id"); return; } + qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData") << dateTime; // /////////// // // Creates URL // @@ -90,7 +91,7 @@ void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime, const auto endDate = dateFormat(dateTime.m_TEnd); auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)}; - + qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData url:") << url; auto tempFile = std::make_shared(); // LAMBDA @@ -127,6 +128,8 @@ void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime, const auto downloadFileUrl = QUrl{QString{reply->readAll()}}; + qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData downloadFileUrl:") + << downloadFileUrl; // Executes request for downloading file // // Creates destination file