From 1b13301ad24f6b1558d2c0ebb1399918c9bd3166 Mon Sep 17 00:00:00 2001
From: mscharfenberg <Michael.Scharfenberg@itk-engineering.de>
Date: Tue, 23 Nov 2021 14:10:08 +0100
Subject: [PATCH 1/2] Fix Version numer of GUI, delete old masterConfig.xml

---
 gui/application/CMakeLists.txt                     |  2 +-
 .../examples/PCM_Re-Simulation/masterConfig.xml    | 14 --------------
 .../PCM_Re-Simulation/opSimulationManager.xml      |  2 +-
 sim/contrib/examples/masterConfig.xml              | 13 -------------
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 sim/contrib/examples/PCM_Re-Simulation/masterConfig.xml
 delete mode 100644 sim/contrib/examples/masterConfig.xml

diff --git a/gui/application/CMakeLists.txt b/gui/application/CMakeLists.txt
index 4d583f1c..610bdd01 100644
--- a/gui/application/CMakeLists.txt
+++ b/gui/application/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
 # add definitions: this needs to be in a certain gloabl file TODO
-add_definitions(-DAPPLICATION_NAME="openPASS" -DAPPLICATION_VERSION="0.7")
+add_definitions(-DAPPLICATION_NAME="openPASS" -DAPPLICATION_VERSION="0.8")
 add_definitions(${Qt5Widgets_DEFINITIONS})
 
 # include QtWidgets package
diff --git a/sim/contrib/examples/PCM_Re-Simulation/masterConfig.xml b/sim/contrib/examples/PCM_Re-Simulation/masterConfig.xml
deleted file mode 100644
index e5e7d78e..00000000
--- a/sim/contrib/examples/PCM_Re-Simulation/masterConfig.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<opSimulationManager>
-    <logLevel>2</logLevel>
-    <logFileMaster>opSimulationManager.log</logFileMaster>
-    <slave>opSimulation.exe</slave>
-    <libraries>modules</libraries>
-    <slaveConfigs>
-        <slaveConfig>
-            <configurations>result_pcm/1000232/0-0-0/Default/configs</configurations>
-            <logFileSlave>result_pcm/1000232/0-0-0/Default/opSimulation.log</logFileSlave>
-            <results>result_pcm/1000232/0-0-0/Default/results</results>
-        </slaveConfig>
-    </slaveConfigs>
-</opSimulationManager>
diff --git a/sim/contrib/examples/PCM_Re-Simulation/opSimulationManager.xml b/sim/contrib/examples/PCM_Re-Simulation/opSimulationManager.xml
index b43b41b2..ab3e462b 100644
--- a/sim/contrib/examples/PCM_Re-Simulation/opSimulationManager.xml
+++ b/sim/contrib/examples/PCM_Re-Simulation/opSimulationManager.xml
@@ -3,7 +3,7 @@
     <logLevel>2</logLevel>
     <logFileSimulationManager>opSimulationManager.log</logFileSimulationManager>
     <simulation>opSimulation.exe</simulation>
-    <libraries>./lib</libraries>
+    <libraries>./modules</libraries>
     <simulationConfigs>
         <simulationConfig>
             <configurations>result_pcm/1000232/0-0-0/Default/configs</configurations>
diff --git a/sim/contrib/examples/masterConfig.xml b/sim/contrib/examples/masterConfig.xml
deleted file mode 100644
index ffd54c4e..00000000
--- a/sim/contrib/examples/masterConfig.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<opSimulationManager>
-  <logLevel>0</logLevel>
-  <logFileMaster>opSimulationManager.log</logFileMaster>
-  <slave>opSimulation.exe</slave>
-  <libraries>modules</libraries>
-  <slaveConfigs>
-    <slaveConfig>
-      <logFileSlave>opSimulation.log</logFileSlave>
-      <configurations>configs</configurations>
-      <results>results</results>
-    </slaveConfig>
-  </slaveConfigs>
-</opSimulationManager>
-- 
GitLab


From 17ffdfb5cc9ffe523372dbbd3dede9bcec862a96 Mon Sep 17 00:00:00 2001
From: Dmitri Fix <dmitri.fix@itk-engineering.de>
Date: Tue, 23 Nov 2021 18:19:09 +0100
Subject: [PATCH 2/2] correct the CSV logger in PCM example

---
 .../1000232/0-0-0/Default/configs/simulationConfig.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sim/contrib/examples/PCM_Re-Simulation/result_pcm/1000232/0-0-0/Default/configs/simulationConfig.xml b/sim/contrib/examples/PCM_Re-Simulation/result_pcm/1000232/0-0-0/Default/configs/simulationConfig.xml
index 90d9b957..fc50272c 100644
--- a/sim/contrib/examples/PCM_Re-Simulation/result_pcm/1000232/0-0-0/Default/configs/simulationConfig.xml
+++ b/sim/contrib/examples/PCM_Re-Simulation/result_pcm/1000232/0-0-0/Default/configs/simulationConfig.xml
@@ -29,7 +29,7 @@
     </Environment>
     <Observations>
         <Observation>
-            <Library>Observation_Log</Library>
+            <Library>Observation_LogAgent</Library>
             <Parameters>
                 <String Key="OutputFilename" Value="simulationOutput.xml"/>
                 <Bool Key="LoggingCyclicsToCsv" Value="true"/>
-- 
GitLab