From 0e3a50d0c17f2e6b296e3a4617af910dabb3d657 Mon Sep 17 00:00:00 2001 From: Slider0007 <115730895+Slider0007@users.noreply.github.com> Date: Thu, 30 Mar 2023 21:55:28 +0200 Subject: [PATCH] Remove obsolete ClassFlowWriteList (#2264) --- .../jomjol_flowcontroll/ClassFlowControll.cpp | 4 - .../jomjol_flowcontroll/ClassFlowControll.h | 1 - .../ClassFlowWriteList.cpp | 91 ------------------- .../jomjol_flowcontroll/ClassFlowWriteList.h | 27 ------ 4 files changed, 123 deletions(-) delete mode 100644 code/components/jomjol_flowcontroll/ClassFlowWriteList.cpp delete mode 100644 code/components/jomjol_flowcontroll/ClassFlowWriteList.h diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index 085fa48a..42eaae70 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -99,8 +99,6 @@ std::string ClassFlowControll::TranslateAktstatus(std::string _input) #endif //ENABLE_INFLUXDB if (_input.compare("ClassFlowPostProcessing") == 0) return ("Post-Processing"); - if (_input.compare("ClassFlowWriteList") == 0) - return ("Writing List"); return "Unkown Status"; } @@ -243,8 +241,6 @@ ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type) if (toUpper(_type).compare("[INFLUXDBV2]") == 0) cfc = new ClassFlowInfluxDBv2(&FlowControll); #endif //ENABLE_INFLUXDB - if (toUpper(_type).compare("[WRITELIST]") == 0) - cfc = new ClassFlowWriteList(&FlowControll); if (toUpper(_type).compare("[POSTPROCESSING]") == 0) { diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.h b/code/components/jomjol_flowcontroll/ClassFlowControll.h index da401738..cb6dfda1 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.h +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.h @@ -18,7 +18,6 @@ #include "ClassFlowInfluxDBv2.h" #endif //ENABLE_INFLUXDB #include "ClassFlowCNNGeneral.h" -#include "ClassFlowWriteList.h" class ClassFlowControll : public ClassFlow diff --git a/code/components/jomjol_flowcontroll/ClassFlowWriteList.cpp b/code/components/jomjol_flowcontroll/ClassFlowWriteList.cpp deleted file mode 100644 index 368a5e26..00000000 --- a/code/components/jomjol_flowcontroll/ClassFlowWriteList.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include -#include "ClassFlowWriteList.h" -#include "Helper.h" - -#include "time_sntp.h" -#include "../../include/defines.h" - -#include - -void ClassFlowWriteList::SetInitialParameter(void) -{ - flowpostprocessing = NULL; - previousElement = NULL; - ListFlowControll = NULL; - disabled = false; -} - -ClassFlowWriteList::ClassFlowWriteList() -{ - SetInitialParameter(); -} - -ClassFlowWriteList::ClassFlowWriteList(std::vector* lfc) -{ - SetInitialParameter(); - - ListFlowControll = lfc; - for (int i = 0; i < ListFlowControll->size(); ++i) - { - if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0) - { - flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i]; - } - } -} - - -bool ClassFlowWriteList::ReadParameter(FILE* pfile, string& aktparamgraph) -{ - std::vector splitted; - - aktparamgraph = trim(aktparamgraph); - - if (aktparamgraph.size() == 0) - if (!this->GetNextParagraph(pfile, aktparamgraph)) - return false; - - if (toUpper(aktparamgraph).compare("[MQTT]") != 0) - return false; - - while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) - { - splitted = ZerlegeZeile(aktparamgraph); - } - - return true; -} - - - -bool ClassFlowWriteList::doFlow(string zwtime) -{ - std::string line = ""; - - std::string result; - std::string resulterror = ""; - std::string resultraw = ""; - std::string resultrate = ""; - std::string resulttimestamp = ""; - string zw = ""; - string namenumber = ""; - - if (flowpostprocessing) - { - std::vector* NUMBERS = flowpostprocessing->GetNumbers(); - - for (int i = 0; i < (*NUMBERS).size(); ++i) - { - result = (*NUMBERS)[i]->ReturnValue; - resultraw = (*NUMBERS)[i]->ReturnRawValue; - resulterror = (*NUMBERS)[i]->ErrorMessageText; - resultrate = (*NUMBERS)[i]->ReturnRateValue; - resulttimestamp = (*NUMBERS)[i]->timeStamp; - - line = line + resulttimestamp + "\t" + resultraw + "\t" + result + "\t" + resultraw + "\t" + resultrate + "\t" + resulttimestamp + "\t"; - - } - } - - return true; -} diff --git a/code/components/jomjol_flowcontroll/ClassFlowWriteList.h b/code/components/jomjol_flowcontroll/ClassFlowWriteList.h deleted file mode 100644 index 4ed77100..00000000 --- a/code/components/jomjol_flowcontroll/ClassFlowWriteList.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#ifndef CLASSFFLOWPWRITELIST_H -#define CLASSFFLOWPWRITELIST_H - -#include "ClassFlow.h" -#include "ClassFlowPostProcessing.h" - -#include - -class ClassFlowWriteList : - public ClassFlow -{ -protected: - ClassFlowPostProcessing* flowpostprocessing; - void SetInitialParameter(void); - -public: - ClassFlowWriteList(); - ClassFlowWriteList(std::vector* lfc); - - bool ReadParameter(FILE* pfile, string& aktparamgraph); - bool doFlow(string time); - string name(){return "ClassFlowWriteList";}; -}; - -#endif //CLASSFFLOWPWRITELIST_H \ No newline at end of file