Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+11
-11
@@ -25,7 +25,7 @@ MarkerManagementApplyFilter::MarkerManagementApplyFilter(LtsSession::LtsSession
|
||||
m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(spSitMapGuiIfc);
|
||||
if (!spSitMapGuiIfc)
|
||||
{
|
||||
ERROR_LOG() << "No spSitMapGuiIfc";
|
||||
ERROR_LOG(m_logger) << "No spSitMapGuiIfc";
|
||||
return;
|
||||
}
|
||||
m_sitMapGuiIfc = spSitMapGuiIfc;
|
||||
@@ -46,7 +46,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
|
||||
obj[QStringLiteral("SymbolAppearanceJson")] = symbolAppearanceSettings->settingsToJson();
|
||||
}
|
||||
else
|
||||
WARNING_LOG() << "cannot get filter as SymApp filter ifc is missing";
|
||||
WARNING_LOG(m_logger) << "cannot get filter as SymApp filter ifc is missing";
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
|
||||
obj[QStringLiteral("AesFilterJson")] = aesDisplayFilter->filterToJson();
|
||||
}
|
||||
else
|
||||
WARNING_LOG() << "cannot get filter as aes filter ifc is missing";
|
||||
WARNING_LOG(m_logger) << "cannot get filter as aes filter ifc is missing";
|
||||
}
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
|
||||
obj[QStringLiteral("BuildingComponentSettingsJson")] = buildingComponentSettings->bldCmpSettingsToJson();
|
||||
}
|
||||
else
|
||||
WARNING_LOG() << "cannot get filter as BldgCmpnt filter ifc is missing";
|
||||
WARNING_LOG(m_logger) << "cannot get filter as BldgCmpnt filter ifc is missing";
|
||||
}
|
||||
|
||||
return obj;
|
||||
@@ -88,14 +88,14 @@ bool MarkerManagementApplyFilter::applyFilter(const QByteArray &filterContent)
|
||||
{
|
||||
if (filterContent.isEmpty())
|
||||
{
|
||||
ERROR_LOG() << "filterContent is empty";
|
||||
ERROR_LOG(m_logger) << "filterContent is empty";
|
||||
return false;
|
||||
}
|
||||
QJsonParseError parserError;
|
||||
const QJsonDocument jDoc(QJsonDocument::fromJson(filterContent, &parserError));
|
||||
if (parserError.error != QJsonParseError::NoError)
|
||||
{
|
||||
ERROR_LOG() << "Error parsing json document: " << parserError.errorString();
|
||||
ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
|
||||
return false;
|
||||
}
|
||||
return applyFilter(jDoc.object());
|
||||
@@ -110,7 +110,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
|
||||
{
|
||||
const QJsonObject innerObj = filterContent[QStringLiteral("AesFilterJson")].toObject();
|
||||
if (innerObj.isEmpty())
|
||||
ERROR_LOG() << "inner content AesFilterJson is empty";
|
||||
ERROR_LOG(m_logger) << "inner content AesFilterJson is empty";
|
||||
else
|
||||
aesFilter.content(QJsonDocument(innerObj).toJson().constData());
|
||||
}
|
||||
@@ -123,7 +123,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
|
||||
{
|
||||
QJsonObject innerObj = filterContent[QStringLiteral("SymbolAppearanceJson")].toObject();
|
||||
if (innerObj.isEmpty())
|
||||
ERROR_LOG() << "inner content SymbolAppearanceJson is empty";
|
||||
ERROR_LOG(m_logger) << "inner content SymbolAppearanceJson is empty";
|
||||
else
|
||||
symbolAppearance.content(QJsonDocument(innerObj).toJson().constData());
|
||||
}
|
||||
@@ -136,7 +136,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
|
||||
{
|
||||
QJsonObject innerObj = filterContent[QStringLiteral("BuildingComponentSettingsJson")].toObject();
|
||||
if (innerObj.isEmpty())
|
||||
ERROR_LOG() << "inner content BuildingComponentSettingsJson is empty";
|
||||
ERROR_LOG(m_logger) << "inner content BuildingComponentSettingsJson is empty";
|
||||
else
|
||||
buildingComponentFilter.content(QJsonDocument(innerObj).toJson().constData());
|
||||
}
|
||||
@@ -187,7 +187,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
|
||||
appearanceSettings->setSettingsFromData(symbolAppearance);
|
||||
|
||||
} else
|
||||
WARNING_LOG() << "cannot set filter as at least one filter ifc is missing (fltParticipantIfc|fltIfcPtr)";
|
||||
WARNING_LOG(m_logger) << "cannot set filter as at least one filter ifc is missing (fltParticipantIfc|fltIfcPtr)";
|
||||
|
||||
|
||||
|
||||
@@ -206,7 +206,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
|
||||
buildingComponentSettings->setBldCmpSettingsFromData(buildingComponentFilter);
|
||||
}
|
||||
else
|
||||
WARNING_LOG() << "cannot set filter as at least one filter ifc is missing (fltBldgCmpntIfc)";
|
||||
WARNING_LOG(m_logger) << "cannot set filter as at least one filter ifc is missing (fltBldgCmpntIfc)";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
+2
@@ -31,6 +31,8 @@ public:
|
||||
const QJsonObject getFilterParamsJson() const;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
LtsSession::LtsSession *m_session;
|
||||
|
||||
std::weak_ptr<FilterManagement::ForeignFltParticipantGuiInterface> m_fltParticipantIfc;
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ void MarkerManagementDialogModel::loadPreview(int fileContentId, int rowId)
|
||||
QByteArray byteArray;
|
||||
if (m_flmGui->loadContent(fileContentId, byteArray, true) && byteArray.size() > 0)
|
||||
{
|
||||
DEBUG_LOG() << "m_previews.insert fileContentId=" << fileContentId
|
||||
DEBUG_LOG(m_logger) << "m_previews.insert fileContentId=" << fileContentId
|
||||
<< " size Preview=" << byteArray.size();
|
||||
QString str = QStringLiteral("<html><center><img src='data:image/png;base64,%1'></center></html>").arg(QString::fromLatin1(byteArray.toBase64()));
|
||||
m_previews.insert(fileContentId, str);
|
||||
|
||||
+2
@@ -56,6 +56,8 @@ private slots:
|
||||
void loadPreview(int fileContentId, int rowId);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void requestNextFileContent();
|
||||
|
||||
private:
|
||||
|
||||
Reference in new issue
Block a user