From 3c814a5e6105390bbbee8ae7df825af45fa53df1 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Tue, 29 Sep 2020 18:01:55 +0200 Subject: [PATCH] include fixes --- monitoring/AbsLimitMonitor.h | 2 +- monitoring/LimitMonitor.h | 13 ++++++------- monitoring/LimitViolationReporter.cpp | 6 +++--- monitoring/MonitorBase.h | 12 ++++++------ monitoring/MonitorReporter.h | 6 +++--- monitoring/MonitoringIF.h | 2 +- monitoring/MonitoringMessage.cpp | 2 +- monitoring/MonitoringMessageContent.h | 4 ++-- monitoring/TwoValueLimitMonitor.h | 2 +- 9 files changed, 24 insertions(+), 25 deletions(-) diff --git a/monitoring/AbsLimitMonitor.h b/monitoring/AbsLimitMonitor.h index c32c63ef0..2e60f6f8c 100644 --- a/monitoring/AbsLimitMonitor.h +++ b/monitoring/AbsLimitMonitor.h @@ -1,7 +1,7 @@ #ifndef FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_ #define FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_ -#include "../monitoring/MonitorBase.h" +#include "MonitorBase.h" #include template diff --git a/monitoring/LimitMonitor.h b/monitoring/LimitMonitor.h index 4aec86695..66e6725e8 100644 --- a/monitoring/LimitMonitor.h +++ b/monitoring/LimitMonitor.h @@ -1,7 +1,7 @@ #ifndef FRAMEWORK_MONITORING_LIMITMONITOR_H_ #define FRAMEWORK_MONITORING_LIMITMONITOR_H_ -#include "../monitoring/MonitorBase.h" +#include "MonitorBase.h" /** * Variant of a limit checking class. @@ -16,13 +16,12 @@ public: uint16_t confirmationLimit, T lowerLimit, T upperLimit, Event belowLowEvent = MonitoringIF::VALUE_BELOW_LOW_LIMIT, Event aboveHighEvent = MonitoringIF::VALUE_ABOVE_HIGH_LIMIT) : - MonitorBase(reporterId, monitorId, parameterId, confirmationLimit), - lowerLimit(lowerLimit), upperLimit(upperLimit), belowLowEvent(belowLowEvent), - aboveHighEvent(aboveHighEvent) { + MonitorBase(reporterId, monitorId, parameterId, confirmationLimit), lowerLimit( + lowerLimit), upperLimit(upperLimit), belowLowEvent( + belowLowEvent), aboveHighEvent(aboveHighEvent) { + } + virtual ~LimitMonitor() { } - - virtual ~LimitMonitor() {} - virtual ReturnValue_t checkSample(T sample, T* crossedLimit) { *crossedLimit = 0.0; if (sample > upperLimit) { diff --git a/monitoring/LimitViolationReporter.cpp b/monitoring/LimitViolationReporter.cpp index 87278f4e1..c531a6e69 100644 --- a/monitoring/LimitViolationReporter.cpp +++ b/monitoring/LimitViolationReporter.cpp @@ -4,9 +4,9 @@ * @date 17.07.2014 * @author baetz */ -#include "../monitoring/LimitViolationReporter.h" -#include "../monitoring/MonitoringIF.h" -#include "../monitoring/ReceivesMonitoringReportsIF.h" +#include "LimitViolationReporter.h" +#include "MonitoringIF.h" +#include "ReceivesMonitoringReportsIF.h" #include "../objectmanager/ObjectManagerIF.h" #include "../serialize/SerializeAdapter.h" diff --git a/monitoring/MonitorBase.h b/monitoring/MonitorBase.h index 5173c4798..51677fc1a 100644 --- a/monitoring/MonitorBase.h +++ b/monitoring/MonitorBase.h @@ -1,12 +1,12 @@ #ifndef MONITORBASE_H_ #define MONITORBASE_H_ -#include "../datapoolglob/GlobalDataSet.h" -#include "../datapoolglob/PIDReader.h" -#include "../monitoring/LimitViolationReporter.h" -#include "../monitoring/MonitoringIF.h" -#include "../monitoring/MonitoringMessageContent.h" -#include "../monitoring/MonitorReporter.h" +#include "../datapool/DataSet.h" +#include "../datapool/PIDReader.h" +#include "LimitViolationReporter.h" +#include "MonitoringIF.h" +#include "MonitoringMessageContent.h" +#include "MonitorReporter.h" /** * Base class for monitoring of parameters. diff --git a/monitoring/MonitorReporter.h b/monitoring/MonitorReporter.h index 9823cde01..ca2b534b9 100644 --- a/monitoring/MonitorReporter.h +++ b/monitoring/MonitorReporter.h @@ -2,9 +2,9 @@ #define FRAMEWORK_MONITORING_MONITORREPORTER_H_ #include "../events/EventManagerIF.h" -#include "../monitoring/LimitViolationReporter.h" -#include "../monitoring/MonitoringIF.h" -#include "../monitoring/MonitoringMessageContent.h" +#include "LimitViolationReporter.h" +#include "MonitoringIF.h" +#include "MonitoringMessageContent.h" #include "../parameters/HasParametersIF.h" template diff --git a/monitoring/MonitoringIF.h b/monitoring/MonitoringIF.h index d9ea339f4..44218c36d 100644 --- a/monitoring/MonitoringIF.h +++ b/monitoring/MonitoringIF.h @@ -2,7 +2,7 @@ #define MONITORINGIF_H_ #include "../memory/HasMemoryIF.h" -#include "../monitoring/MonitoringMessage.h" +#include "MonitoringMessage.h" #include "../serialize/SerializeIF.h" class MonitoringIF : public SerializeIF { diff --git a/monitoring/MonitoringMessage.cpp b/monitoring/MonitoringMessage.cpp index 2cfe1ecee..8caa27aee 100644 --- a/monitoring/MonitoringMessage.cpp +++ b/monitoring/MonitoringMessage.cpp @@ -1,4 +1,4 @@ -#include "../monitoring/MonitoringMessage.h" +#include "MonitoringMessage.h" #include "../objectmanager/ObjectManagerIF.h" MonitoringMessage::~MonitoringMessage() { diff --git a/monitoring/MonitoringMessageContent.h b/monitoring/MonitoringMessageContent.h index ea52962b2..c82506f3a 100644 --- a/monitoring/MonitoringMessageContent.h +++ b/monitoring/MonitoringMessageContent.h @@ -1,8 +1,8 @@ #ifndef MONITORINGMESSAGECONTENT_H_ #define MONITORINGMESSAGECONTENT_H_ -#include "../monitoring/HasMonitorsIF.h" -#include "../monitoring/MonitoringIF.h" +#include "HasMonitorsIF.h" +#include "MonitoringIF.h" #include "../objectmanager/ObjectManagerIF.h" #include "../serialize/SerialBufferAdapter.h" #include "../serialize/SerialFixedArrayListAdapter.h" diff --git a/monitoring/TwoValueLimitMonitor.h b/monitoring/TwoValueLimitMonitor.h index 74934828e..e690cdae2 100644 --- a/monitoring/TwoValueLimitMonitor.h +++ b/monitoring/TwoValueLimitMonitor.h @@ -1,7 +1,7 @@ #ifndef FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_ #define FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_ -#include "../monitoring/LimitMonitor.h" +#include "LimitMonitor.h" template class TwoValueLimitMonitor: public LimitMonitor {