Fixed an event resolver issue when the reason input and output values…

… are different.

README.md

@@ -130,7 +130,7 @@ The Java Persistence 2.2 API (JPA) as implemented by the Hibernate ORM framework
 Hibernate and JPA abstract-away database specific aspects of inserting, updating, reading and deleting records in the tables.  The API is designed to work with any relational database supported by Hibernate.  
 
 ## What's New
-Version 3.10.1 is a maintenance release. Please see the Release Notes.txt file for release history and additional details.
+Version 3.10.2 is a maintenance release. Please see the Release Notes.txt file for release history and additional details.
 
 ## Getting Started
 The desktop applications are packaged in the oee-<version>.zip file in the latest Git release link at https://github.com/point85/OEE-Designer/releases.  Download the oee-<version>.zip file and expand the archive into a folder of your choice.  Next, download the Point85 OEE Getting Started Guide and follow instructions in that document.  Additional information may be found in the Point85 OEE User Guide.

Release Notes.txt

@@ -303,5 +303,8 @@ Note that version 3.2.0 has the following schema changes:
 (42) 3.10.1, January 10, 2024:	
     - Fixed work schedule editor issue when saving a schedule.	
 	- Documented an MQTT example for the Arduino R4
+
+(42) 3.10.2, January 16, 2024:	
+    - Fixed an event resolver issue when the reason input and output values are different.	
 
 Please send comments and suggestions to [email protected].

build.xml

@@ -2,9 +2,9 @@
 	<project name="oee-apps" default="build-distro" basedir="." > 
 
 	<!-- distribution archive -->
-	<property name="app_version" value="3.10.1"/>
-	<property name="domain.jar" value="oee-domain-3.10.1.jar"/>
-	<property name="collector.jar" value="oee-collector-3.10.1.jar"/>
+	<property name="app_version" value="3.10.2"/>
+	<property name="domain.jar" value="oee-domain-3.10.2.jar"/>
+	<property name="collector.jar" value="oee-collector-3.10.2.jar"/>
 
 	<!-- folders -->
 	<property name="fxbuild.dir" value="fxbuild"/>

pom.xml

@@ -4,14 +4,14 @@
 
   <groupId>org.point85</groupId>
   <artifactId>oee-apps</artifactId>
-  <version>3.10.1</version>
+  <version>3.10.2</version>
   <packaging>jar</packaging>
 
   <name>Point85 OEE JavaFX Applications</name>
   <url>https://github.com/point85</url>
 
   <properties>
-  	<domain.version>3.10.1</domain.version>    
+  	<domain.version>3.10.2</domain.version>    
     <maven.compiler.release>11</maven.compiler.release>
     <javafx.version>17.0.9</javafx.version>
     <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>

run-collector-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Collector application (args: JDBC connection string, user name, password and optional collector name)
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA 

run-collector-app.sh

@@ -1,2 +1,2 @@
 # Launch the Collector application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA  
+java -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication COLLECTOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-designer-app-debug.bat

@@ -1,2 +1,2 @@
 rem Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
-java.exe -Xdebug -Xrunjdwp:transport=dt_socket,address=8998,server=y -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p %JAVAFX_HOME%\lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA
+java.exe -Xdebug -Xrunjdwp:transport=dt_socket,address=8998,server=y -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p %JAVAFX_HOME%\lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA

run-designer-app.bat

@@ -1,3 +1,3 @@
 rem Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA 
 

run-designer-app.sh

@@ -1,2 +1,2 @@
 # Launch the Designer application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA
+java -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication DESIGNER jdbc:hsqldb:hsql://localhost/OEE SA

run-monitor-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Monitor application (args: JDBC connection string, user name, password and optional collector name)
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-monitor-app.sh

@@ -1,2 +1,2 @@
 # Launch the Monitor application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  
+java -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication MONITOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-operator-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Operator application (args: JDBC connection string, user name, password and optional collector name) 
-start "" "%JAVA_HOME%\bin\javaw.exe" -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.10.1.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.10.2.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA 

run-operator-app.sh

@@ -1,2 +1,2 @@
 # Launch the Operator application (args: JDBC connection string, user name, password and optional collector name)
-java -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.10.1.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA  
+java -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml -jar oee-apps-3.10.2.jar OPERATOR jdbc:hsqldb:hsql://localhost/OEE SA  

run-tester-app.bat

@@ -1,2 +1,2 @@
 rem Launch the Tester application (args: JDBC connection string, user name, password and optional collector name) 
-start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA 
+start "" "%JAVA_HOME%\bin\javaw.exe" -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p "%JAVAFX_HOME%\lib" --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA 

run-tester-app.sh

@@ -1,2 +1,2 @@
 # Launch the Tester application (args: JDBC connection string, user name, password and optional collector name)
-java -cp ./oee-apps-3.10.1.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA  
+java -cp ./oee-apps-3.10.2.jar;lib/*;lib/ext/* -p $JAVAFX_HOME/lib --add-modules javafx.controls,javafx.fxml,javafx.web -Dlog4j2.configurationFile=config/logging/log4j2.xml org.point85.app.OeeApplication TESTER jdbc:hsqldb:hsql://localhost/OEE SA  

src/main/java/org/point85/app/charts/TrendChartController.java

@@ -297,14 +297,8 @@ public OeeEvent invokeResolver(OeeContext context, Object sourceValue, OffsetDat
 
 		switch (type) {
 		case AVAILABILITY: {
-			// plot loss category
-			String lossCategory = null;
-			if (resolvedEvent.getReason() != null) {
-				TimeLoss loss = resolvedEvent.getReason().getLossCategory();
-				lossCategory = loss.toString();
-			}
-
-			plotData(resolvedEvent.getInputValue(), lossCategory);
+			// plot resolved reason
+			plotData(resolvedEvent.getInputValue(), resolvedEvent.getOutputValue());
 			break;
 		}
 

src/main/resources/fxml/EquipmentResolver.fxml

@@ -13,15 +13,15 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.point85.app.designer.EquipmentResolverController">
+<AnchorPane xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.point85.app.designer.EquipmentResolverController">
    <children>
       <GridPane hgap="10.0" layoutX="5.0" layoutY="14.0" vgap="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="14.0">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" percentWidth="5.0" />
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="12.0" prefWidth="100.0" />
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="33.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="8.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="30.0" prefWidth="100.0" />
             <ColumnConstraints />
         </columnConstraints>
         <rowConstraints>