Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -134,7 +134,7 @@ TimelineDataProvider::TimelineDataProvider(int requestId, const QUrl &url,
|
||||
|
||||
realUrl.setQuery(query);
|
||||
m_webSocketEem->open(realUrl);
|
||||
DEBUG_LOG() << "requesting data from EEM: " << realUrl.toString();
|
||||
DEBUG_LOG(m_logger) << "requesting data from EEM: " << realUrl.toString();
|
||||
}
|
||||
|
||||
TimelineDataProvider::~TimelineDataProvider()
|
||||
@@ -157,13 +157,13 @@ void TimelineDataProvider::textMessageFromEem(const QString &message)
|
||||
{
|
||||
if (message.isEmpty() || message == QStringLiteral("{}"))
|
||||
{
|
||||
DEBUG_LOG() << "textMessageFromEem - finished";
|
||||
DEBUG_LOG(m_logger) << "textMessageFromEem - finished";
|
||||
disconnectedFromEem();
|
||||
return;
|
||||
}
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(message.toUtf8()));
|
||||
const QJsonArray arr = doc.array();
|
||||
DEBUG_LOG() << "textMessageFromEem - #events: " << arr.size();
|
||||
DEBUG_LOG(m_logger) << "textMessageFromEem - #events: " << arr.size();
|
||||
m_eventData.reserve(m_eventData.size() + arr.size());
|
||||
using namespace ExerciseEventManagement::Database;
|
||||
std::transform(arr.begin(), arr.end(),
|
||||
@@ -175,7 +175,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
|
||||
{
|
||||
if (!m_webSocketEem)
|
||||
{
|
||||
WARNING_LOG() << "No connection to EEM - can not request data!";
|
||||
WARNING_LOG(m_logger) << "No connection to EEM - can not request data!";
|
||||
return nullptr;
|
||||
}
|
||||
static int s_requestId = 0;
|
||||
@@ -185,7 +185,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
|
||||
connect(tldp, &TimelineDataProvider::finished, this, &ForeignInterfaceImpl::requestFinished);
|
||||
connect(tldp, &TimelineDataProvider::destroyed, this, [this, curRequestId]() { m_pendingRequests.remove(curRequestId);});
|
||||
m_pendingRequests[curRequestId] = tldp;
|
||||
DEBUG_LOG() << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
|
||||
DEBUG_LOG(m_logger) << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
|
||||
return tldp;
|
||||
}
|
||||
|
||||
@@ -208,26 +208,26 @@ void ForeignInterfaceImpl::connectToScm()
|
||||
const QUrl scmUrl(QStringLiteral("ws://%1:%2")
|
||||
.arg(NGL::Connections::hostName(NGL::Connections::eConnection::SCM_WEBSOCKET))
|
||||
.arg(NGL::Connections::port(NGL::Connections::eConnection::SCM_WEBSOCKET)));
|
||||
DEBUG_LOG() << "Trying to connect to SCM at " << scmUrl.toString();
|
||||
DEBUG_LOG(m_logger) << "Trying to connect to SCM at " << scmUrl.toString();
|
||||
m_webSocketScm->open(scmUrl);
|
||||
}
|
||||
|
||||
void ForeignInterfaceImpl::connectedToScm()
|
||||
{
|
||||
DEBUG_LOG() << "Connected to SCM...";
|
||||
DEBUG_LOG(m_logger) << "Connected to SCM...";
|
||||
m_webSocketScm->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
|
||||
}
|
||||
|
||||
void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
|
||||
{
|
||||
DEBUG_LOG() << "textMessageFromScm from scm: " << message;
|
||||
DEBUG_LOG(m_logger) << "textMessageFromScm from scm: " << message;
|
||||
const QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
|
||||
const QJsonArray exercises = doc.object().value(QStringLiteral("data")).toArray();
|
||||
for (const QJsonValue &valEx : exercises)
|
||||
{
|
||||
const QJsonObject &exercise = valEx.toObject();
|
||||
const int exerciseId = exercise.value(QStringLiteral("exerciseId")).toInt();
|
||||
DEBUG_LOG() << "textMessageFromScm from scm - exerciseId " << exerciseId;
|
||||
DEBUG_LOG(m_logger) << "textMessageFromScm from scm - exerciseId " << exerciseId;
|
||||
|
||||
if (exerciseId != m_session->exerciseId())
|
||||
continue;
|
||||
@@ -237,7 +237,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
|
||||
{
|
||||
const QJsonObject &service = valSvc.toObject();
|
||||
const QString svcName = service.value(QStringLiteral("nameAbbrevation")).toString().toUpper();
|
||||
DEBUG_LOG() << "textMessageFromScm from scm - svcName " << svcName;
|
||||
DEBUG_LOG(m_logger) << "textMessageFromScm from scm - svcName " << svcName;
|
||||
|
||||
if (svcName != QStringLiteral("EEM"))
|
||||
continue;
|
||||
@@ -272,24 +272,24 @@ void ForeignInterfaceImpl::connectToEem()
|
||||
this, &ForeignInterfaceImpl::textMessageFromEem);
|
||||
QUrl url(eemUrl());
|
||||
url.setPath(QStringLiteral("/live"));
|
||||
DEBUG_LOG() << "Trying to connect to EEM at " << url.toString();
|
||||
DEBUG_LOG(m_logger) << "Trying to connect to EEM at " << url.toString();
|
||||
m_webSocketEem->open(url);
|
||||
}
|
||||
|
||||
void ForeignInterfaceImpl::connectedToEem()
|
||||
{
|
||||
DEBUG_LOG() << "Connected to EEM...";
|
||||
DEBUG_LOG(m_logger) << "Connected to EEM...";
|
||||
}
|
||||
|
||||
void ForeignInterfaceImpl::disconnectedFromEem()
|
||||
{
|
||||
WARNING_LOG() << "EEM connection closed - try to reconnect";
|
||||
WARNING_LOG(m_logger) << "EEM connection closed - try to reconnect";
|
||||
QTimer::singleShot(500, this, &ForeignInterfaceImpl::connectToScm);
|
||||
}
|
||||
|
||||
void ForeignInterfaceImpl::textMessageFromEem(const QString &message)
|
||||
{
|
||||
TRACE_LOG() << "textMessageFromEem: " << message;
|
||||
TRACE_LOG(m_logger) << "textMessageFromEem: " << message;
|
||||
|
||||
const QJsonObject obj(QJsonDocument::fromJson(message.toUtf8()).object());
|
||||
using namespace ExerciseEventManagement::Database;
|
||||
@@ -303,16 +303,16 @@ void ForeignInterfaceImpl::requestFinished()
|
||||
TimelineDataProvider *tldp = qobject_cast<TimelineDataProvider *>(sender());
|
||||
if (!tldp)
|
||||
{
|
||||
WARNING_LOG() << "requestFinished without valid sender";
|
||||
WARNING_LOG(m_logger) << "requestFinished without valid sender";
|
||||
return;
|
||||
}
|
||||
auto it = m_pendingRequests.find(tldp->requestId());
|
||||
if (it == m_pendingRequests.end())
|
||||
{
|
||||
WARNING_LOG() << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
|
||||
WARNING_LOG(m_logger) << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG() << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
|
||||
DEBUG_LOG(m_logger) << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
|
||||
emit requestedDataAvailable(it.value());
|
||||
it.value()->deleteLater();
|
||||
m_pendingRequests.erase(it);
|
||||
|
||||
@@ -44,6 +44,8 @@ public:
|
||||
std::shared_ptr<TimeLineManagement::ForeignDataInterface> getForeignDataInterface() override { return m_foreign; }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<TimeLineManagement::ForeignDataInterface> m_foreign;
|
||||
};
|
||||
|
||||
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
BiteMessageFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+2
@@ -24,6 +24,8 @@ public:
|
||||
bool check(const AbstractEventItem &item) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateFilterString() override;
|
||||
|
||||
private:
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *) override {}
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -34,6 +34,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
CameraVideoFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+6
-6
@@ -70,7 +70,7 @@ bool CameraVideoFilter::init(
|
||||
{
|
||||
if (!ismDtc)
|
||||
{
|
||||
ERROR_LOG() << "Unable to load MainStructureElement IDs from ISM-DTC";
|
||||
ERROR_LOG(m_logger) << "Unable to load MainStructureElement IDs from ISM-DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ bool CameraVideoFilter::init(
|
||||
{
|
||||
if (!m_avmDtc || !m_avmDataIfc || !m_avmDataIfc->hasAvsSession() || !m_avmDataIfc->menus())
|
||||
{
|
||||
ERROR_LOG() << "Unable to load Video Menus";
|
||||
ERROR_LOG(m_logger) << "Unable to load Video Menus";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ bool CameraVideoFilter::init(
|
||||
if (newActiveVideoMenu == m_activeVideoMenu)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "Changed active video menu from: " << m_activeVideoMenu << ", to: " << newActiveVideoMenu;
|
||||
DEBUG_LOG(m_logger) << "Changed active video menu from: " << m_activeVideoMenu << ", to: " << newActiveVideoMenu;
|
||||
|
||||
m_activeVideoMenu = newActiveVideoMenu;
|
||||
|
||||
@@ -375,7 +375,7 @@ QStringList CameraVideoFilter::getInternalStreamNamesBySelectedStreams() const
|
||||
|
||||
if (!m_avmDtc)
|
||||
{
|
||||
ERROR_LOG() << "Unable to get internal stream names (avm dtc missing)";
|
||||
ERROR_LOG(m_logger) << "Unable to get internal stream names (avm dtc missing)";
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -447,7 +447,7 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
INFO_LOG() << "Could not parse JSON props of building with ID "
|
||||
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
|
||||
<< data.id()
|
||||
<< ". Reason: "
|
||||
<< parseError.errorString()
|
||||
@@ -493,7 +493,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
|
||||
{
|
||||
if (!m_avmDtc)
|
||||
{
|
||||
ERROR_LOG() << "Unable to load Video Menus";
|
||||
ERROR_LOG(m_logger) << "Unable to load Video Menus";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -44,6 +44,8 @@ public:
|
||||
static const std::vector<int> s_excluded_mse_ids;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateMenuStreams();
|
||||
void updateFilterString() override;
|
||||
QStringList getInternalStreamNamesBySelectedStreams() const;
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ void CameraVideoItem::addItemInfoRows(QFormLayout *form)
|
||||
CameraVideoFilter *filter = static_cast<CameraVideoFilter *>(m_factory->filter());
|
||||
if (!filter)
|
||||
{
|
||||
ERROR_LOG() << "CameraVideoFilter unavailable";
|
||||
ERROR_LOG(m_logger) << "CameraVideoFilter unavailable";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -29,6 +29,8 @@ public:
|
||||
QString internalStreamName() const { return m_streamName; }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_mainStructureElementId;
|
||||
QString m_streamName;
|
||||
};
|
||||
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
CrossBorderlineFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
bool check(const AbstractEventItem &item) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateFilterString() override;
|
||||
|
||||
private:
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ void CrossBorderlineItem::addItemInfoRows(QFormLayout *form)
|
||||
CrossBorderlineFilter *filter = static_cast<CrossBorderlineFilter *>(m_factory->filter());
|
||||
if (!filter)
|
||||
{
|
||||
ERROR_LOG() << "CrossBorderlineFilter unavailable";
|
||||
ERROR_LOG(m_logger) << "CrossBorderlineFilter unavailable";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const LtsUtils::QPoint3D &position) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
QStringList attributeNames() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -22,6 +22,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -31,6 +31,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
FireEventFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ bool FireEventFilter::init(std::shared_ptr<ProjectDataManagement::Interface::Dtc
|
||||
{
|
||||
if (!pdmDtc)
|
||||
{
|
||||
ERROR_LOG() << "PDM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "PDM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -34,6 +34,8 @@ public:
|
||||
QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateFilterString() override;
|
||||
|
||||
private slots:
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ void FireEventItem::addItemInfoRows(QFormLayout *form)
|
||||
FireEventFilter *filter = static_cast<FireEventFilter *>(m_factory->filter());
|
||||
if (!filter)
|
||||
{
|
||||
ERROR_LOG() << "FireEventFilter unavailable";
|
||||
ERROR_LOG(m_logger) << "FireEventFilter unavailable";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -34,6 +34,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
HitFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -54,12 +54,12 @@ bool HitFilter::init(
|
||||
|
||||
if (!m_ppmDtc)
|
||||
{
|
||||
ERROR_LOG() << "PPM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "PPM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
if (!m_pdmDtc)
|
||||
{
|
||||
ERROR_LOG() << "PDM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "PDM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -45,6 +45,8 @@ public:
|
||||
QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name()); }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const;
|
||||
|
||||
void updateFilterString() override;
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ void HitItem::addItemInfoRows(QFormLayout *form)
|
||||
HitFilter *filter = static_cast<HitFilter *>(m_factory->filter());
|
||||
if (!filter)
|
||||
{
|
||||
ERROR_LOG() << "HitFilter unavailable";
|
||||
ERROR_LOG(m_logger) << "HitFilter unavailable";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -37,6 +37,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
HitBuildingFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+5
-5
@@ -63,19 +63,19 @@ bool HitBuildingFilter::init(
|
||||
|
||||
if (!m_ismDtc)
|
||||
{
|
||||
ERROR_LOG() << "ISM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "ISM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ppmDtc)
|
||||
{
|
||||
ERROR_LOG() << "PPM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "PPM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_pdmDtc)
|
||||
{
|
||||
ERROR_LOG() << "PDM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "PDM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ QString HitBuildingFilter::getChargeTypeShortName(int id)
|
||||
{
|
||||
if(!m_pdmDtc)
|
||||
{
|
||||
ERROR_LOG() << "Unable to load ChargeType IDs from PDM-DTC";
|
||||
ERROR_LOG(m_logger) << "Unable to load ChargeType IDs from PDM-DTC";
|
||||
return {};
|
||||
}
|
||||
return m_pdmDtc->trChargeTypeShortName(id);
|
||||
@@ -377,7 +377,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
INFO_LOG() << "Could not parse JSON props of building with ID "
|
||||
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
|
||||
<< data.id()
|
||||
<< ". Reason: "
|
||||
<< parseError.errorString()
|
||||
|
||||
+3
@@ -49,6 +49,9 @@ public:
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const;
|
||||
|
||||
void updateFilterString() override;
|
||||
|
||||
+1
-1
@@ -60,7 +60,7 @@ void HitBuildingItem::addItemInfoRows(QFormLayout *form)
|
||||
HitBuildingFilter *filter = static_cast<HitBuildingFilter *>(m_factory->filter());
|
||||
if (!filter)
|
||||
{
|
||||
ERROR_LOG() << "HitBuildingFilter unavailable";
|
||||
ERROR_LOG(m_logger) << "HitBuildingFilter unavailable";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_mainStructureElementId;
|
||||
};
|
||||
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -32,6 +32,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
HitEffectSimulationFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -45,7 +45,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
|
||||
|
||||
if (!m_pdmDtc)
|
||||
{
|
||||
ERROR_LOG() << "PDM-DTC is not running";
|
||||
ERROR_LOG(m_logger) << "PDM-DTC is not running";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ERROR_LOG() << "Unable to load AesTypes from AES";
|
||||
ERROR_LOG(m_logger) << "Unable to load AesTypes from AES";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -40,6 +40,8 @@ public:
|
||||
static const std::vector<int> s_originatorChargeTypesIds;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateFilterString() override;
|
||||
|
||||
private slots:
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ void HitEffectSimulationItem::addItemInfoRows(QFormLayout *form)
|
||||
HitEffectSimulationFilter *filter = static_cast<HitEffectSimulationFilter *>(m_factory->filter());
|
||||
if (!filter)
|
||||
{
|
||||
ERROR_LOG() << "HitEffectSimulationFilter unavailable";
|
||||
ERROR_LOG(m_logger) << "HitEffectSimulationFilter unavailable";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -21,6 +21,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
AbstractEventFilter *createFilter() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
ManipulationFilter *m_filter{nullptr};
|
||||
};
|
||||
|
||||
|
||||
+2
@@ -24,6 +24,8 @@ public:
|
||||
bool check(const AbstractEventItem &item) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateFilterString() override;
|
||||
|
||||
private:
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override {}
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Loaded 100 of 2102 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user