Merge pull request #2745 from ControlSystemStudio/LinearMeter

CSSTUDIO-1133 New Widget: Linear Meter
ControlSystemStudio · Jul 26, 2023 · 0c2504a · 0c2504a
2 parents d0f7982 + f19a3cc
commit 0c2504a
Show file tree

Hide file tree

Showing 16 changed files with 2,130 additions and 0 deletions.
diff --git a/app/display/linearmeter/build.xml b/app/display/linearmeter/build.xml
@@ -0,0 +1,22 @@
+<project default="app-display-linearmeter">
+  <import file="../../../dependencies/ant_settings.xml"/>
+
+  <target name="app-display-linearmeter">
+    <mkdir dir="${classes}"/>
+    <javac destdir="${classes}" debug="${debug}">
+      <src path="${src}"/>
+      <classpath>
+        <path refid="app-classpath"/>
+        <pathelement path="../model/${build}/app-display-model-${version}.jar"/>
+        <pathelement path="../representation/${build}/app-display-representation-${version}.jar"/>
+        <pathelement path="../representation-javafx/${build}/app-display-representation-javafx-${version}.jar"/>
+      </classpath>
+    </javac>
+
+    <jar destfile="${build}/app-display-linearmeter-${version}.jar">
+      <fileset dir="${classes}"/>
+      <fileset dir="${resources}"/>
+    </jar>
+  </target>
+
+</project>
diff --git a/app/display/linearmeter/pom.xml b/app/display/linearmeter/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <artifactId>app-display</artifactId>
+        <groupId>org.phoebus</groupId>
+        <version>4.7.3-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>app-display-linearmeter</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.phoebus</groupId>
+            <artifactId>app-display-model</artifactId>
+            <version>4.7.3-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.phoebus</groupId>
+            <artifactId>app-display-representation</artifactId>
+            <version>4.7.3-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.phoebus</groupId>
+            <artifactId>app-display-representation-javafx</artifactId>
+            <version>4.7.3-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...er/src/main/java/org/csstudio/display/extra/widgets/LinearMeterRepresentationService.java b/...er/src/main/java/org/csstudio/display/extra/widgets/LinearMeterRepresentationService.java
@@ -0,0 +1,21 @@
+package org.csstudio.display.extra.widgets;
+
+import org.csstudio.display.builder.model.WidgetDescriptor;
+import org.csstudio.display.builder.representation.WidgetRepresentation;
+import org.csstudio.display.builder.representation.WidgetRepresentationFactory;
+import org.csstudio.display.builder.representation.spi.WidgetRepresentationsService;
+import org.csstudio.display.extra.widgets.linearmeter.LinearMeterRepresentation;
+import org.csstudio.display.extra.widgets.linearmeter.LinearMeterWidget;
+
+import java.util.Map;
+
+import static java.util.Map.entry;
+
+public class LinearMeterRepresentationService implements WidgetRepresentationsService {
+    @SuppressWarnings({"unchecked", "rawtypes", "nls"})
+    @Override
+    public <TWP, TW> Map<WidgetDescriptor, WidgetRepresentationFactory<TWP, TW>> getWidgetRepresentationFactories() {
+        return Map.ofEntries(
+                entry(LinearMeterWidget.WIDGET_DESCRIPTOR, () -> (WidgetRepresentation) new LinearMeterRepresentation()));
+    }
+}
diff --git a/...inearmeter/src/main/java/org/csstudio/display/extra/widgets/LinearMeterWidgetService.java b/...inearmeter/src/main/java/org/csstudio/display/extra/widgets/LinearMeterWidgetService.java
@@ -0,0 +1,22 @@
+package org.csstudio.display.extra.widgets;
+
+import org.csstudio.display.builder.model.WidgetDescriptor;
+import org.csstudio.display.builder.model.spi.WidgetsService;
+import org.csstudio.display.extra.widgets.linearmeter.LinearMeterWidget;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * A widget service for which provided additional widgets
+ */
+public class LinearMeterWidgetService implements WidgetsService
+{
+    @Override
+    public Collection<WidgetDescriptor> getWidgetDescriptors()
+    {
+        return List.of(
+                LinearMeterWidget.WIDGET_DESCRIPTOR
+        );
+    }
+}