Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+3
-4
@@ -16,11 +16,10 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ParticipantMana
|
||||
: m_ppmDtc(ppmDtc)
|
||||
, m_aesDtc(aesDtc)
|
||||
, m_guezIedDtc(guezIedDtc)
|
||||
, m_logger(getLogger("AdvancedSymbologyPlugin"))
|
||||
{
|
||||
if (!m_ppmDtc)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "m_ppmDtc not available, No color and injury information will be included in created symbols";
|
||||
WARNING_LOG() << "m_ppmDtc not available, No color and injury information will be included in created symbols";
|
||||
Q_ASSERT(false);
|
||||
}
|
||||
}
|
||||
@@ -98,7 +97,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
|
||||
{
|
||||
if (!m_aesDtc)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id();
|
||||
WARNING_LOG() << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id();
|
||||
return findImage(symDataToRender);
|
||||
}
|
||||
const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId());
|
||||
@@ -111,7 +110,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
|
||||
{
|
||||
if (!m_aesDtc)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id();
|
||||
WARNING_LOG() << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id();
|
||||
return findImage(symDataToRender);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -57,7 +57,6 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
||||
std::shared_ptr<GuezIedManagement::Interface::Dtc> m_guezIedDtc;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+200
-200
File diff suppressed because it is too large.
Load diff
-1
@@ -223,7 +223,6 @@ private:
|
||||
Ui::SymbolEditor *m_ui;
|
||||
SymbolEditorPrivate *m_internal;
|
||||
LtsSession::LtsSession *m_session;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+35
-35
@@ -105,7 +105,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptr<FileManagement::Interface::Dt
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AdvSymbology.FlmSubscriber"))
|
||||
, d(new Private())
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " m_counter =" << ++d->m_counter;
|
||||
INFO_LOG() << Q_FUNC_INFO << " m_counter =" << ++d->m_counter;
|
||||
d->m_flmDtc = flmDtc;
|
||||
d->m_flmFtc = flmFtc;
|
||||
d->m_opmDtc = opmDtc;
|
||||
@@ -122,7 +122,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptr<FileManagement::Interface::Dt
|
||||
|
||||
FlmSubscriber::~FlmSubscriber()
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " m_counter =" << d->m_counter--;
|
||||
INFO_LOG() << Q_FUNC_INFO << " m_counter =" << d->m_counter--;
|
||||
|
||||
if (d->m_reFetchTimer)
|
||||
d->m_reFetchTimer->stop();
|
||||
@@ -154,9 +154,9 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
updateFileContentMap(data);
|
||||
};
|
||||
if (!d->m_flmDtc->fileContents(cb))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Error performing fileContents";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Error performing fileContents";
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
INFO_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
|
||||
|
||||
|
||||
@@ -181,7 +181,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
fcsRef.monitoring.replyState = FileContentStruct::Requested;
|
||||
} else {
|
||||
fcsRef.monitoring.replyState = FileContentStruct::RequestFailure;
|
||||
ERROR_LOG(m_logger) << "Error requesting FileContentData, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << "Error requesting FileContentData, fileContentId=" << fileContentId;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -192,7 +192,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
const int randomOffset = rand() % 10 + 5;
|
||||
QTimer::singleShot(randomOffset, this , [this]()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start ReFetchingTimer";
|
||||
DEBUG_LOG() << "start ReFetchingTimer";
|
||||
d->m_reFetchTimer->start();
|
||||
});
|
||||
|
||||
@@ -204,11 +204,11 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
{
|
||||
const int32_t fileContentId = reply.id();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << fileContentId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, " << fileContentId;
|
||||
|
||||
if (!d->m_fileContentMap.contains(fileContentId))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " fileContentId unknown, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " fileContentId unknown, fileContentId=" << fileContentId;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -218,7 +218,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
const QString &operatorName = fcData.operatorName;
|
||||
const qint64 lastModified = fcData.lastModified;
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " name=" << name
|
||||
<< " operatorName=" << operatorName
|
||||
@@ -234,7 +234,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
QImage image;
|
||||
if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)), reply.content().size()), image))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " svgToImage failed, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
|
||||
fcData.monitoring.replyState = FileContentStruct::ReplyFailure;
|
||||
return;
|
||||
}
|
||||
@@ -265,7 +265,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " xmlSymbolContent is empty, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " xmlSymbolContent is empty, fileContentId=" << fileContentId;
|
||||
fcData.monitoring.replyState = FileContentStruct::ReplyFailure;
|
||||
}
|
||||
break;
|
||||
@@ -273,24 +273,24 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
|
||||
case FileContentStruct::SymbolType::UnsupportedSymbol:
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " unsupported symbol found, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " unsupported symbol found, fileContentId=" << fileContentId;
|
||||
fcData.monitoring.replyState = FileContentStruct::ReplyFailure;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
|
||||
QSvgRenderer svgRenderer;
|
||||
if (!svgRenderer.load(svgByteArray))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " svgRenderer.load failed";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " svgRenderer.load failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -304,7 +304,7 @@ bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut)
|
||||
svgRenderer.render(&painter);
|
||||
painter.end();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -361,7 +361,7 @@ void FlmSubscriber::checkForReFetching()
|
||||
;
|
||||
FileManagement::GetFileContentDataRequest request(fileContentId);
|
||||
if (!d->m_flmFtc->getFileContentDataRequest(request, this))
|
||||
ERROR_LOG(logger) << LOGFUNCTION << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
ERROR_LOG(logger) << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
|
||||
fcs.monitoring.replyState = FileContentStruct::Requested;
|
||||
fcs.monitoring.requestTime = getRequestTime();
|
||||
@@ -383,7 +383,7 @@ void FlmSubscriber::checkForReFetching()
|
||||
|
||||
void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION
|
||||
TRACE_LOG() << Q_FUNC_INFO
|
||||
<< " data.id=" << data.id()
|
||||
<< " data.fileStatus=" << data.fileStatus().underlying()
|
||||
<< " modType=" << modType
|
||||
@@ -432,13 +432,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
|
||||
|
||||
FileManagement::GetFileContentDataRequest request(fileContentId);
|
||||
if (!d->m_flmFtc->getFileContentDataRequest(request, this))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
break;
|
||||
}
|
||||
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " modType=" << modType
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " fileContentName=" << data.name();
|
||||
@@ -448,7 +448,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
|
||||
|
||||
|
||||
if (!d->m_symbolProxy.removeSymbol(fileContentId))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " removeSymbol failed"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " removeSymbol failed"
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " fileContentName='" << data.name() << "'"
|
||||
<< " contains=" << d->m_fileContentMap.contains(fileContentId);
|
||||
@@ -460,7 +460,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
|
||||
|
||||
void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START"
|
||||
<< " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
|
||||
<< " fileContentId=" << data.id()
|
||||
<< " data.isDeleted()=" <<data.isDeleted()
|
||||
@@ -534,7 +534,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data
|
||||
}
|
||||
|
||||
} else {
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION
|
||||
ERROR_LOG() << Q_FUNC_INFO
|
||||
<< " QJsonParseError->errorString: '" << parseError.errorString() << "'"
|
||||
<< ", offset: " << parseError.offset;
|
||||
}
|
||||
@@ -542,7 +542,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data
|
||||
|
||||
d->m_fileContentMap[fileContentId] = fcData;
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END"
|
||||
<< " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
|
||||
<< " fileContentId=" << data.id()
|
||||
<< " data.isDeleted()=" <<data.isDeleted()
|
||||
@@ -573,7 +573,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolRemoved(qint32 fileContentId, con
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " dict.removeEtsSymbol:"
|
||||
INFO_LOG() << Q_FUNC_INFO << " dict.removeEtsSymbol:"
|
||||
<< " symbologyType='" << (int)symbologyType << "'"
|
||||
<< ", name='" << name << "'"
|
||||
<< ", fileContentId=" << fileContentId;
|
||||
@@ -589,7 +589,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
|
||||
const QString &xmlContent,
|
||||
const QStringList &usrTags)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START"
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " name='" << name << "'";
|
||||
|
||||
@@ -600,25 +600,25 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
if (!this->setXmlSymbolToDict(dict, fileContentId, operatorName, lastModified, name, xmlContent, usrTags))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " dict.setXmlSymbolToDict failed"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " dict.setXmlSymbolToDict failed"
|
||||
<< ", symbologyType='" << (int)symbologyType << "'"
|
||||
<< ", name='" << name << "'";
|
||||
}
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END"
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " name='" << name << "'";
|
||||
}
|
||||
|
||||
void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " fileContentId=" << fileContentId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START" << " fileContentId=" << fileContentId;
|
||||
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " dict.removeXmlSymbol:"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " dict.removeXmlSymbol:"
|
||||
<< " symbologyType='" << symbologyType << "'"
|
||||
<< ", fileContentId=" << fileContentId;
|
||||
|
||||
@@ -627,7 +627,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
dict.removeXmlSymbol(sidc);
|
||||
dict.removeXmlSymbol(fileContentId);
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " fileContentId=" << fileContentId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END" << " fileContentId=" << fileContentId;
|
||||
}
|
||||
|
||||
|
||||
@@ -638,7 +638,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
bool FlmSubscriber::connectFlmSymbolProxy(int type_placeholder, SymbologyType symbologyType)
|
||||
{
|
||||
Q_UNUSED(type_placeholder);
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
|
||||
d->m_symbolDictionaryToUpdate.insert(symbologyType);
|
||||
|
||||
@@ -701,12 +701,12 @@ bool FlmSubscriber::setEtsSymbolToDict(SymbolDictionary &dict,
|
||||
|
||||
if (!dict.setEtsSymbol(fileContentId, symProps.sidc(), symProps, image))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " dict.insertExtraSymbol failed"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " dict.insertExtraSymbol failed"
|
||||
<< ", fileContentId=" << fileContentId << ", name='" << name << "'";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " dict.insertExtraSymbol done"
|
||||
INFO_LOG() << Q_FUNC_INFO << " dict.insertExtraSymbol done"
|
||||
<< ", fileContentId=" << fileContentId << ", name='" << name << "'";
|
||||
|
||||
return true;
|
||||
@@ -731,7 +731,7 @@ bool FlmSubscriber::setXmlSymbolToDict(SymbolDictionary &dict,
|
||||
bool success = dict.setXmlSymbol(fileContentId, name, operatorName, lastModified, xmlContent, symProps);
|
||||
|
||||
if (!success)
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " setXmlSymbol failed:"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " setXmlSymbol failed:"
|
||||
<< ", file-id=" << fileContentId
|
||||
<< ", filenameid='" << name << "'";
|
||||
return success;
|
||||
|
||||
+1
-3
@@ -85,9 +85,7 @@ protected:
|
||||
|
||||
void checkForReFetching();
|
||||
|
||||
private:
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private:
|
||||
struct Private;
|
||||
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ ADD_SUBDIRECTORY(Gui)
|
||||
#
|
||||
# Gui Plugin Interface
|
||||
#
|
||||
#NGL_ADD_LIBRARY(WS AlmGuiPluginInterface SHARED alm_gui_plugin_interface.h)
|
||||
#NGL_ADD_LIBRARY2(WS AlmGuiPluginInterface SHARED alm_gui_plugin_interface.h)
|
||||
#NGL_TARGET_LINK_LIBRARIES(AlmGuiPluginInterface
|
||||
# Qt6::Core
|
||||
# GuiPluginInterface
|
||||
|
||||
+6
-7
@@ -28,7 +28,6 @@ parent)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_alarmHistoryModel(nullptr)
|
||||
, m_global(false)
|
||||
, m_logger(getLogger("ConfigAlarmModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -44,7 +43,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
|
||||
|
||||
|
||||
const QMap<qint32, AlarmManagement::AlarmConfig> alarmConfigs = m_dtc->alarmConfigs();
|
||||
INFO_LOG(m_logger) << "initModel - #AlarmConfig: " << alarmConfigs.size();
|
||||
INFO_LOG() << "initModel - #AlarmConfig: " << alarmConfigs.size();
|
||||
|
||||
connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged,
|
||||
this, &ConfigAlarmModel::onAlarmConfigChanged);
|
||||
@@ -60,7 +59,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
|
||||
|
||||
QVariant ConfigAlarmModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "AlarmManagementModel::data";
|
||||
DEBUG_LOG() << "AlarmManagementModel::data";
|
||||
|
||||
if (role != Qt::DisplayRole || !indexIsValid(index))
|
||||
return QVariant();
|
||||
@@ -124,7 +123,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
|
||||
const int eventTypeId = data.eventTypeId().underlying();
|
||||
const bool messageWindow = data.messageWindow();
|
||||
const bool setMarker = data.setMarker();
|
||||
DEBUG_LOG(m_logger) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow
|
||||
DEBUG_LOG() << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow
|
||||
<< "setMarker"<<setMarker;
|
||||
|
||||
switch (modType)
|
||||
@@ -132,7 +131,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "AlarmConfig was removed: " << id;
|
||||
DEBUG_LOG() << "AlarmConfig was removed: " << id;
|
||||
AlarmManagement::AlarmConfig data1 = data;
|
||||
data1.messageWindow(false);
|
||||
data1.setMarker(false);
|
||||
@@ -142,7 +141,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
|
||||
}
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DataModification::eModified: ";
|
||||
DEBUG_LOG() << "DataModification::eModified: ";
|
||||
if (row < 0)
|
||||
{
|
||||
|
||||
@@ -154,7 +153,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
|
||||
}
|
||||
case DataModification::eAdded:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DataModification::eAdded";
|
||||
DEBUG_LOG() << "DataModification::eAdded";
|
||||
insertRow(data);
|
||||
}
|
||||
break;
|
||||
|
||||
+1
-3
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Common/almcommon_export.h>
|
||||
#include "almcommon_export.h"
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <AlarmManagement/logger.h>
|
||||
|
||||
@@ -49,7 +49,5 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
AlarmHistoryModel *m_alarmHistoryModel;
|
||||
bool m_global;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+9
-10
@@ -33,7 +33,6 @@ AlarmHistoryModel::AlarmHistoryModel(QObject *parent)
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(getLogger("AlarmHistoryModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -177,7 +176,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
|
||||
const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
|
||||
const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt();
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " notification:" << data
|
||||
<< ", Global: " << global
|
||||
<< ", FriendlyFire: " << friendlyFire;
|
||||
@@ -198,7 +197,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic
|
||||
|
||||
QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier());
|
||||
m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier);
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id=" << participant.id()
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id=" << participant.id()
|
||||
<< " designator=" << designator
|
||||
<< " tacticalIdentifier=" << tacticalIdentifier;
|
||||
}
|
||||
@@ -206,7 +205,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic
|
||||
int AlarmHistoryModel::participantId2EquipNo(const int participantId) const
|
||||
{
|
||||
int ret = m_partId2EquipNoMap.value(participantId, 0);
|
||||
INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
|
||||
INFO_LOG() << "participantId2EquipNo participantId=" << participantId
|
||||
<< " EquipmentNumber=" << ret;
|
||||
return ret;
|
||||
}
|
||||
@@ -214,7 +213,7 @@ int AlarmHistoryModel::participantId2EquipNo(const int participantId) const
|
||||
QString AlarmHistoryModel::getDesignator(const int participantId) const
|
||||
{
|
||||
QString designator = m_idDesignatorMap.value(participantId);
|
||||
DEBUG_LOG(m_logger) << "m_idDesignatorMap.value(participantId)=" << designator;
|
||||
DEBUG_LOG() << "m_idDesignatorMap.value(participantId)=" << designator;
|
||||
|
||||
return designator;
|
||||
}
|
||||
@@ -222,7 +221,7 @@ QString AlarmHistoryModel::getDesignator(const int participantId) const
|
||||
QString AlarmHistoryModel::getTactIdentifier(const int participantId) const
|
||||
{
|
||||
QString tactIdentifier = m_idTactIdentifierMap.value(participantId);
|
||||
DEBUG_LOG(m_logger) << "m_idTactIdentifierMap.value(participantId)=" << tactIdentifier;
|
||||
DEBUG_LOG() << "m_idTactIdentifierMap.value(participantId)=" << tactIdentifier;
|
||||
|
||||
return tactIdentifier;
|
||||
}
|
||||
@@ -235,7 +234,7 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC
|
||||
int id = data.id();
|
||||
QString name = QString::fromStdString(data.name());
|
||||
m_aesNameMap[id] = name;
|
||||
DEBUG_LOG(m_logger) << "onBCContaminationChanged: " << data
|
||||
DEBUG_LOG() << "onBCContaminationChanged: " << data
|
||||
<< " Name=" << name
|
||||
<< " id=" << id;
|
||||
}
|
||||
@@ -248,7 +247,7 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap
|
||||
int id = data.id();
|
||||
QString name = QString::fromStdString(data.name());
|
||||
m_aesNameMap[id] = name;
|
||||
DEBUG_LOG(m_logger) << "BoobyTrap: " << data
|
||||
DEBUG_LOG() << "BoobyTrap: " << data
|
||||
<< " Name=" << name
|
||||
<< " id=" << id;
|
||||
}
|
||||
@@ -261,7 +260,7 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou
|
||||
int id = data.id();
|
||||
QString name = QString::fromStdString(data.name());
|
||||
m_aesNameMap[id] = name;
|
||||
DEBUG_LOG(m_logger) << "OffRouteMine: " << data
|
||||
DEBUG_LOG() << "OffRouteMine: " << data
|
||||
<< " Name=" << name
|
||||
<< " id=" << id;
|
||||
}
|
||||
@@ -274,7 +273,7 @@ void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem &it
|
||||
QString name = QString::fromStdString(item.name());
|
||||
int id = item.id();
|
||||
m_aesNameMap[id] = name;
|
||||
DEBUG_LOG(m_logger) << "AreaEffectSimulation::AesItem onAesItemChanged: " << item
|
||||
DEBUG_LOG() << "AreaEffectSimulation::AesItem onAesItemChanged: " << item
|
||||
<< " Name=" << name
|
||||
<< " id=" << item.id();
|
||||
}
|
||||
|
||||
+1
-2
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Common/almcommon_export.h>
|
||||
#include "almcommon_export.h"
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
@@ -89,7 +89,6 @@ private:
|
||||
QHash<int, QString> m_aesNameMap;
|
||||
|
||||
friend class AlarmHistoryProxyModel;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class ALMCOMMON_EXPORT AlarmHistoryProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
|
||||
|
||||
+17
-18
@@ -24,7 +24,6 @@ AlarmDialog::AlarmDialog(QWidget *parent)
|
||||
, m_ui(new Ui::AlarmDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_operatorId(-1)
|
||||
, m_logger(getLogger("AlarmDialog"))
|
||||
{
|
||||
AlarmCheckBox alarmCheckBox;
|
||||
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
|
||||
@@ -155,7 +154,7 @@ bool AlarmDialog::init(const std::shared_ptr<AlarmManagement::Interface::Ftc> &f
|
||||
bool global = true;
|
||||
m_configAlarmModel->initModel(m_dtc, ppmDtc, alarmHistoryModel, global);
|
||||
|
||||
INFO_LOG(m_logger) << "AlarmDialog::init";
|
||||
INFO_LOG() << "AlarmDialog::init";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -171,7 +170,7 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "************** onAlarmConfigChanged "
|
||||
DEBUG_LOG() << "************** onAlarmConfigChanged "
|
||||
<< " id=" << data.id()
|
||||
<< " operatorId=" << data.operatorId()
|
||||
<< " m_operatorId=" << m_operatorId
|
||||
@@ -184,33 +183,33 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
|
||||
|
||||
if (data.operatorId() == m_operatorId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen ";
|
||||
DEBUG_LOG() << "************** onAlarmConfig zuweisen ";
|
||||
switch (data.eventTypeId().underlying())
|
||||
{
|
||||
case ProjectDataManagement::EventType_def::EnterNuclear:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EnterNuclear zuweisen ";
|
||||
DEBUG_LOG() << "EnterNuclear zuweisen ";
|
||||
m_ui->cbxNMarker->setChecked(setMarker);
|
||||
m_ui->cbxNMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::EnterDangerArea:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EnterDangerArea zuweisen ";
|
||||
DEBUG_LOG() << "EnterDangerArea zuweisen ";
|
||||
m_ui->cbxDanerAreaMarker->setChecked(setMarker);
|
||||
m_ui->cbxDangerAreaMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::EnterMineArea:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EnterMineArea zuweisen ";
|
||||
DEBUG_LOG() << "EnterMineArea zuweisen ";
|
||||
m_ui->cbxMineAreaEntryMarker->setChecked(setMarker);
|
||||
m_ui->cbxMineAreaEntryMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitMine:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "HitMine zuweisen ";
|
||||
DEBUG_LOG() << "HitMine zuweisen ";
|
||||
m_ui->cbxMineAreaHitMarker->setChecked(setMarker);
|
||||
m_ui->cbxMineAreaHitMessage->setChecked(messageWindow);
|
||||
break;
|
||||
@@ -218,14 +217,14 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
|
||||
|
||||
case ProjectDataManagement::EventType_def::Hit:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Hit zuweisen ";
|
||||
DEBUG_LOG() << "Hit zuweisen ";
|
||||
m_ui->cbxDirectFireMarker->setChecked(setMarker);
|
||||
m_ui->cbxDirectFireMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitEffectSimulation:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "HitEffectSimulation zuweisen ";
|
||||
DEBUG_LOG() << "HitEffectSimulation zuweisen ";
|
||||
m_ui->cbxIndirectFireMarker->setChecked(setMarker);
|
||||
m_ui->cbxIndirectFireMessage->setChecked(messageWindow);
|
||||
break;
|
||||
@@ -233,27 +232,27 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
|
||||
|
||||
case ProjectDataManagement::EventType_def::CrossLocalBorderline:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
|
||||
DEBUG_LOG() << "CrossLocalBorderline zuweisen ";
|
||||
m_ui->cbxLocalBorderMarker->setChecked(setMarker);
|
||||
m_ui->cbxLocalBorderMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
|
||||
DEBUG_LOG() << "CrossGlobalBorderline zuweisen ";
|
||||
m_ui->cbxGlobalBorderMarker->setChecked(setMarker);
|
||||
m_ui->cbxGlobalBorderMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::AirSupport:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
|
||||
DEBUG_LOG() << "AirSupport zuweisen ";
|
||||
m_ui->cbxAirSupportMarker->setChecked(setMarker);
|
||||
m_ui->cbxAirSupportMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "Not possible to set with Operator App!!!";
|
||||
ERROR_LOG() << "Not possible to set with Operator App!!!";
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -273,22 +272,22 @@ std::vector<AlarmManagement::AlarmAction> AlarmDialog::getCheckedValues() const
|
||||
if (item.checkboxMarker->isChecked())
|
||||
{
|
||||
alarmActionDds.setMarker(true);
|
||||
DEBUG_LOG(m_logger) << item.name << " setMarker = true";
|
||||
DEBUG_LOG() << item.name << " setMarker = true";
|
||||
}
|
||||
else
|
||||
{
|
||||
alarmActionDds.setMarker(false);
|
||||
DEBUG_LOG(m_logger) << item.name << " setMarker = false";
|
||||
DEBUG_LOG() << item.name << " setMarker = false";
|
||||
}
|
||||
if (item.checkboxWindow->isChecked())
|
||||
{
|
||||
alarmActionDds.messageWindow(true);
|
||||
DEBUG_LOG(m_logger) << item.name << " messageWindow = true";
|
||||
DEBUG_LOG() << item.name << " messageWindow = true";
|
||||
}
|
||||
else
|
||||
{
|
||||
alarmActionDds.messageWindow(false);
|
||||
DEBUG_LOG(m_logger) << item.name << " messageWindow = false";
|
||||
DEBUG_LOG() << item.name << " messageWindow = false";
|
||||
}
|
||||
if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
|
||||
ret.push_back(alarmActionDds);
|
||||
|
||||
+9
-10
@@ -20,9 +20,8 @@ AlarmView::AlarmView(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_sitMapGuiIfc(nullptr)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::AlarmView)
|
||||
, m_logger(getLogger("AlarmView"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " --- AlarmView Konstruktor() ";
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " --- AlarmView Konstruktor() ";
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::MultiSelection);
|
||||
|
||||
@@ -51,7 +50,7 @@ AlarmView::AlarmView(LtsSession::LtsSession *session, QWidget *parent)
|
||||
|
||||
AlarmView::~AlarmView()
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- AlarmView Destruktor() ";
|
||||
INFO_LOG() << "--- AlarmView Destruktor() ";
|
||||
m_sitMapGuiIfc = nullptr;
|
||||
delete m_ui;
|
||||
}
|
||||
@@ -66,14 +65,14 @@ void AlarmView::retranslate()
|
||||
bool AlarmView::init(const std::shared_ptr<AlarmManagement::Interface::Dtc> &dtc,
|
||||
AlarmHistoryModel *alarmHistoryModel)
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- init() ";
|
||||
INFO_LOG() << "--- init() ";
|
||||
if (!dtc)
|
||||
return false;
|
||||
|
||||
m_dtc = dtc;
|
||||
m_alarmHistoryModel = alarmHistoryModel;
|
||||
|
||||
DEBUG_LOG(m_logger) << "--- AlarmView::init ";
|
||||
DEBUG_LOG() << "--- AlarmView::init ";
|
||||
m_proxyModel = new AlarmHistoryProxyModel(this);
|
||||
m_proxyModel->setSourceModel(m_alarmHistoryModel);
|
||||
m_ui->widget->setModel(m_proxyModel);
|
||||
@@ -102,14 +101,14 @@ void AlarmView::onSelectionChanged()
|
||||
|
||||
void AlarmView::onShowAlarm()
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- onShowMAlarm() ";
|
||||
INFO_LOG() << "--- onShowMAlarm() ";
|
||||
}
|
||||
|
||||
|
||||
|
||||
void AlarmView::onRemoveAlarm()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onRemoveAlarm selectedRows.size"
|
||||
DEBUG_LOG() << "onRemoveAlarm selectedRows.size"
|
||||
<< m_ui->widget->selectedRows().size();
|
||||
|
||||
const QModelIndexList idxList = m_ui->widget->selectedRows();
|
||||
@@ -125,7 +124,7 @@ void AlarmView::onRemoveAlarm()
|
||||
|
||||
void AlarmView::onCenterAlarm()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCenterAlarm";
|
||||
DEBUG_LOG() << "onCenterAlarm";
|
||||
if (!m_sitMapGuiIfc)
|
||||
return;
|
||||
const QModelIndexList indexList = m_ui->widget->selectedRows();
|
||||
@@ -138,14 +137,14 @@ void AlarmView::onCenterAlarm()
|
||||
|
||||
if (!position.isNull())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " position=" << position.x() << " - " << position.y();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " position=" << position.x() << " - " << position.y();
|
||||
m_sitMapGuiIfc->setCenterPoint(position);
|
||||
}
|
||||
else
|
||||
{
|
||||
const QModelIndex &indexParticipantId = m_alarmHistoryModel->index(index.row(), AlarmHistoryModel::ParticipantId, index.parent());
|
||||
const int participantId = indexParticipantId.data().toInt();
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " participantId=" << participantId;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " participantId=" << participantId;
|
||||
m_sitMapGuiIfc->centerMapToParticipant(participantId);
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -45,8 +45,6 @@ private:
|
||||
|
||||
LtsSession::LtsSession *m_session;
|
||||
Ui::AlarmView *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+15
-15
@@ -99,10 +99,10 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
|
||||
|
||||
m_ui->equipmentNoContent->setText(equipmentNumbersStr);
|
||||
|
||||
DEBUG_LOG(m_logger) << "current participantId = " << participantData.id();
|
||||
DEBUG_LOG() << "current participantId = " << participantData.id();
|
||||
|
||||
m_typeClass = ppmDtc->type(participantData.typeId()).typeClass();
|
||||
DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
|
||||
DEBUG_LOG() << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
|
||||
fillCbx();
|
||||
|
||||
m_almDtc->alarmConfigs([this](const AlarmManagement::AlarmConfig &alarm) { setAlaramData(alarm); });
|
||||
@@ -111,7 +111,7 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
|
||||
|
||||
void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig &alarm)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setAlaramData:" << alarm;
|
||||
DEBUG_LOG() << "setAlaramData:" << alarm;
|
||||
if (alarm.operatorId() != m_operatorId ||
|
||||
alarm.participantId() != m_participantData.id() ||
|
||||
alarm.global())
|
||||
@@ -121,7 +121,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
{
|
||||
case ProjectDataManagement::EventType_def::Hit:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Hit zuweisen ";
|
||||
DEBUG_LOG() << "Hit zuweisen ";
|
||||
m_ui->cbxDirectFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -135,7 +135,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitEffectSimulation:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "HitIndirect zuweisen ";
|
||||
DEBUG_LOG() << "HitIndirect zuweisen ";
|
||||
m_ui->cbxIndirectFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -143,7 +143,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::AirSupport:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
|
||||
DEBUG_LOG() << "AirSupport zuweisen ";
|
||||
m_ui->cbxAirSupport->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -151,7 +151,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitMine:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "HitMine zuweisen ";
|
||||
DEBUG_LOG() << "HitMine zuweisen ";
|
||||
m_ui->cbxMines->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -161,7 +161,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
case ProjectDataManagement::EventType_def::HitN:
|
||||
case ProjectDataManagement::EventType_def::HitC:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Hit N/B/C zuweisen ";
|
||||
DEBUG_LOG() << "Hit N/B/C zuweisen ";
|
||||
m_ui->cbxNbcAgent->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -169,7 +169,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::FriendlyFire:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "FriendlyFire zuweisen ";
|
||||
DEBUG_LOG() << "FriendlyFire zuweisen ";
|
||||
m_ui->cbxFriendlyFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -183,7 +183,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::Manipulation:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Manipulation zuweisen ";
|
||||
DEBUG_LOG() << "Manipulation zuweisen ";
|
||||
m_ui->cbxManipulation->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -191,7 +191,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
|
||||
DEBUG_LOG() << "CrossGlobalBorderline zuweisen ";
|
||||
m_ui->cbxGlobalBorderLine->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -199,7 +199,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::CrossLocalBorderline:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
|
||||
DEBUG_LOG() << "CrossLocalBorderline zuweisen ";
|
||||
m_ui->cbxLocalBorderLine->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
@@ -207,7 +207,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
}
|
||||
default:
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Not possible to set with Operator App!!!";
|
||||
ERROR_LOG() << "Not possible to set with Operator App!!!";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -215,7 +215,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
|
||||
std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedValues() const
|
||||
{
|
||||
AlarmManagement::AlarmAction alarmActionDds;
|
||||
DEBUG_LOG(m_logger) << "getCheckedValues";
|
||||
DEBUG_LOG() << "getCheckedValues";
|
||||
|
||||
std::vector<AlarmManagement::AlarmAction> alarmsDds;
|
||||
|
||||
@@ -289,7 +289,7 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
|
||||
|
||||
bool ConfigParticipantsDialog::apply()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "apply";
|
||||
DEBUG_LOG() << "apply";
|
||||
AlarmManagement::ConfigureAlarmsRequest req;
|
||||
req.participantIds(m_participantVector);
|
||||
req.alarms(getCheckedValues());
|
||||
|
||||
-2
@@ -54,7 +54,5 @@ private:
|
||||
std::vector<int> m_participantVector;
|
||||
ParticipantManagement::TypeClass m_typeClass;
|
||||
ParticipantManagement::ParticipantData m_participantData;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+10
-10
@@ -112,7 +112,7 @@ bool ParticipantsDialog::init(LtsSession::LtsSession *session,
|
||||
void ParticipantsDialog::onSelectionChanged()
|
||||
{
|
||||
bool configureAlarms = false;
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged";
|
||||
DEBUG_LOG() << "onSelectionChanged";
|
||||
const QModelIndexList currentlySelectedParticipants = m_ui->dvParticipants->selectedRows();
|
||||
|
||||
for (const QModelIndex &index : currentlySelectedParticipants)
|
||||
@@ -121,7 +121,7 @@ void ParticipantsDialog::onSelectionChanged()
|
||||
if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
|
||||
m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
|
||||
configureAlarms = true;
|
||||
DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
|
||||
DEBUG_LOG() << "setChildrenSelected row =" << index.row() << " column=" << index.column();
|
||||
|
||||
}
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, configureAlarms);
|
||||
@@ -141,7 +141,7 @@ void ParticipantsDialog::onCbPartyChanged()
|
||||
|
||||
void ParticipantsDialog::onAddButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onAddButtonClicked";
|
||||
DEBUG_LOG() << "onAddButtonClicked";
|
||||
|
||||
m_participantVector.clear();
|
||||
m_equipmentVector.clear();
|
||||
@@ -151,14 +151,14 @@ void ParticipantsDialog::onAddButtonClicked()
|
||||
|
||||
for (const QModelIndex &index : currentlySelectedParticipants)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setChildrenSelected: " << index.row() << " column=" << index.column();
|
||||
DEBUG_LOG() << "setChildrenSelected: " << index.row() << " column=" << index.column();
|
||||
setChildrenSelected(index);
|
||||
}
|
||||
}
|
||||
|
||||
QModelIndex participantIndex = m_ui->dvParticipants->currentIndex();
|
||||
ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(participantIndex);
|
||||
DEBUG_LOG(m_logger) << "current participantId = " << data.id();
|
||||
DEBUG_LOG() << "current participantId = " << data.id();
|
||||
m_participantVector.push_back(data.id());
|
||||
|
||||
const auto partData = m_participantModel->getParticipantData(participantIndex);
|
||||
@@ -186,16 +186,16 @@ void ParticipantsDialog::setChildrenSelected(const QModelIndex &parent)
|
||||
if (m_participantModel->hasChildren(childIndex))
|
||||
setChildrenSelected(childIndex);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Setting row "
|
||||
DEBUG_LOG() << "Setting row "
|
||||
<< childIndex.row()
|
||||
<< " selected";
|
||||
|
||||
ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(childIndex);
|
||||
DEBUG_LOG(m_logger) << "append participantId = " << data.id();
|
||||
DEBUG_LOG() << "append participantId = " << data.id();
|
||||
m_participantVector.push_back(data.id());
|
||||
if (data.equipmentNumber().is_set())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber().get();
|
||||
DEBUG_LOG() << "append equipmentNumber = " << data.equipmentNumber().get();
|
||||
m_equipmentVector.push_back(data.equipmentNumber().get());
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ void ParticipantsDialog::tableColumnOrganiserSetting()
|
||||
|
||||
void ParticipantsDialog::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onConfigureAlarmsReply" << replyObject.str();
|
||||
DEBUG_LOG() << "onConfigureAlarmsReply" << replyObject.str();
|
||||
m_requestHelper->requestReply(replyObject);
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ void ParticipantsDialog::onDoubleClicked()
|
||||
if (!m_buttonBox->isButtonEnabled(LtsWidgets::DialogButton::Edit))
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "onDoubleClicked";
|
||||
DEBUG_LOG() << "onDoubleClicked";
|
||||
onAddButtonClicked();
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -72,6 +72,5 @@ private:
|
||||
QString m_menuGroup;
|
||||
static int s_preselectedParty;
|
||||
Ui::ParticipantsDialog *m_ui;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+3
-3
@@ -19,7 +19,7 @@ ParticipantAlarmModel::ParticipantAlarmModel(QObject *parent,
|
||||
{
|
||||
m_titles += tr("Alarm Assignable");
|
||||
|
||||
DEBUG_LOG(m_logger) << "ParticipantAlarmModel::ParticipantAlarmModel";
|
||||
DEBUG_LOG() << "ParticipantAlarmModel::ParticipantAlarmModel";
|
||||
}
|
||||
|
||||
QVariant ParticipantAlarmModel::data(const QModelIndex &index, int role) const
|
||||
@@ -42,7 +42,7 @@ void ParticipantAlarmModel::onParticipantChanged(const ParticipantManagement::Pa
|
||||
if (data.partyId() != partyId())
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
|
||||
INFO_LOG() << "onParticipantChanged isSimulated=" << data.isSimulated();
|
||||
onReinitModel(partyId());
|
||||
emit newData();
|
||||
}
|
||||
@@ -56,7 +56,7 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex &index, bool *
|
||||
m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
|
||||
isSimulatable = true;
|
||||
|
||||
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id()
|
||||
DEBUG_LOG() << "ParticipantId: " << data.id()
|
||||
<< " isSimulated:" << data.isSimulated()
|
||||
<< " equipmentNo:" << data.equipmentNumber()
|
||||
<< " typeId=" << data.typeId()
|
||||
|
||||
-2
@@ -23,7 +23,5 @@ signals:
|
||||
private:
|
||||
void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
|
||||
bool isSelectableByAlarm(const QModelIndex &index, bool *bIsSimulated = nullptr) const;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+7
-7
@@ -23,7 +23,7 @@ ParticipantShowConfigView::ParticipantShowConfigView(LtsSession::LtsSession *ses
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(AlarmManagement::getLogger("ParticipantShowConfigView"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "--- ParticipantShowConfigView Konstruktor() ";
|
||||
DEBUG_LOG() << "--- ParticipantShowConfigView Konstruktor() ";
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
|
||||
@@ -47,7 +47,7 @@ ParticipantShowConfigView::ParticipantShowConfigView(LtsSession::LtsSession *ses
|
||||
|
||||
ParticipantShowConfigView::~ParticipantShowConfigView()
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- ParticipantShowConfigView Destruktor() ";
|
||||
INFO_LOG() << "--- ParticipantShowConfigView Destruktor() ";
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ bool ParticipantShowConfigView::init(const std::shared_ptr<AlarmManagement::Inte
|
||||
const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
const std::shared_ptr<AreaEffectSimulation::Interface::Dtc> &aesDtc)
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- init() ";
|
||||
INFO_LOG() << "--- init() ";
|
||||
if (!dtc || !ftc)
|
||||
return false;
|
||||
|
||||
@@ -71,7 +71,7 @@ bool ParticipantShowConfigView::init(const std::shared_ptr<AlarmManagement::Inte
|
||||
m_alarmHistoryModel = new AlarmManagement::AlarmHistoryModel(this);
|
||||
m_alarmHistoryModel->initModel(dtc, ppmDtc, aesDtc);
|
||||
|
||||
DEBUG_LOG(m_logger) << "--- ParticipantShowConfigView::init ";
|
||||
DEBUG_LOG() << "--- ParticipantShowConfigView::init ";
|
||||
m_configAlarmModel = new AlarmManagement::ConfigAlarmModel(this);
|
||||
m_configAlarmModel->initModel(m_dtc, ppmDtc, m_alarmHistoryModel, false);
|
||||
m_ui->widget->setModel(m_configAlarmModel);
|
||||
@@ -92,7 +92,7 @@ void ParticipantShowConfigView::onSelectionChanged()
|
||||
|
||||
void ParticipantShowConfigView::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"onConfigureAlarmsReply"<<replyObject.str();
|
||||
DEBUG_LOG()<<"onConfigureAlarmsReply"<<replyObject.str();
|
||||
m_requestHelper->requestReply(replyObject);
|
||||
}
|
||||
|
||||
@@ -104,14 +104,14 @@ void ParticipantShowConfigView::tableColumnOrganiserSetting()
|
||||
|
||||
void ParticipantShowConfigView::onShowAlarm()
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- onShowAlarm() ";
|
||||
INFO_LOG() << "--- onShowAlarm() ";
|
||||
}
|
||||
|
||||
|
||||
|
||||
void ParticipantShowConfigView::onRemoveAlarm()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onRemoveAlarm"
|
||||
DEBUG_LOG() << "onRemoveAlarm"
|
||||
<< " id = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id()
|
||||
<< " eventTypeId = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId()
|
||||
<< " operatorId = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId()
|
||||
|
||||
+1
-2
@@ -57,8 +57,7 @@ private:
|
||||
Ui::ParticipantShowConfigView *m_ui;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
AlarmManagement::LOGGER_T m_logger;
|
||||
|
||||
AlarmManagement::
|
||||
};
|
||||
|
||||
}
|
||||
+8
-9
@@ -25,7 +25,6 @@ EmergencyCallDialog::EmergencyCallDialog(QWidget *parent)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::EmergencyCallDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("EmergencyCallDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -42,9 +41,9 @@ bool EmergencyCallDialog::init(const std::shared_ptr<AlarmManagement::Interface:
|
||||
const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
|
||||
LtsSession::LtsSession *session)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START ";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START ";
|
||||
if (!ftc || !dtc || !session){
|
||||
ERROR_LOG(m_logger)<<" init Emergency call dialog failed !!";
|
||||
ERROR_LOG()<<" init Emergency call dialog failed !!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -100,8 +99,8 @@ bool EmergencyCallDialog::init(const std::shared_ptr<AlarmManagement::Interface:
|
||||
m_ui->emergencyCallView->hideColumn(EmergencyCallModel::EXPIRED);
|
||||
#endif
|
||||
|
||||
INFO_LOG(m_logger) << "EmergencyCallDialog::init done";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
INFO_LOG() << "EmergencyCallDialog::init done";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -173,14 +172,14 @@ void EmergencyCallDialog::setAcknowledgeUi()
|
||||
|
||||
void EmergencyCallDialog::onEditBtCliked()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
const AlmEmergencyCall &sos = getSelectedSOS();
|
||||
if (sos.id() <= 0)
|
||||
return;
|
||||
setAcknowledgeUi();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -223,7 +222,7 @@ void EmergencyCallDialog::onEmergencyIndexDoubleClicked(const QModelIndex &index
|
||||
|
||||
void EmergencyCallDialog::sendAcknowledgeEmergency(const QString &comment)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
const AlmEmergencyCall &sos = getSelectedSOS();
|
||||
if (sos.id() <= 0 || sos.expired())
|
||||
@@ -244,7 +243,7 @@ void EmergencyCallDialog::sendAcknowledgeEmergency(const QString &comment)
|
||||
});
|
||||
|
||||
enaDisa();
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void EmergencyCallDialog::tableColumnOrganiserSetting()
|
||||
|
||||
+10
-11
@@ -52,7 +52,6 @@ EmergencyCallInfoDialog::EmergencyCallInfoDialog(int entryId, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_logger(getLogger("EmergencyCallInfoDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::EmergencyCallInfoDialog)
|
||||
{
|
||||
@@ -72,10 +71,10 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc> &ftc,
|
||||
const std::shared_ptr<SituationMap::ForeignGuiInterface> &sitMapGuiIfc,
|
||||
const std::shared_ptr<OperatorManagement::Interface::Dtc>&opmDtc)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (!ftc || !dtc)
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" init Emergency call Info dialog failed !!";
|
||||
ERROR_LOG()<<" init Emergency call Info dialog failed !!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -95,7 +94,7 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc> &ftc,
|
||||
connect(m_ui->pbAckEmergency, &QPushButton::clicked, this, &EmergencyCallInfoDialog::onPbAckEmergencyClicked );
|
||||
connect(m_ui->pbEmergencyCallFindOnMap, &QPushButton::clicked, this, &EmergencyCallInfoDialog::onFindEmergencyOnMap);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -110,10 +109,10 @@ QString EmergencyCallInfoDialog::emergencyIdentifier() const
|
||||
|
||||
bool EmergencyCallInfoDialog::setUiValues()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (!m_dtc || !m_ftc || m_emergency.id() < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" >> unabled to init EmergencyCallInfoDialog";
|
||||
ERROR_LOG()<<" >> unabled to init EmergencyCallInfoDialog";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -134,7 +133,7 @@ bool EmergencyCallInfoDialog::setUiValues()
|
||||
QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired()));
|
||||
m_ui->lblIcon->setPixmap(iconPixmap);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -142,7 +141,7 @@ bool EmergencyCallInfoDialog::setUiValues()
|
||||
|
||||
void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergencyCall data, DataModification modType)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (data.id() != m_emergency.id() || data.id() == 0)
|
||||
return;
|
||||
|
||||
@@ -158,7 +157,7 @@ void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergen
|
||||
setUiValues();
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -172,7 +171,7 @@ void EmergencyCallInfoDialog::onFindEmergencyOnMap()
|
||||
|
||||
void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
LtsWidgets::LtsFramelessDialog *popup = new LtsWidgets::LtsFramelessDialog(this, LtsWidgets::Behaviour::Popup);
|
||||
LtsWidgets::LtsDialogButtonBox *btnBox = new LtsWidgets::LtsDialogButtonBox(popup);
|
||||
@@ -204,7 +203,7 @@ void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
|
||||
popup->setMinimumWidth(350);
|
||||
popup->show();
|
||||
le->setFocus();
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
|
||||
-1
@@ -24,7 +24,6 @@ EmergencyCallModel::EmergencyCallModel(QObject *parent)
|
||||
tr("Comment"),
|
||||
}, parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("EmergencyCallModel"))
|
||||
{}
|
||||
|
||||
QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
|
||||
|
||||
-2
@@ -42,8 +42,6 @@ private slots:
|
||||
private:
|
||||
std::shared_ptr<AlarmManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
friend class EmergencyCallProxyModel;
|
||||
|
||||
};
|
||||
|
||||
+16
-17
@@ -27,7 +27,6 @@ namespace AreaEffectSimulation
|
||||
|
||||
AesChargeEffectItemInfo::AesChargeEffectItemInfo(int chargeEffectId, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_logger(getLogger("AesChargeEffectItemInfo"))
|
||||
, m_session(nullptr)
|
||||
, m_ChargeEffectId(chargeEffectId)
|
||||
, m_ui(new Ui::AesChargeEffectItemInfo)
|
||||
@@ -52,13 +51,13 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession *session)
|
||||
|
||||
if (!session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get pdmDtc";
|
||||
ERROR_LOG() << " failed to get pdmDtc";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get aesDtc";
|
||||
ERROR_LOG() << " failed to get aesDtc";
|
||||
return false;
|
||||
}
|
||||
if (!m_aesDtc->isAesItemViewEnabled())
|
||||
@@ -104,12 +103,12 @@ void AesChargeEffectItemInfo::retranslate()
|
||||
|
||||
void AesChargeEffectItemInfo::onFindOnMap() const
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onFindOnMap() aesId: "<<m_ChargeEffectId;
|
||||
DEBUG_LOG() << "onFindOnMap() aesId: "<<m_ChargeEffectId;
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
|
||||
ifc->centerMapToChargeEffectObject(m_ChargeEffectId);
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
}
|
||||
|
||||
template <typename InterfaceType>
|
||||
@@ -126,13 +125,13 @@ bool AesChargeEffectItemInfo::tryShowStandardEditDialog(const AesItemView& aiv)
|
||||
return true;
|
||||
}
|
||||
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed for specific AES interface!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!";
|
||||
return false;
|
||||
}
|
||||
|
||||
void AesChargeEffectItemInfo::onShowDetails()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
|
||||
|
||||
@@ -140,7 +139,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
{
|
||||
AesItemView aiv;
|
||||
m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv);
|
||||
DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
|
||||
DEBUG_LOG() << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
|
||||
|
||||
|
||||
auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) {
|
||||
@@ -201,7 +200,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
@@ -211,7 +210,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
|
||||
registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this));
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
@@ -221,7 +220,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
|
||||
registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this));
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
@@ -245,7 +244,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -261,7 +260,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this));
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -284,10 +283,10 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
break;
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
Q_ASSERT(false);
|
||||
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
|
||||
WARNING_LOG() << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
|
||||
break;
|
||||
default:
|
||||
DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
|
||||
DEBUG_LOG() << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
|
||||
m_ui->pbDetails->hide();
|
||||
break;
|
||||
}
|
||||
@@ -303,13 +302,13 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface ChargeEffect failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!";
|
||||
}
|
||||
}
|
||||
|
||||
void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id();
|
||||
DEBUG_LOG() << " [onChargeEffectChanged] id: " << data.id();
|
||||
if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved)
|
||||
handleChargeEffect(data);
|
||||
}
|
||||
|
||||
+3
-4
@@ -22,7 +22,6 @@ namespace AreaEffectSimulation
|
||||
DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("DangerArea.AesItemInfo"))
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::DangerAreaAesItemInfo)
|
||||
, m_aesItemId(-1)
|
||||
@@ -100,12 +99,12 @@ bool DangerAreaAesItemInfo::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session && session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
if (!m_session && !session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "No Session available!";
|
||||
ERROR_LOG() << "No Session available!";
|
||||
return false;
|
||||
}
|
||||
if (!m_session)
|
||||
@@ -130,7 +129,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
|
||||
}
|
||||
delete item;
|
||||
|
||||
WARNING_LOG(m_logger) << "AesItem with id " << aesItemId << " is not of any known type!";
|
||||
WARNING_LOG() << "AesItem with id " << aesItemId << " is not of any known type!";
|
||||
}
|
||||
|
||||
void DangerAreaAesItemInfo::setText()
|
||||
|
||||
+83
-84
@@ -46,9 +46,8 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget *parent)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_ui(new Ui::AesInfoDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("AESInfoDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ctor AesInfoDialog() ";
|
||||
DEBUG_LOG() << "ctor AesInfoDialog() ";
|
||||
m_ui->setupUi(this);
|
||||
m_ui->lblAesId->setText(QString::number(aesEntityId));
|
||||
|
||||
@@ -81,7 +80,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
if (aesItemView.aesItemId() != m_aesEntityId)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId
|
||||
DEBUG_LOG() << "AesItemView found for aesEntityId: " << m_aesEntityId
|
||||
<< " AesItemView.aesTypeId(): " << aesItemView.aesTypeId();
|
||||
|
||||
if (aesItemView.aesTypeId() != m_aesType)
|
||||
@@ -95,7 +94,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleNContamination(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged, this, &AesInfoDialog::onNContaminationChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-N-Contamination"));
|
||||
break;
|
||||
}
|
||||
@@ -103,7 +102,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleBCContamination(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged, this, &AesInfoDialog::onBCContaminationChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-C-Contamination"));
|
||||
break;
|
||||
}
|
||||
@@ -112,7 +111,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleBoobyTrap(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged, this, &AesInfoDialog::onBoobyTrapChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap"));
|
||||
break;
|
||||
}
|
||||
@@ -121,7 +120,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleOffRouteMine(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &AesInfoDialog::onOffRouteMineChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-OffRouteMine"));
|
||||
break;
|
||||
}
|
||||
@@ -129,7 +128,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleExplosionArea(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionAreaChanged, this, &AesInfoDialog::onExplosionAreaChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Area_Artillery"));
|
||||
break;
|
||||
}
|
||||
@@ -137,7 +136,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleExplosionSingle(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionSingleChanged, this, &AesInfoDialog::onExplosionSingleChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Single_Artillery"));
|
||||
break;
|
||||
}
|
||||
@@ -145,7 +144,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleMineArea(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this, &AesInfoDialog::onMineAreaChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Area"));
|
||||
break;
|
||||
}
|
||||
@@ -153,7 +152,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleMineCorridor(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineCorridorChanged, this, &AesInfoDialog::onMineCorridorChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Corridor"));
|
||||
break;
|
||||
}
|
||||
@@ -161,7 +160,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleGasPipe(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::gasPipeChanged, this, &AesInfoDialog::onGasPipeChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Gas_Pipeline"));
|
||||
break;
|
||||
}
|
||||
@@ -169,7 +168,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleDangerArea(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, &AesInfoDialog::onDangerAreaChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Danger_Area"));
|
||||
break;
|
||||
}
|
||||
@@ -177,7 +176,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleBorderline(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this, &AesInfoDialog::onBorderlineChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Borderline"));
|
||||
|
||||
|
||||
@@ -197,7 +196,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleFunctionalArea(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::functionalAreaChanged, this, &AesInfoDialog::onFunctionalAreaChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Functional_Area"));
|
||||
break;
|
||||
}
|
||||
@@ -205,7 +204,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleAirSupportImpact(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged, this, &AesInfoDialog::onAirSupportImpactChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Aerial_Ordnance"));
|
||||
break;
|
||||
}
|
||||
@@ -213,7 +212,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleExplosionCluster(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged, this, &AesInfoDialog::onExplosionClusterChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster"));
|
||||
break;
|
||||
}
|
||||
@@ -221,7 +220,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
{
|
||||
handleEffectCluster(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::effectClusterChanged, this, &AesInfoDialog::onEffectClusterChanged);
|
||||
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster"));
|
||||
break;
|
||||
}
|
||||
@@ -238,7 +237,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
|
||||
break;
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
|
||||
WARNING_LOG() << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
|
||||
Q_ASSERT(false);
|
||||
break;
|
||||
}
|
||||
@@ -309,7 +308,7 @@ bool AesInfoDialog::init(LtsSession::LtsSession *session,
|
||||
|
||||
void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleNContamination(m_dtc->nContamination(m_aesEntityId));
|
||||
@@ -318,7 +317,7 @@ void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::NContamination)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtNContamination);
|
||||
@@ -332,7 +331,7 @@ void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContaminat
|
||||
|
||||
void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleBCContamination(m_dtc->bCContamination(m_aesEntityId));
|
||||
@@ -341,7 +340,7 @@ void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::BCContamination)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtBCContamination);
|
||||
@@ -357,7 +356,7 @@ void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamin
|
||||
|
||||
void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId));
|
||||
@@ -366,7 +365,7 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::BoobyTrap)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType_def::AtBoobyTrap);
|
||||
@@ -387,7 +386,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
|
||||
|
||||
void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId));
|
||||
@@ -396,7 +395,7 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::OffRouteMine)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType_def::AtOffRouteMine);
|
||||
@@ -417,7 +416,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine
|
||||
|
||||
void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleExplosionArea(m_dtc->explosionArea(m_aesEntityId));
|
||||
@@ -426,7 +425,7 @@ void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtExplosionArea);
|
||||
@@ -449,7 +448,7 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre
|
||||
|
||||
void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId));
|
||||
}
|
||||
@@ -457,7 +456,7 @@ void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionSingle)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtExplosionSingle);
|
||||
@@ -473,7 +472,7 @@ void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionS
|
||||
|
||||
void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleMineArea(m_dtc->mineArea(m_aesEntityId));
|
||||
}
|
||||
@@ -481,7 +480,7 @@ void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::MineArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtMineArea);
|
||||
@@ -505,7 +504,7 @@ void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
|
||||
|
||||
void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId));
|
||||
}
|
||||
@@ -513,7 +512,7 @@ void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::MineArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtMineCorridor);
|
||||
@@ -531,7 +530,7 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor
|
||||
|
||||
void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleGasPipe(m_dtc->gasPipe(m_aesEntityId));
|
||||
}
|
||||
@@ -539,7 +538,7 @@ void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::GasPipe)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtGasPipe);
|
||||
@@ -556,7 +555,7 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
|
||||
|
||||
void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleDangerArea(m_dtc->dangerArea(m_aesEntityId));
|
||||
}
|
||||
@@ -564,7 +563,7 @@ void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::DangerArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtDangerArea);
|
||||
@@ -587,7 +586,7 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &dat
|
||||
|
||||
void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleBorderline(m_dtc->borderline(m_aesEntityId));
|
||||
}
|
||||
@@ -595,7 +594,7 @@ void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::Borderline)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtBorderline);
|
||||
@@ -615,7 +614,7 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &dat
|
||||
|
||||
void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId));
|
||||
}
|
||||
@@ -624,7 +623,7 @@ void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::FunctionalArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtFunctionalArea);
|
||||
@@ -662,7 +661,7 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
|
||||
|
||||
void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId));
|
||||
}
|
||||
@@ -671,7 +670,7 @@ void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::FunctionalArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtAirSupportImpact);
|
||||
@@ -862,14 +861,14 @@ void AesInfoDialog::handleSingleDusMine()
|
||||
|
||||
void AesInfoDialog::handleExplosionCluster(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId));
|
||||
}
|
||||
|
||||
void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionCluster)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtExplosionCluster);
|
||||
@@ -883,14 +882,14 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
|
||||
|
||||
void AesInfoDialog::handleEffectCluster(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleEffectCluster(m_dtc->effectCluster(m_aesEntityId));
|
||||
}
|
||||
|
||||
void AesInfoDialog::handleEffectCluster(const EffectCluster &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::EffectCluster)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtEffectCluster);
|
||||
@@ -955,18 +954,18 @@ void AesInfoDialog::handleAesItem(const AesItem &aesData, AesType aesTypeId)
|
||||
|
||||
void AesInfoDialog::onFindOnMap()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onFindOnMap()";
|
||||
DEBUG_LOG() << "onFindOnMap()";
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
|
||||
ifc->centerMapToAesObject(m_aesEntityId);
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
}
|
||||
|
||||
|
||||
void AesInfoDialog::onShowDetails()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
switch (m_aesType.underlying())
|
||||
{
|
||||
@@ -980,7 +979,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
@@ -1006,7 +1005,7 @@ void AesInfoDialog::onShowDetails()
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
@@ -1021,7 +1020,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
@@ -1036,7 +1035,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
@@ -1059,7 +1058,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
@@ -1081,7 +1080,7 @@ void AesInfoDialog::onShowDetails()
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
@@ -1096,7 +1095,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
@@ -1109,7 +1108,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
@@ -1122,7 +1121,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
@@ -1135,7 +1134,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
@@ -1148,7 +1147,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
@@ -1161,7 +1160,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
@@ -1174,7 +1173,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
@@ -1192,7 +1191,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
Q_ASSERT(false);
|
||||
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
|
||||
WARNING_LOG() << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -1205,7 +1204,7 @@ bool AesInfoDialog::onResetDusMines()
|
||||
{
|
||||
if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
|
||||
MineResetRequest req(0, {m_aesEntityId});
|
||||
|
||||
return m_requestHelper->startSingleRequest([req, this]()
|
||||
@@ -1226,7 +1225,7 @@ bool AesInfoDialog::onResetDusMines()
|
||||
|
||||
void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleNContamination(data);
|
||||
}
|
||||
@@ -1234,7 +1233,7 @@ void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContami
|
||||
|
||||
void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleBCContamination(data);
|
||||
}
|
||||
@@ -1242,7 +1241,7 @@ void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCConta
|
||||
|
||||
void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleBoobyTrap(data);
|
||||
}
|
||||
@@ -1250,7 +1249,7 @@ void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &da
|
||||
|
||||
void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleOffRouteMine(data);
|
||||
}
|
||||
@@ -1258,7 +1257,7 @@ void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMi
|
||||
|
||||
void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleExplosionArea(data);
|
||||
}
|
||||
@@ -1266,7 +1265,7 @@ void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::Explosion
|
||||
|
||||
void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleExplosionSingle(data);
|
||||
}
|
||||
@@ -1274,7 +1273,7 @@ void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::Explosi
|
||||
|
||||
void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleMineArea(data);
|
||||
}
|
||||
@@ -1282,7 +1281,7 @@ void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data
|
||||
|
||||
void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleMineCorridor(data);
|
||||
}
|
||||
@@ -1290,7 +1289,7 @@ void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModifica
|
||||
|
||||
void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleGasPipe(data);
|
||||
}
|
||||
@@ -1298,7 +1297,7 @@ void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modTy
|
||||
|
||||
void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleDangerArea(data);
|
||||
}
|
||||
@@ -1306,7 +1305,7 @@ void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &
|
||||
|
||||
void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleBorderline(data);
|
||||
}
|
||||
@@ -1314,7 +1313,7 @@ void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &
|
||||
|
||||
void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleFunctionalArea(data);
|
||||
}
|
||||
@@ -1322,7 +1321,7 @@ void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModi
|
||||
|
||||
void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleAirSupportImpact(data);
|
||||
}
|
||||
@@ -1330,7 +1329,7 @@ void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, Data
|
||||
|
||||
void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
@@ -1357,7 +1356,7 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModifica
|
||||
|
||||
void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleSingleDusMine();
|
||||
}
|
||||
@@ -1365,14 +1364,14 @@ void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModifi
|
||||
|
||||
void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleExplosionCluster(data);
|
||||
}
|
||||
|
||||
void AesInfoDialog::onEffectClusterChanged(const EffectCluster &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleEffectCluster(data);
|
||||
}
|
||||
|
||||
-1
@@ -125,6 +125,5 @@ private:
|
||||
|
||||
Ui::AesInfoDialog* m_ui;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-1
@@ -27,7 +27,7 @@ NGL_WRAP_UI(aes_base_gui_SRCS
|
||||
InfoView/aes_base_info.ui
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
|
||||
NGL_ADD_LIBRARY2(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(AesBaseGui
|
||||
PRIVATE
|
||||
ExmDataPluginInterface
|
||||
|
||||
+1
-1
@@ -297,7 +297,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+1
-2
@@ -25,14 +25,13 @@ AesGuiBasHelpers::AesGuiBasHelpers()
|
||||
: m_aesDtc(nullptr)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(getLogger("AesGuiBase"))
|
||||
{}
|
||||
|
||||
bool AesGuiBasHelpers::initModel(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_aesDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+4
-5
@@ -35,7 +35,6 @@ AesItemList::AesItemList(const QString &menuGroup, QWidget *parent)
|
||||
, m_bHasAddAdlerOperatorRights(false)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::AesItemList)
|
||||
, m_logger(getLogger("AesItemList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -51,7 +50,7 @@ bool AesItemList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
@@ -171,7 +170,7 @@ void AesItemList::onAdlerBtn()
|
||||
AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
|
||||
ProjectDataManagement::EffectSource effectSource = model()->aesEffectSourceId(currentRow());
|
||||
|
||||
DEBUG_LOG(m_logger) << "onAdlerBtn aesEffectState=" << aesEffectState;
|
||||
DEBUG_LOG() << "onAdlerBtn aesEffectState=" << aesEffectState;
|
||||
|
||||
switch (aesEffectState.underlying())
|
||||
{
|
||||
@@ -209,7 +208,7 @@ void AesItemList::onAdlerBtn()
|
||||
AreaEffectSimulation::SetAesItemEffectorStateRequest req;
|
||||
req.aesId(model()->aesId(currentRow()));
|
||||
req.newEffectorState(AesEffectorState::EsReadyToFire);
|
||||
DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
|
||||
DEBUG_LOG() << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]() { return m_ftc->setAesItemEffectorStateRequest(req, this); });
|
||||
}
|
||||
@@ -224,7 +223,7 @@ void AesItemList::onAdlerBtn()
|
||||
void AesItemList::onHandleAdler()
|
||||
{
|
||||
AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
|
||||
DEBUG_LOG(m_logger) << "onHandleAdler aesEffectState=" << aesEffectState;
|
||||
DEBUG_LOG() << "onHandleAdler aesEffectState=" << aesEffectState;
|
||||
auto *adlerBtn = m_buttonBox->getButton(ADLER_BTN);
|
||||
|
||||
switch (aesEffectState.underlying())
|
||||
|
||||
+1
-2
@@ -27,7 +27,6 @@ ChargeAdministrationAdlerList::ChargeAdministrationAdlerList(QWidget *parent)
|
||||
, m_session(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ChargeAdministrationList)
|
||||
, m_logger(getLogger("ChargeAdministrationAdlerList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -62,7 +61,7 @@ bool ChargeAdministrationAdlerList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+5
-6
@@ -58,7 +58,6 @@ ChargeAdministrationAdlerModel::ChargeAdministrationAdlerModel(QObject *parent)
|
||||
tr("Total Stock"),
|
||||
tr("Gear Class")},
|
||||
parent)
|
||||
, m_logger(getLogger("ChargeAdministration"))
|
||||
{}
|
||||
|
||||
bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
|
||||
@@ -80,7 +79,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
|
||||
QMap<qint32, ParticipantManagement::Party> parties;
|
||||
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
|
||||
{
|
||||
DEBUG_LOG (m_logger) << "Could not retrieve visible Parties!";
|
||||
DEBUG_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -105,7 +104,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
|
||||
DEBUG_LOG() << "+++++++++ DataModification --> " << modType;
|
||||
updateParticipantChargeTypeMap(data);
|
||||
|
||||
updateItem(m_ppmDtc->participant(data.participantId()).partyId());
|
||||
@@ -189,10 +188,10 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
{
|
||||
if (participantCharges.partyId != partyId)
|
||||
continue;
|
||||
DEBUG_LOG(m_logger) << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
|
||||
DEBUG_LOG() << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
|
||||
for (auto it = participantCharges.chargeTypeTotalStockMap.cbegin(), end = participantCharges.chargeTypeTotalStockMap.cend(); it != end; ++it)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
|
||||
DEBUG_LOG() << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
|
||||
<< it.value().lastUpdate;
|
||||
GearData data;
|
||||
data.lastUpdate = it.value().lastUpdate;
|
||||
@@ -212,7 +211,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
item.partyId = partyId;
|
||||
for (auto gearData = chargeTypeGearData.cbegin(), end = chargeTypeGearData.cend(); gearData != end; ++gearData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
|
||||
DEBUG_LOG() << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
|
||||
<< ", lastUpdate:" << gearData.value().lastUpdate;
|
||||
|
||||
item.chargeTypeId = gearData.key();
|
||||
|
||||
+1
-2
@@ -31,7 +31,6 @@ ChargeAdministrationList::ChargeAdministrationList(QWidget *parent)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ChargeAdministrationList)
|
||||
, m_logger(getLogger("ChargeAdministrationList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -70,7 +69,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+2
-3
@@ -59,7 +59,6 @@ ChargeAdministrationModel::ChargeAdministrationModel(QObject *parent)
|
||||
tr("Used"),
|
||||
tr("Gear Class")},
|
||||
parent)
|
||||
, m_logger(getLogger("ChargeAdministration"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -67,7 +66,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
|
||||
{
|
||||
if (m_aesDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -102,7 +101,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
|
||||
QMap<qint32, ParticipantManagement::Party> parties;
|
||||
if (!ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
|
||||
ERROR_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Explosion/aeseffectclustermodel_export.h>
|
||||
#include <Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aeseffectclustermodel_export.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
+17
-18
@@ -44,7 +44,6 @@ AsmEditTrainingAreaDialog::AsmEditTrainingAreaDialog(QWidget *parent)
|
||||
, m_ui(new Ui::AsmEditTrainingAreaDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_menuGroup()
|
||||
, m_logger(getLogger("AssetManangementEditDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -71,12 +70,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
m_session = session;
|
||||
if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM";
|
||||
ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM";
|
||||
return false;
|
||||
}
|
||||
if(!m_session->getFtc<AssetManagement::DataInterface>(m_asmFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM";
|
||||
ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM";
|
||||
return false;
|
||||
}
|
||||
m_asmFtc->enableTrainingAreaRemove(true);
|
||||
@@ -86,7 +85,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
|
||||
if (!sitMapGuiIfc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Invalid shared_ptr sitMapGuiIfc!";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Invalid shared_ptr sitMapGuiIfc!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -94,7 +93,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
AssetManagement::TrainingArea ta = AssetManagement::TrainingArea();
|
||||
if(trainingAreaId == 0)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " New training area ";
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " New training area ";
|
||||
ta.id() = 0;
|
||||
ta.name() = QStringLiteral("newArea").toStdString();
|
||||
ta.width() = 12800;
|
||||
@@ -106,12 +105,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
ta = m_asmDtc->trainingArea(trainingAreaId);
|
||||
if(ta.id()<= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " training area not valid id: "<< trainingAreaId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " training area not valid id: "<< trainingAreaId;
|
||||
return false;
|
||||
}
|
||||
|
||||
m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name()));
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " edit training area " <<trainingAreaId;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " edit training area " <<trainingAreaId;
|
||||
}
|
||||
|
||||
m_trainingArea = ta;
|
||||
@@ -184,7 +183,7 @@ void AsmEditTrainingAreaDialog::getPosition()
|
||||
m_sitMapGuiIfc->getCoordinate(this, SLOT(onCoordinate(QPointF)), nullptr);
|
||||
break;
|
||||
case SituationMap::MapMode::Undefined:
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " ModeMode == Undefined ";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " ModeMode == Undefined ";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -203,7 +202,7 @@ void AsmEditTrainingAreaDialog::onRectData(const QPointF ¢erPoint, double wi
|
||||
m_trainingArea.width() = width;
|
||||
m_trainingArea.bottomLeft() = convert(btmLeft);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
|
||||
DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
|
||||
|
||||
showPreviewObject();
|
||||
}
|
||||
@@ -236,7 +235,7 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF ¢erPoint)
|
||||
m_trainingArea.width() = width;
|
||||
m_trainingArea.bottomLeft() = convert(btmLeft);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
|
||||
DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
|
||||
|
||||
showPreviewObject();
|
||||
|
||||
@@ -246,10 +245,10 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF ¢erPoint)
|
||||
|
||||
void AsmEditTrainingAreaDialog::onEditClicked()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START Editing..";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START Editing..";
|
||||
if (!m_sitMapGuiIfc || m_trainingArea.id() < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc or trainingArea_id: "<<m_trainingArea.id()<<" invalid! ";
|
||||
ERROR_LOG() << "onEditClicked: sitMapGuiIfc or trainingArea_id: "<<m_trainingArea.id()<<" invalid! ";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -264,7 +263,7 @@ void AsmEditTrainingAreaDialog::onEditClicked()
|
||||
m_ui->sbWidth->value(),
|
||||
m_ui->sbHeight->value());
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END Edit";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END Edit";
|
||||
|
||||
onSelectionChanged();
|
||||
|
||||
@@ -280,7 +279,7 @@ void AsmEditTrainingAreaDialog::showPreviewObject()
|
||||
{
|
||||
if (!m_sitMapGuiIfc || m_previewPolygon.size() == 0)
|
||||
{
|
||||
TRACE_LOG(m_logger) << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
|
||||
TRACE_LOG() << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
|
||||
return;
|
||||
}
|
||||
m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
|
||||
@@ -293,7 +292,7 @@ QPointF AsmEditTrainingAreaDialog::getCentPos(TrainingArea ta)
|
||||
ta.bottomLeft().lat());
|
||||
|
||||
QPointF centerPoint = utmCoordinate.geographic((ta.width() / 2.0), ta.height() / 2.0);
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y();
|
||||
|
||||
return centerPoint;
|
||||
}
|
||||
@@ -307,7 +306,7 @@ bool AsmEditTrainingAreaDialog::apply()
|
||||
|
||||
if(!m_asmFtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
|
||||
return false;
|
||||
}
|
||||
double height = m_ui->sbHeight->value();
|
||||
@@ -326,7 +325,7 @@ bool AsmEditTrainingAreaDialog::apply()
|
||||
return m_asmFtc->trainingAreaModifyRequest(req, this);
|
||||
});
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " scucess=" << success;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " scucess=" << success;
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -347,7 +346,7 @@ QPolygonF AsmEditTrainingAreaDialog::getTrainingArea(const TrainingArea &ta)
|
||||
QPolygonF polygonF;
|
||||
if(!m_asmDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " m_asmDtc is not valid!";
|
||||
ERROR_LOG() << " m_asmDtc is not valid!";
|
||||
return{};
|
||||
}
|
||||
AssetManagement::TrainingArea ddsTrainingArea = ta;
|
||||
|
||||
-1
@@ -74,7 +74,6 @@ private:
|
||||
QString m_dialogTitle{};
|
||||
|
||||
QString m_menuGroup;
|
||||
LOGGER_T m_logger;
|
||||
QString m_trainingAreaName{};
|
||||
AssetManagement::TrainingArea m_trainingArea;
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
|
||||
|
||||
+18
-19
@@ -25,7 +25,6 @@ AsmTrainingAreaDialog::AsmTrainingAreaDialog(const QString &menuGroup, QWidget *
|
||||
, m_session(nullptr)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("AsmTrainingAreaDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("Asset_Management-Training_Area"));
|
||||
@@ -64,19 +63,19 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s
|
||||
|
||||
if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable DTC from ASM";
|
||||
ERROR_LOG() << "Could not enable DTC from ASM";
|
||||
return false;
|
||||
}
|
||||
if(!m_session->getFtc<AssetManagement::DataInterface>(m_asmFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable FTC from ASM";
|
||||
ERROR_LOG() << "Could not enable FTC from ASM";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_sitMapGuiIfc = sitMapGuiIfc;
|
||||
if(!m_sitMapGuiIfc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "m_sitMapGuiIfc is invalid ";
|
||||
ERROR_LOG() << "m_sitMapGuiIfc is invalid ";
|
||||
return false;
|
||||
}
|
||||
bool bRet = true;
|
||||
@@ -87,11 +86,11 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s
|
||||
|
||||
if(!bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable dtc or ftc from ASM";
|
||||
ERROR_LOG() << "Could not enable dtc or ftc from ASM";
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "Ftc && Dtc enabled from ASM";
|
||||
INFO_LOG() << "Ftc && Dtc enabled from ASM";
|
||||
|
||||
delete m_model;
|
||||
m_model = new AsmTrainingAreaDialogModel(this);
|
||||
@@ -135,12 +134,12 @@ void AsmTrainingAreaDialog::onAddTrainingArea()
|
||||
addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " adding temp training Area ";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " adding temp training Area ";
|
||||
}
|
||||
|
||||
void AsmTrainingAreaDialog::onRemoveTrainingArea()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START" ;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START" ;
|
||||
QModelIndexList indexList = m_ui->trainingAreaView->selectedRows();
|
||||
if (indexList.size() == 0)
|
||||
return;
|
||||
@@ -148,7 +147,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
|
||||
TrainingArea req = m_model->getRowData(indexList.front().row());
|
||||
if (req.id() < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " invalid id:bt"<< req.id();
|
||||
ERROR_LOG() << Q_FUNC_INFO << " invalid id:bt"<< req.id();
|
||||
return;
|
||||
}
|
||||
if (!m_viewedTaIds.contains(req.id()))
|
||||
@@ -158,7 +157,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
|
||||
return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id()), this);
|
||||
});
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " success = " << success;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " success = " << success;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -166,7 +165,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
|
||||
tr("Cannot remove currently edited Training Area"));
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void AsmTrainingAreaDialog::onEditTrainingArea()
|
||||
@@ -177,7 +176,7 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
|
||||
TrainingArea taItem = m_model->getRowData(indexList.front().row());
|
||||
if (taItem.id() < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = "<< taItem.id();
|
||||
ERROR_LOG() << "onEditTrainingArea invalid id = "<< taItem.id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -206,16 +205,16 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
|
||||
void AsmTrainingAreaDialog::onSelectionChanged()
|
||||
{
|
||||
enaDisa();
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged() called !";
|
||||
DEBUG_LOG() << "onSelectionChanged() called !";
|
||||
const QModelIndex curIdx = m_ui->trainingAreaView->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
|
||||
AssetManagement::TrainingArea taItem = m_model->getRowData(curIdx.row());
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: "<<taItem.id();
|
||||
DEBUG_LOG() << "onSelectionChanged() selected training area id: "<<taItem.id();
|
||||
if(taItem.id() < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id"<< taItem.id();
|
||||
ERROR_LOG() << "onEditTrainingArea invalid id"<< taItem.id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -237,13 +236,13 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(int trainingAreaId)
|
||||
{
|
||||
if(!m_asmDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " m_asmDtc is not valid!";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " m_asmDtc is not valid!";
|
||||
return {};
|
||||
}
|
||||
const AssetManagement::TrainingArea &ddsTrainingArea = m_asmDtc->trainingArea(trainingAreaId);
|
||||
if (ddsTrainingArea.id() != trainingAreaId)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -281,7 +280,7 @@ void AsmTrainingAreaDialog::showAllTrainingAreas()
|
||||
for (int row = 0; row < rowCount; ++row)
|
||||
{
|
||||
const TrainingArea ¤tArea = m_model->getRowData(row);
|
||||
INFO_LOG(m_logger) << " row = " << row << " ; currentArea = " << currentArea;
|
||||
INFO_LOG() << " row = " << row << " ; currentArea = " << currentArea;
|
||||
const QPolygonF &poly = getTrainingArea(currentArea);
|
||||
polyVec.append(poly);
|
||||
}
|
||||
@@ -293,7 +292,7 @@ void AsmTrainingAreaDialog::showPreviewObject()
|
||||
{
|
||||
if (!this->m_sitMapGuiIfc || m_previewPolygon.size() == 0)
|
||||
{
|
||||
TRACE_LOG(m_logger) << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
|
||||
TRACE_LOG() << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
|
||||
return;
|
||||
}
|
||||
this->m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
|
||||
|
||||
-1
@@ -65,7 +65,6 @@ private:
|
||||
std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
|
||||
std::shared_ptr<AssetManagement::Interface::Ftc> m_asmFtc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LOGGER_T m_logger;
|
||||
QPolygonF m_previewPolygon;
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
|
||||
QSet<int> m_viewedTaIds{};
|
||||
|
||||
+1
-2
@@ -14,7 +14,6 @@ AsmTrainingAreaDialogModel::AsmTrainingAreaDialogModel(QObject *parent)
|
||||
|
||||
parent)
|
||||
,m_asmDtc(nullptr)
|
||||
,m_logger(getLogger("AsmTrainingAreaDialogModel"))
|
||||
{}
|
||||
|
||||
AsmTrainingAreaDialogModel::~AsmTrainingAreaDialogModel()
|
||||
@@ -35,7 +34,7 @@ bool AsmTrainingAreaDialogModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
});
|
||||
|
||||
} else {
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " no m_asmDtc";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " no m_asmDtc";
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
-1
@@ -36,7 +36,6 @@ public:
|
||||
private:
|
||||
bool m_hideRemoved;
|
||||
std::shared_ptr<Interface::Dtc> m_asmDtc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+1
-2
@@ -30,7 +30,6 @@ AvailStreamsModel::AvailStreamsModel(Interface::Dtc *avmDtc,
|
||||
, m_cnrRoot(new NGLTreeItem(QVariant()))
|
||||
, m_tvcRoot(new NGLTreeItem(QVariant()))
|
||||
, m_changes(false)
|
||||
, m_logger(getLogger("AudioSettingsAvailStreamsModel"))
|
||||
{
|
||||
Q_ASSERT(avmDtc);
|
||||
|
||||
@@ -110,7 +109,7 @@ QVariant AvailStreamsModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
NGLTreeItem *item = privateData(index);
|
||||
StreamData data = item->data().value<StreamData>();
|
||||
DEBUG_LOG(m_logger) << data.name;
|
||||
DEBUG_LOG() << data.name;
|
||||
return data.name;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -54,8 +54,6 @@ private:
|
||||
NGLTreeItem *m_tvcRoot;
|
||||
bool m_changes;
|
||||
QVector<QPair<bool , int> > m_changedStreams;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
class AvailStreamsFilter final : public QSortFilterProxyModel
|
||||
|
||||
+5
-6
@@ -18,7 +18,6 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_ui(new Ui::AudioSettingsDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("AudioSettingsDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
@@ -123,7 +122,7 @@ void AudioSettingsDialog::retranslate()
|
||||
void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User &data, DataModification modType)
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
|
||||
DEBUG_LOG() << "************** onOperatorChanged ";
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eRemoved:
|
||||
@@ -246,7 +245,7 @@ void AudioSettingsDialog::onDownButtonClicked()
|
||||
|
||||
void AudioSettingsDialog::onSelectionChangedAllocation(const QItemSelection &selected, const QItemSelection &deselected)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
|
||||
DEBUG_LOG() << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
|
||||
Q_UNUSED(deselected);
|
||||
QModelIndex first = m_ui->treeViewAllocated->model()->index(0, 0);
|
||||
int rowCnt = m_ui->treeViewAllocated->model()->rowCount();
|
||||
@@ -282,7 +281,7 @@ bool AudioSettingsDialog::apply()
|
||||
bool AudioSettingsDialog::applyRemove()
|
||||
{
|
||||
RemoveCnrTvcProfileRequest removeRequest;
|
||||
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove";
|
||||
DEBUG_LOG() << "AudioSettingsDialog::applyRemove";
|
||||
|
||||
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
|
||||
{
|
||||
@@ -305,7 +304,7 @@ bool AudioSettingsDialog::applyRemove()
|
||||
bool AudioSettingsDialog::applyModify()
|
||||
{
|
||||
ModifyCnrTvcProfileRequest modifyRequest;
|
||||
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify";
|
||||
DEBUG_LOG() << "AudioSettingsDialog::applyModify";
|
||||
|
||||
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
|
||||
{
|
||||
@@ -383,7 +382,7 @@ void AudioSettingsDialog::onSelectionOperatorChanged(const int index)
|
||||
m_ui->pushButtonUp->setEnabled(false);
|
||||
m_ui->pushButtonDown->setEnabled(false);
|
||||
m_operatorId = m_ui->operatorComboBox->currentData().toInt();
|
||||
DEBUG_LOG(m_logger) << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
|
||||
DEBUG_LOG() << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
|
||||
fillOperatorList();
|
||||
m_modelAllocated->resetChangeState();
|
||||
m_modelAvailable->resetChangeState();
|
||||
|
||||
+6
-7
@@ -14,7 +14,6 @@ namespace AudioVideoManagement
|
||||
|
||||
AllocatedStreamsModel::AllocatedStreamsModel(QObject *parent)
|
||||
: NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), { tr("Allocated") })
|
||||
, m_logger(getLogger("AudioSettingsUsedStreamsModel"))
|
||||
{
|
||||
setMimeType(StreamData::mimeType());
|
||||
}
|
||||
@@ -32,7 +31,7 @@ QVariant AllocatedStreamsModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
NGLTreeItem *item = privateData(index);
|
||||
StreamData data = item->data().value<StreamData>();
|
||||
DEBUG_LOG(m_logger) << data.name;
|
||||
DEBUG_LOG() << data.name;
|
||||
return data.name;
|
||||
}
|
||||
|
||||
@@ -93,14 +92,14 @@ bool AllocatedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
|
||||
qDeleteAll(droppedItems);
|
||||
emit droppedStreamNames(streams);
|
||||
m_changes = true;
|
||||
DEBUG_LOG(m_logger) << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
|
||||
DEBUG_LOG() << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
|
||||
return NGLTreeModel::dropMimeData(data, action, row, 0, QModelIndex());
|
||||
}
|
||||
|
||||
|
||||
void AllocatedStreamsModel::setNewStreamData(const QVector<StreamData> &newData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "set new stream data, count: " << newData.size();
|
||||
DEBUG_LOG() << "set new stream data, count: " << newData.size();
|
||||
resetModel();
|
||||
for (const StreamData &sd : newData)
|
||||
m_rootItem->appendChild(new NGLTreeItem(QVariant::fromValue(sd)));
|
||||
@@ -117,15 +116,15 @@ QVector<StreamData> AllocatedStreamsModel::getStreamDataVector() const
|
||||
const NGLTreeItem *item = m_rootItem->child(i);
|
||||
const StreamData sd = item->data().value<StreamData>();
|
||||
result.append(sd);
|
||||
DEBUG_LOG(m_logger) << "result.append(sd.name):" << sd.name;
|
||||
DEBUG_LOG() << "result.append(sd.name):" << sd.name;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "getStreamDataVector() size: " << result.size();
|
||||
DEBUG_LOG() << "getStreamDataVector() size: " << result.size();
|
||||
return result;
|
||||
}
|
||||
|
||||
void AllocatedStreamsModel::changeOrder(const QModelIndex &idx, bool up)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "changeOrder "
|
||||
DEBUG_LOG() << "changeOrder "
|
||||
<< " index = " << idx.row()
|
||||
<< " up = " << up
|
||||
<< " m_rootItem->childCount()= " << m_rootItem->childCount();
|
||||
|
||||
-1
@@ -42,7 +42,6 @@ signals:
|
||||
private:
|
||||
bool m_changes{false};
|
||||
QVector<QPair<bool , int> > m_changedStreams;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -22,7 +22,6 @@ AvmSequenceModel::AvmSequenceModel(QObject *parent)
|
||||
tr("Volume"),
|
||||
tr("Description")},
|
||||
parent)
|
||||
, m_logger(getLogger("AvmSequenceModel"))
|
||||
{}
|
||||
|
||||
void AvmSequenceModel::setTimezoneHoursOffset(int timezoneHoursOffset)
|
||||
|
||||
-1
@@ -63,7 +63,6 @@ private:
|
||||
|
||||
QVector<int> m_highlightedRows;
|
||||
int m_timezoneHoursOffset = 0;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class AvmSequenceProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
|
||||
|
||||
+2
-3
@@ -62,7 +62,6 @@ TopicEditor::TopicEditor(LtsSession::LtsSession *session, const TopicEditorBase:
|
||||
, m_model(new AvmSequenceModel(this))
|
||||
, m_playbackMenu(nullptr)
|
||||
, m_ui(new Ui::AVTopicEditor)
|
||||
, m_logger(getLogger("TopicEditor"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
|
||||
@@ -380,7 +379,7 @@ void TopicEditor::onEditSequence()
|
||||
if (!m_playbackMenu)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "slotEditSequence ";
|
||||
DEBUG_LOG() << "slotEditSequence ";
|
||||
const auto selRows = m_ui->tvSequences->selectionModel()->selectedRows();
|
||||
|
||||
if (selRows.size() != 1)
|
||||
@@ -393,7 +392,7 @@ void TopicEditor::onEditSequence()
|
||||
m_model->setHighlightedRow(row);
|
||||
const AvsSequence selectedSeq = m_model->getRowData(row);
|
||||
|
||||
DEBUG_LOG(m_logger) << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
|
||||
DEBUG_LOG() << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
|
||||
m_playbackMenu->setStreamName(selectedSeq.internalStreamName);
|
||||
|
||||
m_ui->dtStart->setMsecsSinceEpoch(std::chrono::milliseconds(selectedSeq.start.time_since_epoch()).count());
|
||||
|
||||
-1
@@ -67,7 +67,6 @@ private:
|
||||
QString m_topicStreamName;
|
||||
|
||||
Ui::AVTopicEditor *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+3
-4
@@ -64,7 +64,6 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
|
||||
, m_ismDtc(ismDtc)
|
||||
, m_session(session)
|
||||
, m_streamNameMapping(streamNameMapping)
|
||||
, m_logger(getLogger("AvailableStreamsModel"))
|
||||
{
|
||||
Q_ASSERT(ismDtc);
|
||||
Q_ASSERT(streamNameMapping);
|
||||
@@ -165,7 +164,7 @@ QMimeData *AvailableStreamsModel::mimeData(const QModelIndexList &indexes) const
|
||||
bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
|
||||
int row, int column, const QModelIndex &parent)
|
||||
{
|
||||
INFO_LOG(m_logger) << "dropMimeData: action = " << action
|
||||
INFO_LOG() << "dropMimeData: action = " << action
|
||||
<< ", row = " << row
|
||||
<< ", parent: valid = " << parent.isValid();
|
||||
|
||||
@@ -185,7 +184,7 @@ bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
|
||||
void AvailableStreamsModel::initModel()
|
||||
{
|
||||
beginResetModel();
|
||||
INFO_LOG(m_logger) << "initModel";
|
||||
INFO_LOG() << "initModel";
|
||||
|
||||
|
||||
m_rootItem->removeAllChildren();
|
||||
@@ -251,7 +250,7 @@ void AvailableStreamsModel::initModel()
|
||||
{
|
||||
if (videoTeam.exerciseId() != m_session->exerciseId())
|
||||
continue;
|
||||
DEBUG_LOG(m_logger) << "add new videoteam" << videoTeam;
|
||||
DEBUG_LOG() << "add new videoteam" << videoTeam;
|
||||
StreamModelData item;
|
||||
item.name = QString::fromStdString(videoTeam.streamName().c_str());
|
||||
item.mountingPointId = -1 * videoTeam.id();
|
||||
|
||||
-2
@@ -96,8 +96,6 @@ private:
|
||||
const std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
|
||||
LtsSession::LtsSession *m_session;
|
||||
StreamNameMapping *m_streamNameMapping;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
Q_DECLARE_METATYPE(AudioVideoManagement::StreamModelData)
|
||||
|
||||
+2
-3
@@ -18,7 +18,6 @@ ChooseMenu::ChooseMenu(Interface::Dtc *dtc, AvsMenus *avsMenus, QWidget *parent)
|
||||
, m_dtc(dtc)
|
||||
, m_avsMenus(avsMenus)
|
||||
, m_ui(new Ui::ChooseMenuStruct)
|
||||
, m_logger(getLogger("ChooseMenu"))
|
||||
{
|
||||
Q_ASSERT(dtc);
|
||||
Q_ASSERT(avsMenus);
|
||||
@@ -86,11 +85,11 @@ void ChooseMenu::onMenuStructChanged(const MenuStruct &data, DataModification mo
|
||||
bool ChooseMenu::apply()
|
||||
{
|
||||
int menuId = m_ui->cbAudio->currentData().toInt();
|
||||
INFO_LOG(m_logger) << "MenuId Audio: " << menuId;
|
||||
INFO_LOG() << "MenuId Audio: " << menuId;
|
||||
m_avsMenus->setAnnouncementMenu(menuId);
|
||||
|
||||
menuId = m_ui->cbVideo->currentData().toInt();
|
||||
INFO_LOG(m_logger) << "MenuId Video: " << menuId;
|
||||
INFO_LOG() << "MenuId Video: " << menuId;
|
||||
m_avsMenus->setVideoMenu(menuId);
|
||||
|
||||
return true;
|
||||
|
||||
-1
@@ -50,7 +50,6 @@ private:
|
||||
Interface::Dtc *m_dtc;
|
||||
AvsMenus *m_avsMenus;
|
||||
Ui::ChooseMenuStruct *m_ui;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+5
-6
@@ -15,7 +15,6 @@ MenuEdit::MenuEdit(QWidget *parent)
|
||||
, m_availStreamsModel(nullptr)
|
||||
, m_usedStreamsModel(nullptr)
|
||||
, m_isAudio(false)
|
||||
, m_logger(getLogger("AudioVideoManagementEdit"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
@@ -47,11 +46,11 @@ bool MenuEdit::init(LtsSession::LtsSession *session,
|
||||
StreamNameMapping *streamNameMapping,
|
||||
const MenuStruct &ms)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "MenuEdit::init()";
|
||||
DEBUG_LOG() << "MenuEdit::init()";
|
||||
|
||||
if (!ftc || !dtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "MenuEdit::init() Invalid shared_ptr!";
|
||||
ERROR_LOG() << "MenuEdit::init() Invalid shared_ptr!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -120,7 +119,7 @@ void MenuEdit::onRemove()
|
||||
return;
|
||||
slotChangesMade();
|
||||
|
||||
DEBUG_LOG(m_logger) << "index row: " << index.row();
|
||||
DEBUG_LOG() << "index row: " << index.row();
|
||||
m_usedStreamsModel->removeRow(index.row(), index.parent());
|
||||
}
|
||||
else
|
||||
@@ -132,7 +131,7 @@ void MenuEdit::onRemove()
|
||||
return;
|
||||
slotChangesMade();
|
||||
|
||||
DEBUG_LOG(m_logger) << "index row: " << index.row();
|
||||
DEBUG_LOG() << "index row: " << index.row();
|
||||
m_usedStreamsModel->removeRow(index.row(), index.parent());
|
||||
|
||||
}
|
||||
@@ -141,7 +140,7 @@ void MenuEdit::onRemove()
|
||||
|
||||
void MenuEdit::onModelDataChanged()
|
||||
{
|
||||
INFO_LOG(m_logger) << "onModelDataChanged";
|
||||
INFO_LOG() << "onModelDataChanged";
|
||||
m_ui->menuTreeView->expandAll();
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -68,7 +68,6 @@ private:
|
||||
UsedStreamsModel *m_usedStreamsModel;
|
||||
bool m_isAudio;
|
||||
QString m_name;
|
||||
NGL::INGLLogger &m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
AudioVideoManagement::MenuStruct m_lastDdsMenuStruct;
|
||||
|
||||
+5
-6
@@ -26,7 +26,6 @@ MenuEditView::MenuEditView(const QString &menuGroup, LtsSession::LtsSession *ses
|
||||
, m_session(session)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::MenuEditView)
|
||||
, m_logger(getLogger("AudioVideoManagementDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
@@ -150,7 +149,7 @@ void MenuEditView::onEditMenuStruct()
|
||||
AudioVideoManagement::MenuStruct ms = m_model->getRowData(row);
|
||||
ms.isAudio(m_isAudio);
|
||||
|
||||
DEBUG_LOG(m_logger) << "---onEditMenuStruct () "
|
||||
DEBUG_LOG() << "---onEditMenuStruct () "
|
||||
<< " id: " << ms.id()
|
||||
<< " name: " << ms.name();
|
||||
|
||||
@@ -205,15 +204,15 @@ void MenuEditView::onExportButtonClicked()
|
||||
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
|
||||
}
|
||||
|
||||
void MenuEditView::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
|
||||
DEBUG_LOG() << " onImportButtonClicked() ";
|
||||
|
||||
QByteArray content;
|
||||
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMenuEditView));
|
||||
@@ -240,7 +239,7 @@ void MenuEditView::onImportButtonClicked()
|
||||
});
|
||||
}
|
||||
}
|
||||
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
|
||||
INFO_LOG() << "--- onImportButtonClicked() ";
|
||||
}
|
||||
}
|
||||
}
|
||||
-3
@@ -76,9 +76,6 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
Ui::MenuEditView *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+2
-3
@@ -21,7 +21,6 @@ MenuViewModel::MenuViewModel(QObject *parent)
|
||||
parent)
|
||||
, m_isAudio(false)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("MenuViewModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -78,7 +77,7 @@ QByteArray MenuViewModel::modelToJson(int row) const
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMMenuEditView);
|
||||
|
||||
DEBUG_LOG(m_logger) << "row =" << ": " << row;
|
||||
DEBUG_LOG() << "row =" << ": " << row;
|
||||
const AudioVideoManagement::MenuStruct &menuStruct = m_vecData.at(row);
|
||||
|
||||
obj[QStringLiteral("id")] = 0;
|
||||
@@ -123,7 +122,7 @@ QVector<AudioVideoManagement::MenuStruct> MenuViewModel::jsonToMenuStructs(const
|
||||
|
||||
const QJsonArray arrEntry(obj.value(QStringLiteral("menuEntries")).toArray());
|
||||
menuStruct.menuEntries().resize(arrEntry.size());
|
||||
INFO_LOG(m_logger) << "arrEntry.size()=" << arrEntry.size();
|
||||
INFO_LOG() << "arrEntry.size()=" << arrEntry.size();
|
||||
for (int j = 0; j < arrEntry.size(); ++j)
|
||||
{
|
||||
const QJsonObject objEntry(arrEntry.at(j).toObject());
|
||||
|
||||
-1
@@ -30,6 +30,5 @@ protected:
|
||||
private:
|
||||
bool m_isAudio;
|
||||
std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_dtc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -13,7 +13,6 @@ namespace AudioVideoManagement
|
||||
NewMenuStruct::NewMenuStruct(QWidget *parent)
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
|
||||
, m_ui(new Ui::NewMenuStruct)
|
||||
, m_logger(getLogger("NewMenu"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Ok)->hide();
|
||||
|
||||
-1
@@ -30,7 +30,6 @@ Q_SIGNALS:
|
||||
|
||||
private:
|
||||
Ui::NewMenuStruct *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+24
-25
@@ -296,7 +296,6 @@ AvmPlaybackMenu::AvmPlaybackMenu(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::Playback)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("AvmPlaybackMenu"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -388,12 +387,12 @@ bool AvmPlaybackMenu::init(LtsSession::LtsSession *session, AvaSession *avaSessi
|
||||
m_presetStreamName = streamName;
|
||||
|
||||
if (m_presetStreamName)
|
||||
DEBUG_LOG(m_logger) << "init stream preset: " << m_presetStreamName.get();
|
||||
DEBUG_LOG() << "init stream preset: " << m_presetStreamName.get();
|
||||
|
||||
m_presetStartTime = startTime;
|
||||
|
||||
if (m_presetStartTime)
|
||||
DEBUG_LOG(m_logger) << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
|
||||
DEBUG_LOG() << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
|
||||
|
||||
m_session = session;
|
||||
m_playbackApp = std::move(appHandle);
|
||||
@@ -1007,37 +1006,37 @@ void AvmPlaybackMenu::preselectStream(const QString &fallbackInternalStreamName)
|
||||
const QString currentStreamName(m_presetStreamName.is_initialized() ? *m_presetStreamName : QString());
|
||||
const QString currentInternalName(currentStreamName.isEmpty() ? fallbackInternalStreamName : QString());
|
||||
|
||||
DEBUG_LOG(m_logger) << "currentStreamName: " << currentStreamName;
|
||||
DEBUG_LOG(m_logger) << "currentInternalName: " << currentInternalName;
|
||||
DEBUG_LOG() << "currentStreamName: " << currentStreamName;
|
||||
DEBUG_LOG() << "currentInternalName: " << currentInternalName;
|
||||
|
||||
m_presetStreamName.reset();
|
||||
|
||||
if (!currentInternalName.isEmpty() || !currentStreamName.isEmpty())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "stream preset set - searching for '" << currentStreamName << "'..";
|
||||
DEBUG_LOG() << "stream preset set - searching for '" << currentStreamName << "'..";
|
||||
|
||||
bool found = false;
|
||||
for (int i = 0; i < m_ui->cbStreams->count(); i++)
|
||||
{
|
||||
const AvaStream &curStream = m_ui->cbStreams->itemData(i).value<AvaStream>();
|
||||
|
||||
DEBUG_LOG(m_logger) << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
|
||||
DEBUG_LOG() << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
|
||||
|
||||
if ((!currentInternalName.isEmpty() && curStream.displayName == currentInternalName) ||
|
||||
(!currentStreamName.isEmpty() && curStream.internalName == currentStreamName))
|
||||
{
|
||||
found = true;
|
||||
DEBUG_LOG(m_logger) << "stream preset set, found & selected";
|
||||
DEBUG_LOG() << "stream preset set, found & selected";
|
||||
m_ui->cbStreams->setCurrentIndex(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found)
|
||||
WARNING_LOG(m_logger) << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
|
||||
WARNING_LOG() << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
|
||||
}
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "no stream preset set";
|
||||
DEBUG_LOG() << "no stream preset set";
|
||||
}
|
||||
|
||||
|
||||
@@ -1098,7 +1097,7 @@ void AvmPlaybackMenu::setSavedPos(qint64 msecs)
|
||||
|
||||
void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onTimelineComplete";
|
||||
DEBUG_LOG() << "onTimelineComplete";
|
||||
|
||||
m_intervalModel.setData(timeline.parts());
|
||||
m_ui->tavIntervals->resizeColumnsToContents();
|
||||
@@ -1116,7 +1115,7 @@ void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
|
||||
m_savedPos.reset();
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
|
||||
DEBUG_LOG() << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
|
||||
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), newPos);
|
||||
|
||||
m_timelineIsComplete = true;
|
||||
@@ -1143,7 +1142,7 @@ void AvmPlaybackMenu::onStreamPositionReceived(const QString &dialogId, const QS
|
||||
return;
|
||||
|
||||
m_lastAvsPos = pos;
|
||||
DEBUG_LOG(m_logger) << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
|
||||
DEBUG_LOG() << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
|
||||
|
||||
if (m_avaCtrl->isEmpty())
|
||||
applyAvsPos();
|
||||
@@ -1199,13 +1198,13 @@ void AvmPlaybackMenu::onUiTimeChanged(AvaTimePoint t)
|
||||
m_currentButtonState != ButtonStates::Stopped)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
|
||||
DEBUG_LOG() << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
|
||||
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), t);
|
||||
}
|
||||
|
||||
void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selectedStreams)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStreamSelectionChanged count = " << selectedStreams.count();
|
||||
DEBUG_LOG() << "onStreamSelectionChanged count = " << selectedStreams.count();
|
||||
|
||||
Q_ASSERT(!selectedStreams.isEmpty());
|
||||
|
||||
@@ -1232,7 +1231,7 @@ void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selecte
|
||||
void AvmPlaybackMenu::onIntervalActivated(const QModelIndex &index)
|
||||
{
|
||||
AvaTimelinePart interval = m_intervalModel.getRowData(index.row());
|
||||
DEBUG_LOG(m_logger) << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
|
||||
DEBUG_LOG() << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
|
||||
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), interval.first);
|
||||
|
||||
|
||||
@@ -1303,7 +1302,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
|
||||
(void)blocker;
|
||||
|
||||
const auto &rowData = marker;
|
||||
DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
|
||||
DEBUG_LOG() << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
|
||||
<< " note = " << QString::fromStdString(rowData.note());
|
||||
|
||||
bool selectMarkerStream = false;
|
||||
@@ -1320,7 +1319,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
|
||||
|
||||
for (const MarkerManagement::MarkerDescription &desc : rowData.descriptions())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " description = " << QString::fromStdString(desc.content())
|
||||
DEBUG_LOG() << " description = " << QString::fromStdString(desc.content())
|
||||
<< " desc.markerType()=" << desc.markerType();
|
||||
if ((desc.markerType() == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
|
||||
(desc.markerType() == MarkerManagement::MarkerType::Audio && m_isAudio == true))
|
||||
@@ -1346,7 +1345,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
|
||||
|
||||
avaStream.displayName = m_streamNameMapping->displayName(avaStream.internalName);
|
||||
m_ui->cbMarkerStreams->addItem(avaStream.displayName, QVariant::fromValue(avaStream));
|
||||
DEBUG_LOG(m_logger) << "streams[" << avaStream.internalName << "]"
|
||||
DEBUG_LOG() << "streams[" << avaStream.internalName << "]"
|
||||
<< " internaName=" << avaStream.internalName
|
||||
<< " displayName=" << avaStream.displayName;
|
||||
if (bIsSelected && selectedStream.internalName.isEmpty())
|
||||
@@ -1364,7 +1363,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
|
||||
|
||||
qint64 time = rowData.timeStamp() - rowData.timeStampOffset();
|
||||
|
||||
DEBUG_LOG(m_logger) << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
|
||||
DEBUG_LOG() << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
|
||||
|
||||
std::chrono::milliseconds t(time);
|
||||
AvaTimePoint p(std::chrono::duration_cast<AvaDuration>(t));
|
||||
@@ -1404,7 +1403,7 @@ void AvmPlaybackMenu::onSetMarkerClicked()
|
||||
if (!m_selectedStreams || m_selectedStreams.get().isEmpty())
|
||||
{
|
||||
new LtsWidgets::LtsMessageDialogNew(this, tr("No stream selected to create a marker from."));
|
||||
WARNING_LOG(m_logger) << "onSetMarkerClicked called, but no selected streams available";
|
||||
WARNING_LOG() << "onSetMarkerClicked called, but no selected streams available";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1445,7 +1444,7 @@ void AvmPlaybackMenu::onStartClicked()
|
||||
{
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "onStartClicked"
|
||||
DEBUG_LOG() << "onStartClicked"
|
||||
<< " dialogId=" << m_playbackApp.dialogId()
|
||||
<< " currentSpeed=" << currentSpeed()
|
||||
|
||||
@@ -1460,7 +1459,7 @@ void AvmPlaybackMenu::onStartClicked()
|
||||
return;
|
||||
}
|
||||
|
||||
WARNING_LOG(m_logger) << "onStartClicked called, but no selected streams available";
|
||||
WARNING_LOG() << "onStartClicked called, but no selected streams available";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1502,14 +1501,14 @@ void AvmPlaybackMenu::onAllStreams()
|
||||
void AvmPlaybackMenu::onIntervalBackwardClicked()
|
||||
{
|
||||
const AvaTimelinePart &targetInterval = m_intervalModel.previousInterval();
|
||||
DEBUG_LOG(m_logger) << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
|
||||
DEBUG_LOG() << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
|
||||
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
|
||||
}
|
||||
|
||||
void AvmPlaybackMenu::onIntervalForwardClicked()
|
||||
{
|
||||
const AvaTimelinePart &targetInterval = m_intervalModel.nextInterval();
|
||||
DEBUG_LOG(m_logger) << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
|
||||
DEBUG_LOG() << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
|
||||
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -210,8 +210,6 @@ private:
|
||||
bool m_videoScreenSelectionDone { false };
|
||||
bool m_timelineIsComplete { false };
|
||||
ButtonStates m_buttonStateBeforePlaybackAppPause { ButtonStates::AllOff };
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+21
-22
@@ -23,7 +23,6 @@ UsedStreamsModel::UsedStreamsModel(const std::shared_ptr<Interface::Dtc> avmDtc,
|
||||
, m_dummyId(-10000000)
|
||||
, m_menuStruct(ms)
|
||||
, m_streamNameMapping(streamNameMapping)
|
||||
, m_logger(getLogger("UsedStreamsModel"))
|
||||
|
||||
{
|
||||
Q_ASSERT(streamNameMapping);
|
||||
@@ -130,7 +129,7 @@ bool UsedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action
|
||||
if (!checkDrop(data, index(row, column), parent, action))
|
||||
return false;
|
||||
|
||||
INFO_LOG(m_logger) << "dropMimeData: action = " << action
|
||||
INFO_LOG() << "dropMimeData: action = " << action
|
||||
<< ", row = " << row
|
||||
<< ", parent: valid = " << parent.isValid();
|
||||
|
||||
@@ -201,7 +200,7 @@ bool UsedStreamsModel::canDropMimeData(const QMimeData *data, Qt::DropAction act
|
||||
|
||||
stream >> idParent >> idItem >> group >> itemData >> mountId;
|
||||
ms = itemData.value<StreamModelData>();
|
||||
INFO_LOG(m_logger) << "Insert:"
|
||||
INFO_LOG() << "Insert:"
|
||||
<< "\n ms.name=" << ms.name
|
||||
<< "\n ms.isGroup=" << ms.isGroup
|
||||
<< "\n ms.parentId=" << ms.parentId
|
||||
@@ -302,7 +301,7 @@ void UsedStreamsModel::insertChildren(NGLTreeItem *parent, int parentId, const s
|
||||
|
||||
if (me.isGroup())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "insertChildren"
|
||||
DEBUG_LOG() << "insertChildren"
|
||||
<< me.mountingPointId()
|
||||
<< me.name();
|
||||
insertChildren(treeItem, me.id(), entries);
|
||||
@@ -336,7 +335,7 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
|
||||
bool retValue = true;
|
||||
if (!target)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Nullptr exception";
|
||||
ERROR_LOG() << "Nullptr exception";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -344,10 +343,10 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
|
||||
|
||||
StreamModelData msTarget = target->data().value<StreamModelData>();
|
||||
if (msTarget.id == toCheck.parentId)
|
||||
DEBUG_LOG(m_logger) << "Drag&drag in same folder.";
|
||||
DEBUG_LOG() << "Drag&drag in same folder.";
|
||||
else if (msTarget.isGroup && toCheck.isGroup)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trying to drop folder into folder";
|
||||
DEBUG_LOG() << "Trying to drop folder into folder";
|
||||
retValue = false;
|
||||
}
|
||||
else
|
||||
@@ -429,18 +428,18 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
|
||||
|
||||
else if ((movedFolders.at(0) != item.parentId) && (movedFolders.contains(item.parentId)) && (action == Qt::MoveAction))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Ignoring items in sub folder while moving.";
|
||||
DEBUG_LOG() << "Ignoring items in sub folder while moving.";
|
||||
continue;
|
||||
}
|
||||
|
||||
else if (!movedFolders.contains(item.parentId) && (action == Qt::MoveAction))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Only allow items from same folder to be moved.";
|
||||
DEBUG_LOG() << "Only allow items from same folder to be moved.";
|
||||
return false;
|
||||
}
|
||||
if (!checkSingleItem(itemToCheck, item))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Not able to add item with name: " << item.name;
|
||||
DEBUG_LOG() << "Not able to add item with name: " << item.name;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -453,7 +452,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "More than one folder selected.";
|
||||
DEBUG_LOG() << "More than one folder selected.";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -464,7 +463,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
|
||||
|
||||
if (countDropped + countAgainst > 12)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trying to add to many items to folder";
|
||||
DEBUG_LOG() << "Trying to add to many items to folder";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -552,7 +551,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
|
||||
const DataModification modType)
|
||||
{
|
||||
beginResetModel();
|
||||
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
|
||||
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
|
||||
<< " data.elements().size()=" << data.elements().size();
|
||||
|
||||
switch (modType)
|
||||
@@ -563,7 +562,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
|
||||
case DataModification::eAdded:
|
||||
for (const InfrastructureManagement::StructureElement &se : data.elements())
|
||||
{
|
||||
INFO_LOG(m_logger) << "se.id()" << se.id()
|
||||
INFO_LOG() << "se.id()" << se.id()
|
||||
<< " se.displayName()" << se.displayName()
|
||||
<< " m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
const QString newName = QString::fromStdString(se.displayName());
|
||||
@@ -578,7 +577,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
|
||||
{
|
||||
|
||||
beginResetModel();
|
||||
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
@@ -587,7 +586,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
|
||||
case DataModification::eModified:
|
||||
case DataModification::eAdded:
|
||||
|
||||
INFO_LOG(m_logger) << "se.id()" << data.id()
|
||||
INFO_LOG() << "se.id()" << data.id()
|
||||
<< " se.displayName()" << data.streamName()
|
||||
<< " m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
const QString newName = QString::fromStdString(data.streamName());
|
||||
@@ -603,8 +602,8 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
|
||||
Q_UNUSED(internalName)
|
||||
|
||||
beginResetModel();
|
||||
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
INFO_LOG(m_logger) << "se.id()" << mountingPointId
|
||||
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
INFO_LOG() << "se.id()" << mountingPointId
|
||||
<< " se.displayName()" << displayName
|
||||
<< " m_rootItem->childCount()" << m_rootItem->childCount();
|
||||
updateStreamNames(mountingPointId, displayName, m_rootItem);
|
||||
@@ -615,7 +614,7 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
|
||||
|
||||
void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QString &newName, NGLTreeItem *item)
|
||||
{
|
||||
INFO_LOG(m_logger) << "updateStreamNames mountingPointId=" << mountingPointId
|
||||
INFO_LOG() << "updateStreamNames mountingPointId=" << mountingPointId
|
||||
<< " newName=" << newName;
|
||||
|
||||
int childCount = item->childCount();
|
||||
@@ -624,17 +623,17 @@ void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QStrin
|
||||
NGLTreeItem *child = item->child(i);
|
||||
|
||||
if (!child->data().canConvert<StreamModelData>())
|
||||
ERROR_LOG(m_logger) << "Error convert item";
|
||||
ERROR_LOG() << "Error convert item";
|
||||
|
||||
StreamModelData usedStream = child->data().value<StreamModelData>();
|
||||
INFO_LOG(m_logger) << "i=" << i
|
||||
INFO_LOG() << "i=" << i
|
||||
<< " usedStream.mountingPointId=" << usedStream.mountingPointId
|
||||
<< " usedStream.name=" << usedStream.name
|
||||
<< " mountingPointId=" << mountingPointId
|
||||
<< " newName=" << newName;
|
||||
if (mountingPointId == usedStream.mountingPointId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Set new DisplayName id=" << usedStream.id
|
||||
INFO_LOG() << "Set new DisplayName id=" << usedStream.id
|
||||
<< " mountingPointId=" << usedStream.mountingPointId
|
||||
<< " name=" << usedStream.name
|
||||
<< " new Name =" << newName;
|
||||
|
||||
-1
@@ -70,7 +70,6 @@ private:
|
||||
int m_dummyId;
|
||||
MenuStruct m_menuStruct;
|
||||
StreamNameMapping *m_streamNameMapping;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+31
-32
@@ -50,15 +50,14 @@ private:
|
||||
TopicReplay::TopicReplay(DataInterface *dataIfc, bool isAudio)
|
||||
: m_isAudio(isAudio)
|
||||
, m_dataIfc(dataIfc)
|
||||
, m_logger(getLogger("TopicReplay"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()";
|
||||
DEBUG_LOG() << "TopicReplay::TopicReplay()";
|
||||
Q_ASSERT(dataIfc);
|
||||
}
|
||||
|
||||
TopicReplay::~TopicReplay()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::~TopicReplay()";
|
||||
DEBUG_LOG() << "TopicReplay::~TopicReplay()";
|
||||
|
||||
if (m_isPlaying)
|
||||
playbackStop();
|
||||
@@ -66,7 +65,7 @@ TopicReplay::~TopicReplay()
|
||||
|
||||
QWidget *TopicReplay::createWidget()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::createWidget()";
|
||||
DEBUG_LOG() << "TopicReplay::createWidget()";
|
||||
Q_ASSERT(!m_screenPlacementHelper);
|
||||
|
||||
if (m_isAudio)
|
||||
@@ -81,19 +80,19 @@ QWidget *TopicReplay::createWidget()
|
||||
void TopicReplay::slotSetScriptResponse(const AudioVideoManagement::AvaStreamInfo &streamInfo, AudioVideoManagement::AvaStreamState streamState)
|
||||
{
|
||||
if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
|
||||
ERROR_LOG(m_logger) << "Script could not be set";
|
||||
ERROR_LOG() << "Script could not be set";
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Script set!";
|
||||
ERROR_LOG() << "Script set!";
|
||||
|
||||
ERROR_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
|
||||
ERROR_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
|
||||
ERROR_LOG() << "streamInfo: start" << streamInfo.duration.count();
|
||||
ERROR_LOG() << "streamState: " << static_cast<int>(streamState);
|
||||
}
|
||||
|
||||
|
||||
bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::playbackInit()";
|
||||
DEBUG_LOG(m_logger) << QJsonDocument(attributes).toJson();
|
||||
DEBUG_LOG() << "TopicReplay::playbackInit()";
|
||||
DEBUG_LOG() << QJsonDocument(attributes).toJson();
|
||||
|
||||
if (m_screenPlacementHelper && !m_isAudio)
|
||||
m_screenPlacementHelper->show();
|
||||
@@ -104,7 +103,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
AvaControl *ctrl = getAvaControl();
|
||||
if (ctrl == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "no ava control!";
|
||||
ERROR_LOG() << "no ava control!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -112,7 +111,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
|
||||
if (!topicData.isValid)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "topicData is invalid";
|
||||
ERROR_LOG() << "topicData is invalid";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -123,7 +122,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
|
||||
if (app == nullptr || app->inUse())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "app invalid or in use!";
|
||||
ERROR_LOG() << "app invalid or in use!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -143,7 +142,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
|
||||
if (!m_appHandle)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "appHandle: missing app after creating appHandle!";
|
||||
ERROR_LOG() << "appHandle: missing app after creating appHandle!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -151,7 +150,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
NGL::Settings s({});
|
||||
bool isLocal = s.isDatabaseConnectionLocal();
|
||||
|
||||
DEBUG_LOG(m_logger) << "isLocal? " << isLocal;
|
||||
DEBUG_LOG() << "isLocal? " << isLocal;
|
||||
|
||||
AvaScriptSource source;
|
||||
if (isLocal)
|
||||
@@ -169,7 +168,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
source = AvaScriptSource::ServerVideo;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "source: " << static_cast<int>(source);
|
||||
DEBUG_LOG() << "source: " << static_cast<int>(source);
|
||||
|
||||
ctrl->setScript(m_appHandle.dialogId(), m_scriptName,
|
||||
source, topicData.streamList(),
|
||||
@@ -181,7 +180,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
|
||||
|
||||
bool TopicReplay::playbackStart(int secondsOffset)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::playbackStart()";
|
||||
DEBUG_LOG() << "TopicReplay::playbackStart()";
|
||||
|
||||
if (m_screenPlacementHelper && !m_isAudio)
|
||||
m_screenPlacementHelper->show();
|
||||
@@ -189,7 +188,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
|
||||
AvaControl *ctrl = getAvaControl();
|
||||
if (ctrl == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ctrl == nullptr";
|
||||
ERROR_LOG() << "ctrl == nullptr";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -197,7 +196,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
|
||||
|
||||
if (!m_appHandle)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "appHandle: missing app!";
|
||||
ERROR_LOG() << "appHandle: missing app!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -205,13 +204,13 @@ bool TopicReplay::playbackStart(int secondsOffset)
|
||||
ctrl->startScript(m_appHandle.dialogId(), m_scriptName);
|
||||
|
||||
m_isPlaying = true;
|
||||
DEBUG_LOG(m_logger) << "m_isPlaying = true";
|
||||
DEBUG_LOG() << "m_isPlaying = true";
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TopicReplay::playbackPause()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::playbackPause()";
|
||||
DEBUG_LOG() << "TopicReplay::playbackPause()";
|
||||
|
||||
if (m_screenPlacementHelper)
|
||||
m_screenPlacementHelper->hide();
|
||||
@@ -222,13 +221,13 @@ bool TopicReplay::playbackPause()
|
||||
AvaControl *ctrl = getAvaControl();
|
||||
if (ctrl == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "no ctrl!";
|
||||
ERROR_LOG() << "no ctrl!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_appHandle)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "appHandle: missing app!";
|
||||
ERROR_LOG() << "appHandle: missing app!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -238,7 +237,7 @@ bool TopicReplay::playbackPause()
|
||||
|
||||
bool TopicReplay::playbackStop()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TopicReplay::playbackStop()";
|
||||
DEBUG_LOG() << "TopicReplay::playbackStop()";
|
||||
|
||||
if (m_screenPlacementHelper)
|
||||
m_screenPlacementHelper->hide();
|
||||
@@ -249,13 +248,13 @@ bool TopicReplay::playbackStop()
|
||||
AvaControl *ctrl = getAvaControl();
|
||||
if (ctrl == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "no ctrl!";
|
||||
ERROR_LOG() << "no ctrl!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_appHandle)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "appHandle: missing app!";
|
||||
ERROR_LOG() << "appHandle: missing app!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -275,7 +274,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
|
||||
VdControl *ctrl = getVdControl();
|
||||
if (ctrl == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ctrl missing!";
|
||||
ERROR_LOG() << "ctrl missing!";
|
||||
exportNotifier->setExportFailed();
|
||||
return false;
|
||||
}
|
||||
@@ -287,7 +286,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
|
||||
|
||||
if (!topicData.isValid)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "topicData is invalid";
|
||||
ERROR_LOG() << "topicData is invalid";
|
||||
exportNotifier->setExportFailed();
|
||||
return false;
|
||||
}
|
||||
@@ -305,7 +304,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
|
||||
|
||||
void TopicReplay::onWidgetPlaced(const QRect &geometry)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
|
||||
WARNING_LOG() << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
|
||||
<< " m_isAudio=" << m_isAudio;
|
||||
|
||||
m_dialogGeometry = geometry;
|
||||
@@ -316,17 +315,17 @@ void TopicReplay::onWidgetPlaced(const QRect &geometry)
|
||||
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
|
||||
if (app == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "app missing!";
|
||||
ERROR_LOG() << "app missing!";
|
||||
return;
|
||||
}
|
||||
|
||||
if (!app->inUse())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "app not in use - waiting for playbackInit to aquire it";
|
||||
ERROR_LOG() << "app not in use - waiting for playbackInit to aquire it";
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "setGeometry";
|
||||
DEBUG_LOG() << "setGeometry";
|
||||
app->setGeometry(*m_dialogGeometry);
|
||||
}
|
||||
|
||||
|
||||
+5
-6
@@ -25,7 +25,6 @@ CombatNetRadioDialog::CombatNetRadioDialog(LtsSession::LtsSession *session, cons
|
||||
, m_ui(new Ui::CombatNetRadioDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("CombatNetRadioDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setUnchangeable(true);
|
||||
@@ -60,7 +59,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
|
||||
avmFtc->enableModifyCnrConfig() &&
|
||||
avmFtc->enableRemoveCnrConfig()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable topics";
|
||||
ERROR_LOG() << "Could not enable topics";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -79,7 +78,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
|
||||
{
|
||||
m_filter.reset();
|
||||
m_model.reset();
|
||||
ERROR_LOG(m_logger) << "Could not init model";
|
||||
ERROR_LOG() << "Could not init model";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -192,14 +191,14 @@ void CombatNetRadioDialog::onExportButtonClicked()
|
||||
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void CombatNetRadioDialog::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
|
||||
DEBUG_LOG() << " onImportButtonClicked() ";
|
||||
|
||||
QByteArray content;
|
||||
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMCombatNetRadio));
|
||||
|
||||
-3
@@ -94,8 +94,5 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
ExerciseManagement::Interface::Dtc *m_exmDtc{nullptr};
|
||||
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+4
-5
@@ -26,7 +26,6 @@ CombatNetRadioDialogModel::CombatNetRadioDialogModel(int32_t exerciseId, QObject
|
||||
tr("Global")
|
||||
}, parent)
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_logger(getLogger("CombatNetRadioDialogModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -41,7 +40,7 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
|
||||
switch (index.column())
|
||||
{
|
||||
case CHANNEL:
|
||||
INFO_LOG(m_logger)<<"CombatNetRadioDialogModel::data role =" << role
|
||||
INFO_LOG()<<"CombatNetRadioDialogModel::data role =" << role
|
||||
<< " row = " << index.row();
|
||||
return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
|
||||
case RADIO_CIRCUIT:
|
||||
@@ -62,14 +61,14 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
|
||||
if (unit.id() != unitId)
|
||||
return {};
|
||||
|
||||
INFO_LOG(m_logger) << " config.unitId()=" << unitId
|
||||
INFO_LOG() << " config.unitId()=" << unitId
|
||||
<< " Str=" << unit.name();
|
||||
|
||||
QString unitStr;
|
||||
if (unit.designator().size() > 0)
|
||||
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
|
||||
unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
|
||||
INFO_LOG(m_logger) << "unitStr = " << unitStr;
|
||||
INFO_LOG() << "unitStr = " << unitStr;
|
||||
|
||||
return unitStr;
|
||||
}
|
||||
@@ -99,7 +98,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr<Interface::Dtc> &avmD
|
||||
|
||||
if (!ppmDtc->visibleParties(m_parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
|
||||
ERROR_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
m_units = ppmDtc->units();
|
||||
|
||||
-2
@@ -46,8 +46,6 @@ private:
|
||||
QMap<int32_t, CnrChannel> m_cnrChannels;
|
||||
QMap<int32_t, ParticipantManagement::Party> m_parties;
|
||||
QMap<int32_t, ParticipantManagement::Participant> m_units;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+8
-9
@@ -92,7 +92,6 @@ EditCombatNetRadioDialog::EditCombatNetRadioDialog(const boost::optional<int32_t
|
||||
, m_avmFtc(avmFtc)
|
||||
, m_exmDtc(exmDtc)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("EditCombatNetRadioDialog"))
|
||||
{
|
||||
Q_ASSERT(ppmDtc);
|
||||
Q_ASSERT(avmDtc);
|
||||
@@ -174,7 +173,7 @@ bool EditCombatNetRadioDialog::apply()
|
||||
if (m_ui->cbUnit->currentIndex() > 0)
|
||||
{
|
||||
request.unitId().set(m_ui->cbUnit->currentData().toInt());
|
||||
INFO_LOG(m_logger)<< "currentIndex="<<m_ui->cbUnit->currentIndex()
|
||||
INFO_LOG()<< "currentIndex="<<m_ui->cbUnit->currentIndex()
|
||||
<< " unitId ="<<request.unitId().get();
|
||||
}
|
||||
|
||||
@@ -190,7 +189,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession *session)
|
||||
|
||||
QMap<qint32, ParticipantManagement::Party> parties;
|
||||
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
|
||||
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
|
||||
ERROR_LOG() << "Could not retrieve visible Parties!";
|
||||
|
||||
for (const ParticipantManagement::Party &party : std::as_const(parties))
|
||||
m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());
|
||||
@@ -490,10 +489,10 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
|
||||
if (unit.designator().size() > 0)
|
||||
{
|
||||
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
|
||||
INFO_LOG(m_logger)<<"Designator != leer: unitStr = " << unitStr;
|
||||
INFO_LOG()<<"Designator != leer: unitStr = " << unitStr;
|
||||
}
|
||||
unitStr += QString::fromStdString(unit.tacticalIdentifier());
|
||||
INFO_LOG(m_logger) << "unitStr =" << unitStr
|
||||
INFO_LOG() << "unitStr =" << unitStr
|
||||
<< " id =" << unit.id();
|
||||
|
||||
m_ui->cbUnit->addItem(unitStr, unit.id());
|
||||
@@ -562,14 +561,14 @@ void EditCombatNetRadioDialog::onExportButtonClicked()
|
||||
QByteArray byteArray = cnrConfigRequestToJson();
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_exerciseId, byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void EditCombatNetRadioDialog::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
|
||||
DEBUG_LOG() << " onImportButtonClicked() ";
|
||||
|
||||
QByteArray content;
|
||||
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_exerciseId, FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio));
|
||||
@@ -589,7 +588,7 @@ void EditCombatNetRadioDialog::onImportButtonClicked()
|
||||
{
|
||||
ModifyCnrConfigRequest req = jsonToModifyCnrConfig(content);
|
||||
setUiValues(toConfig(req));
|
||||
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
|
||||
INFO_LOG() << "--- onImportButtonClicked() ";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -117,7 +117,5 @@ private:
|
||||
QVector<QString> m_takenNames;
|
||||
std::unique_ptr<LtsUtils::RequestHelper> m_requestHelper;
|
||||
bool m_isGlobal;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -15,7 +15,6 @@ LoadCombatNetRadioDialog::LoadCombatNetRadioDialog(const QByteArray &data,
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
|
||||
, m_ui(new Ui::LoadCombatNetRadioDialog)
|
||||
, m_model(new LoadCombatNetRadioDialogModel(data, session))
|
||||
, m_logger(getLogger("LoadCombatNetRadioDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->dataView->setModel(m_model);
|
||||
|
||||
-2
@@ -60,7 +60,5 @@ private:
|
||||
std::unique_ptr<Ui::LoadCombatNetRadioDialog> m_ui;
|
||||
LoadCombatNetRadioDialogModel *m_model;
|
||||
bool m_isApplied = false;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+8
-9
@@ -34,9 +34,8 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
|
||||
tr("Conflict(s)")
|
||||
}, parent)
|
||||
, m_exerciseId(session == nullptr ? 0 : session->exerciseId())
|
||||
, m_logger(getLogger("LoadCombatNetRadioDialogModel"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId;
|
||||
DEBUG_LOG() << "Own exercise id: " << m_exerciseId;
|
||||
|
||||
if (session != nullptr)
|
||||
{
|
||||
@@ -45,28 +44,28 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
|
||||
if (!session->getDtc<AudioVideoManagement::DataInterface>(avmDtc)
|
||||
|| !avmDtc->enableCnrChannel()
|
||||
|| !avmDtc->enableCnrConfig())
|
||||
ERROR_LOG(m_logger) << "Could not get AVM data";
|
||||
ERROR_LOG() << "Could not get AVM data";
|
||||
else
|
||||
{
|
||||
m_cnrChannels = avmDtc->cnrChannels();
|
||||
m_cnrConfigs = avmDtc->cnrConfigs();
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "cnrconfigs: " << m_cnrConfigs.size();
|
||||
DEBUG_LOG(m_logger) << "ownExerciseId: " << m_exerciseId;
|
||||
DEBUG_LOG() << "cnrconfigs: " << m_cnrConfigs.size();
|
||||
DEBUG_LOG() << "ownExerciseId: " << m_exerciseId;
|
||||
|
||||
std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
|
||||
|
||||
if (!session->getDtc<ExerciseManagement::DataInterface>(exmDtc)
|
||||
|| !exmDtc->enableExercise())
|
||||
ERROR_LOG(m_logger) << "Could not get EXM data";
|
||||
ERROR_LOG() << "Could not get EXM data";
|
||||
else
|
||||
m_exercises = exmDtc->exercises();
|
||||
|
||||
DEBUG_LOG(m_logger) << "exercises: " << m_exercises.size();
|
||||
DEBUG_LOG() << "exercises: " << m_exercises.size();
|
||||
}
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Got invalid session.";
|
||||
ERROR_LOG() << "Got invalid session.";
|
||||
|
||||
m_vecData = jsonToCnrConfigVector(data);
|
||||
|
||||
@@ -378,7 +377,7 @@ QVector<Core::RemoveElementRequest> LoadCombatNetRadioDialogModel::removeRequest
|
||||
{
|
||||
if (!m_conflictedCnrIds.contains(idxCounter))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Tried to get remove request for row " << idxCounter << " but it is not present.";
|
||||
WARNING_LOG() << "Tried to get remove request for row " << idxCounter << " but it is not present.";
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -107,7 +107,5 @@ private:
|
||||
QVector<Qt::CheckState> m_includeStates;
|
||||
QVector<int32_t> m_disabledRows;
|
||||
QVector<Conflicts> m_conflicts;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+7
-8
@@ -67,7 +67,6 @@ EditFrequencyPlanningDialog::EditFrequencyPlanningDialog(LtsSession::LtsSession
|
||||
, m_exerciseId(session->exerciseId())
|
||||
, m_isEdit(EditFrequencyPlanningSetResourceDialog::DialogMode::Assign)
|
||||
, m_activeFrequencyPlanningStatus(0)
|
||||
, m_logger(getLogger("EditFrequencyPlanningDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -139,7 +138,7 @@ void EditFrequencyPlanningDialog::retranslate()
|
||||
void EditFrequencyPlanningDialog::onRemoveFrequencyPlanningReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG(m_logger) << reply.str();
|
||||
ERROR_LOG() << reply.str();
|
||||
m_requestHelper->requestReply(reply);
|
||||
}
|
||||
|
||||
@@ -186,7 +185,7 @@ void EditFrequencyPlanningDialog::onAddClicked()
|
||||
if (cnrConfigId <= 0)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...."
|
||||
DEBUG_LOG() << "---RessourceDialog aufrufen...."
|
||||
<< " cnrConfigId: " << cnrConfigId
|
||||
<< " radioCircuit: " << cnrConfigRow.radioCircuit()
|
||||
<< " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId();
|
||||
@@ -271,7 +270,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
|
||||
m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Assign"));
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...."
|
||||
DEBUG_LOG() << "---enableAssignUnassignButtons()...."
|
||||
<< " cnrConfigId: " << cnrConfigId
|
||||
<< " radioCircuitId: " << cnrConfigRow.radioCircuit();
|
||||
|
||||
@@ -283,7 +282,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
|
||||
|
||||
void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData &fpd)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...."
|
||||
DEBUG_LOG() << "---onAssignRadioCircuit()...."
|
||||
<< "CnrConfigId: " << fpd.cnrConfigId();
|
||||
|
||||
m_frequencyDataModel->setFrequencyPlanningData(fpd);
|
||||
@@ -371,14 +370,14 @@ void EditFrequencyPlanningDialog::onExportButtonClicked()
|
||||
QByteArray byteArray = m_frequencyDataModel->uiToJson();
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void EditFrequencyPlanningDialog::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "--- onImportButtonClicked() ";
|
||||
DEBUG_LOG() << "--- onImportButtonClicked() ";
|
||||
|
||||
QByteArray content;
|
||||
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMEditFrequencyPlanning));
|
||||
|
||||
+7
-8
@@ -150,11 +150,10 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
|
||||
, m_ismDtc(ismDtc)
|
||||
, m_ppmDtc(ppmDtc)
|
||||
, m_initPlan(initPlanning)
|
||||
, m_logger(getLogger("EditFrequencyPlanningDataModel"))
|
||||
{
|
||||
Q_ASSERT(avmDtc);
|
||||
Q_ASSERT(ppmDtc);
|
||||
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
|
||||
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
|
||||
|
||||
int frequencySetId = initPlanning.frequencySetId();
|
||||
std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
|
||||
@@ -385,14 +384,14 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex &index,
|
||||
return QStringLiteral("-");
|
||||
const auto unit = m_units[unitId];
|
||||
|
||||
INFO_LOG(m_logger) << " config.unitId()=" << unitId
|
||||
INFO_LOG() << " config.unitId()=" << unitId
|
||||
<< " Str=" << unit.name();
|
||||
|
||||
QString unitStr;
|
||||
if (unit.designator().size() > 0)
|
||||
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
|
||||
unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
|
||||
INFO_LOG(m_logger) << "unitStr = " << unitStr;
|
||||
INFO_LOG() << "unitStr = " << unitStr;
|
||||
|
||||
return unitStr;
|
||||
}
|
||||
@@ -607,7 +606,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id)
|
||||
m_initPlan.id(id);
|
||||
return;
|
||||
}
|
||||
WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set ("
|
||||
WARNING_LOG() << "Trying to set a new frequency planning id but there is alreay an id set ("
|
||||
<< m_initPlan.id() << " - " << id << ")";
|
||||
}
|
||||
|
||||
@@ -784,12 +783,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
|
||||
{
|
||||
if (inner != outer)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
|
||||
DEBUG_LOG() << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
|
||||
<< " (B): " << pI.cnrConfigId();
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
|
||||
DEBUG_LOG() << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
|
||||
<< " (B): " << pI.cnrConfigId();
|
||||
if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()) )
|
||||
m_multipleAssignedCnrIds.append(p.cnrConfigId());
|
||||
@@ -809,7 +808,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
|
||||
qs.append(QString::number(id));
|
||||
qs.append(QStringLiteral(", "));
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
|
||||
DEBUG_LOG() << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
|
||||
<< " cnrConfigIds: " << qs;
|
||||
#endif
|
||||
return bOk;
|
||||
|
||||
+1
-2
@@ -24,7 +24,6 @@ EditFrequencyPlanningResourceDataModel::EditFrequencyPlanningResourceDataModel(c
|
||||
}, parent)
|
||||
, m_assignedFrequencySetDataIds(assignedFrequencySetDataIds)
|
||||
, m_frequencyBand(frequencyBand)
|
||||
, m_logger(getLogger("EditFrequencyPlanningResourceDataModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -89,7 +88,7 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
|
||||
|
||||
if (m_assignedFrequencySetDataIds.contains(data.id()))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
|
||||
DEBUG_LOG() << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
|
||||
<< " frequencySetDataId: " << data.id() << " ist bereits enthalten";
|
||||
return true;
|
||||
}
|
||||
|
||||
-1
@@ -42,7 +42,6 @@ EditFrequencyPlanningResourceDialog::EditFrequencyPlanningResourceDialog(int fre
|
||||
, m_ui(new Ui::EditFrequencyPlanningResourceDialog)
|
||||
, m_frequencySetId(frequencySetId)
|
||||
, m_dialogMode(dialogMode)
|
||||
, m_logger(getLogger("EditFrequencyPlanningResourceDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-1
@@ -32,7 +32,6 @@ EditFrequencyPlanningSetResourceDialog::EditFrequencyPlanningSetResourceDialog(
|
||||
, m_avmDtc(avmDtc)
|
||||
, m_frequencyResourceDataModel(nullptr)
|
||||
, m_config(m_avmDtc->cnrConfig(cnrConfigId))
|
||||
, m_logger(getLogger("EditFrequencyPlanningSetResourceDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
+8
-9
@@ -38,11 +38,10 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession *session
|
||||
, m_ismDtc(nullptr)
|
||||
, m_flmGui(nullptr)
|
||||
, m_activeFrequencyPlanningStatus(0)
|
||||
, m_logger(getLogger("FrequencyPlanningDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialog() ";
|
||||
DEBUG_LOG() << "---FrequencyPlanningDialog() ";
|
||||
m_ui->dataView->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
m_ui->dataView->treeView()->setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
|
||||
@@ -92,7 +91,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
|
||||
avmDtc->enableActiveFrequencyPlanning() &&
|
||||
ismDtc->enableMainStructureElement()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable topics";
|
||||
ERROR_LOG() << "Could not enable topics";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -109,7 +108,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
|
||||
{
|
||||
delete m_model;
|
||||
m_model = nullptr;
|
||||
ERROR_LOG(m_logger) << "Could not init model";
|
||||
ERROR_LOG() << "Could not init model";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -301,7 +300,7 @@ void FrequencyPlanningDialog::onEditClicked()
|
||||
return;
|
||||
|
||||
const FrequencyPlanning &fp = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>();
|
||||
DEBUG_LOG(m_logger) << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
|
||||
DEBUG_LOG() << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
|
||||
|
||||
m_copy = false;
|
||||
showEditDialog(m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>());
|
||||
@@ -441,14 +440,14 @@ void FrequencyPlanningDialog::onExportButtonClicked()
|
||||
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void FrequencyPlanningDialog::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
|
||||
DEBUG_LOG() << " onImportButtonClicked() ";
|
||||
if (m_model->rowCount() > 0)
|
||||
{
|
||||
QHash<LtsWidgets::Button, QString> texts({{LtsWidgets::Button::Yes, tr("Ok")}});
|
||||
@@ -485,7 +484,7 @@ void FrequencyPlanningDialog::onImportButtonClicked()
|
||||
return m_avmFtc->modifyFrequencyPlanningRequest(request, this);
|
||||
});
|
||||
}
|
||||
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
|
||||
INFO_LOG() << "--- onImportButtonClicked() ";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -124,7 +124,5 @@ private:
|
||||
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
|
||||
QMap<int, EditFrequencyPlanningDialog*> m_editDlgMap;
|
||||
int m_activeFrequencyPlanningStatus;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+3
-4
@@ -21,9 +21,8 @@ FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, Q
|
||||
tr("Active")
|
||||
}, parent)
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_logger(getLogger("FrequencyPlanningDialogModel"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() ";
|
||||
DEBUG_LOG() << "---FrequencyPlanningDialogModel() ";
|
||||
}
|
||||
|
||||
QVariant FrequencyPlanningDialogModel::data(const QModelIndex &index, int role) const
|
||||
@@ -83,7 +82,7 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex
|
||||
|
||||
void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onFrequencyPlanningChanged "
|
||||
INFO_LOG() << "onFrequencyPlanningChanged "
|
||||
<< " data.exerciseId()" << data.exerciseId()
|
||||
<< " m_exerciseId=" << m_exerciseId;
|
||||
if ((data.exerciseId().is_set() && data.exerciseId().get() != m_exerciseId)
|
||||
@@ -101,7 +100,7 @@ QByteArray FrequencyPlanningDialogModel::modelToJson()
|
||||
|
||||
for (int row = 0; row < rowCount(); row++)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "row =" << ": " << row;
|
||||
DEBUG_LOG() << "row =" << ": " << row;
|
||||
QJsonObject inner;
|
||||
const FrequencyPlanning &planning = m_vecData.at(row);
|
||||
|
||||
|
||||
-1
@@ -53,7 +53,6 @@ private:
|
||||
QMap<int32_t, FrequencySet> m_frequencySets;
|
||||
|
||||
friend class FrequencyPlanningDialogProxyModel;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class FrequencyPlanningDialogProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
|
||||
|
||||
-1
@@ -22,7 +22,6 @@ FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface
|
||||
, m_ui(new Ui::FrequencyPlanningWidget)
|
||||
, m_assignedFrequencySetDataIds(allocatedDataSets)
|
||||
, m_avmDtc(avmDtc)
|
||||
, m_logger(getLogger("EditFrequencyPlanningResourceDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
+1
-2
@@ -15,9 +15,8 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession
|
||||
, m_ui(new Ui::InitFrequencyPlanningDialog)
|
||||
, m_dateOfCreation(session->partitionTime())
|
||||
, m_session(session)
|
||||
, m_logger(getLogger("InitFrequencyPlanningDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() ";
|
||||
DEBUG_LOG() << "---InitFrequencyPlanningDialog() ";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
QMap<int32_t, FrequencySet> frequencySets = avmDtc->frequencySets();
|
||||
|
||||
-2
@@ -40,7 +40,5 @@ private:
|
||||
Ui::InitFrequencyPlanningDialog *m_ui;
|
||||
qint64 m_dateOfCreation;
|
||||
LtsSession::LtsSession *m_session;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
-1
@@ -13,7 +13,6 @@ LoadFrequencyPlanningDialog::LoadFrequencyPlanningDialog(const QByteArray &data,
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
|
||||
, m_ui(new Ui::LoadFrequencyPlanningDialog)
|
||||
, m_model(new LoadFrequencyPlanningDialogModel(initPlan, avmDtc, ismDtc, this))
|
||||
, m_logger(getLogger("LoadFrequencyPlanningDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-2
@@ -62,7 +62,5 @@ private:
|
||||
std::unique_ptr<Ui::LoadFrequencyPlanningDialog> m_ui;
|
||||
LoadFrequencyPlanningDialogModel *m_model;
|
||||
bool m_isApplied = false;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+4
-5
@@ -140,10 +140,9 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(const Frequen
|
||||
, m_initPlan(initPlan)
|
||||
, m_parentPlan(initPlan)
|
||||
, m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0)
|
||||
, m_logger(getLogger("EditFrequencyPlanningDataModel"))
|
||||
{
|
||||
Q_ASSERT(avmDtc);
|
||||
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
|
||||
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
|
||||
|
||||
m_initPlan.data().clear();
|
||||
|
||||
@@ -168,7 +167,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
|
||||
|
||||
if (m_initPlan.frequencySetId() != obj.value<int>("frequencySetId"))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "false frequency set!";
|
||||
ERROR_LOG() << "false frequency set!";
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -620,7 +619,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
|
||||
|
||||
if (!item || !item->data().canConvert<ItemData>())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
|
||||
DEBUG_LOG() << "Could not get item for row " << row;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -874,7 +873,7 @@ QVector<FrequencyPlanningData> LoadFrequencyPlanningDialogModel::planningData()
|
||||
|
||||
if (!item || !item->data().canConvert<ItemData>())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
|
||||
DEBUG_LOG() << "Could not get item for row " << row;
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
+4
-5
@@ -32,7 +32,6 @@ ElokaDialog::ElokaDialog(LtsSession::LtsSession *session, AvaSession *avaSession
|
||||
, m_usedCnr()
|
||||
, m_usedTvc()
|
||||
, m_usedAnnouncement()
|
||||
, m_logger(getLogger("ElokaDialog"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
Q_ASSERT(avaSession);
|
||||
@@ -110,7 +109,7 @@ void ElokaDialog::setAvaSessionStatus(bool established)
|
||||
|
||||
void ElokaDialog::onAddClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onAddClicked() ";
|
||||
DEBUG_LOG() << "**** onAddClicked() ";
|
||||
|
||||
ElokaEditDialog *dialog = new ElokaEditDialog(m_session, m_avaSession, m_avmDtc, m_streamNameMapping,
|
||||
ElokaData(), this);
|
||||
@@ -129,7 +128,7 @@ void ElokaDialog::onAddClicked()
|
||||
|
||||
void ElokaDialog::onEditClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onEditClicked() ";
|
||||
DEBUG_LOG() << "**** onEditClicked() ";
|
||||
|
||||
const QModelIndex idx = m_ui->tvEloka->currentIndex();
|
||||
|
||||
@@ -155,7 +154,7 @@ void ElokaDialog::onEditClicked()
|
||||
|
||||
void ElokaDialog::onRemoveClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onRemoveClicked() ";
|
||||
DEBUG_LOG() << "**** onRemoveClicked() ";
|
||||
|
||||
const QModelIndex idx = m_ui->tvEloka->currentIndex();
|
||||
|
||||
@@ -185,7 +184,7 @@ void ElokaDialog::onPrint()
|
||||
|
||||
void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka> &&eloka)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onQueryElokaResponse";
|
||||
DEBUG_LOG() << "onQueryElokaResponse";
|
||||
|
||||
m_elokaListCollector.start();
|
||||
m_elokaModel->clear();
|
||||
|
||||
+5
-6
@@ -110,7 +110,6 @@ ElokaEditDialog::ElokaEditDialog(LtsSession::LtsSession *session, AvaSession *av
|
||||
, m_tvcConfigMap()
|
||||
, m_announcementMap()
|
||||
, m_userProfile()
|
||||
, m_logger(getLogger("ElokaEditDialog"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
Q_ASSERT(avaSession);
|
||||
@@ -352,7 +351,7 @@ void ElokaEditDialog::getActiveCnrs()
|
||||
void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCnrConfigChanged";
|
||||
DEBUG_LOG() << "onCnrConfigChanged";
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -375,7 +374,7 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
|
||||
void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onTvcConfigChanged";
|
||||
DEBUG_LOG() << "onTvcConfigChanged";
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
@@ -399,7 +398,7 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
|
||||
void ElokaEditDialog::onStreamChanged(const Stream &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStreamChanged";
|
||||
DEBUG_LOG() << "onStreamChanged";
|
||||
|
||||
if ((data.type() != StreamType_def::AudioOut) &&
|
||||
(data.type() != StreamType_def::AudioInOut))
|
||||
@@ -428,7 +427,7 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile &data,
|
||||
DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged";
|
||||
DEBUG_LOG() << "onCnrTvcProfileChanged";
|
||||
|
||||
if (data.exerciseId() != m_session->exerciseId() ||
|
||||
data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
|
||||
@@ -536,7 +535,7 @@ void ElokaEditDialog::setCurrentCircuit(const ElokaData &data)
|
||||
|
||||
void ElokaEditDialog::onGetElokaListResponse(const QVector<QString> &actions)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGetElokaListResponse";
|
||||
DEBUG_LOG() << "onGetElokaListResponse";
|
||||
if (!m_elokaData.internalName.isEmpty())
|
||||
setUnchangeable(true);
|
||||
|
||||
|
||||
-1
@@ -20,7 +20,6 @@ ElokaModel::ElokaModel(LtsSession::LtsSession *session, QObject *parent)
|
||||
tr("Start Time")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("ElokaModel"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
|
||||
|
||||
+5
-6
@@ -24,7 +24,6 @@ MvsDialog::MvsDialog(const QString &menuGroup, LtsSession::LtsSession *session,
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_avmDtc(nullptr)
|
||||
, m_avmFtc(nullptr)
|
||||
, m_logger(getLogger("MvsDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-Configuration_Video_Teams"));
|
||||
@@ -59,7 +58,7 @@ bool MvsDialog::init(const std::shared_ptr<AudioVideoManagement::Interface::Dtc>
|
||||
{
|
||||
delete m_model;
|
||||
m_model = nullptr;
|
||||
ERROR_LOG(m_logger) << "Could not init model";
|
||||
ERROR_LOG() << "Could not init model";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -179,14 +178,14 @@ void MvsDialog::onExportButtonClicked()
|
||||
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void MvsDialog::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
|
||||
DEBUG_LOG() << " onImportButtonClicked() ";
|
||||
|
||||
QByteArray content;
|
||||
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMvsDialog));
|
||||
@@ -212,7 +211,7 @@ void MvsDialog::onImportButtonClicked()
|
||||
return m_avmFtc->videoTeamModifyRequest(request, this);
|
||||
});
|
||||
}
|
||||
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
|
||||
INFO_LOG() << "--- onImportButtonClicked() ";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loaded 100 of 2785 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user