100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
added sin/cos/tan/sqrt/mod processing nodes
mestiezbc2f243021ba
diff --git a/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java b/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.javaindex cac99bfa8..b3ebfabaa 100644--- a/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java+++ b/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java@@ -321,7 +321,7 @@ public enum NodeModel {return Values.create((float) Math.abs(a.getNumber()));} catch (Exception e) {RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return Values.create(false);+ return Values.create(0);}}),@@ -338,7 +338,7 @@ public enum NodeModel {return Values.create((float) Math.pow(a.getNumber(), b.getNumber()));} catch (Exception e) {RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return Values.create(false);+ return Values.create(0);}}),@@ -432,15 +432,86 @@ public enum NodeModel {return Values.create(0);}}),++ SIN(new Node(NodeType.PROCESSOR, "sin", new NodeInternal[0], new NodeSocket[]{+ new NodeSocket("in", NodeDataType.NUMBER),+ }, new NodeSocket[]{+ new NodeSocket("out", NodeDataType.NUMBER)+ }),+ info -> {+ try {+ NumberValue a = (NumberValue) info.getValueFromInput(0);+ return Values.create((float) Math.sin(a.getNumber()));+ } catch (Exception e) {+ return Values.create(0);+ }+ }),++ COS(new Node(NodeType.PROCESSOR, "cos", new NodeInternal[0], new NodeSocket[]{+ new NodeSocket("in", NodeDataType.NUMBER),+ }, new NodeSocket[]{+ new NodeSocket("out", NodeDataType.NUMBER)+ }),+ info -> {+ try {+ NumberValue a = (NumberValue) info.getValueFromInput(0);+ return Values.create((float) Math.cos(a.getNumber()));+ } catch (Exception e) {+ return Values.create(0);+ }+ }),++ TAN(new Node(NodeType.PROCESSOR, "tan", new NodeInternal[0], new NodeSocket[]{+ new NodeSocket("in", NodeDataType.NUMBER),+ }, new NodeSocket[]{+ new NodeSocket("out", NodeDataType.NUMBER)+ }),+ info -> {+ try {+ NumberValue a = (NumberValue) info.getValueFromInput(0);+ return Values.create((float) Math.tan(a.getNumber()));+ } catch (Exception e) {+ return Values.create(0);+ }+ }),++ SQRT(new Node(NodeType.PROCESSOR, "√", new NodeInternal[0], new NodeSocket[]{+ new NodeSocket("in", NodeDataType.NUMBER),+ }, new NodeSocket[]{+ new NodeSocket("out", NodeDataType.NUMBER)+ }),+ info -> {+ try {+ NumberValue a = (NumberValue) info.getValueFromInput(0);+ return Values.create((float) Math.sqrt(a.getNumber()));+ } catch (Exception e) {+ return Values.create(0);+ }+ }),++ MOD(new Node(NodeType.PROCESSOR, "%", new NodeInternal[0], new NodeSocket[]{+ new NodeSocket("a", NodeDataType.NUMBER),+ new NodeSocket("b", NodeDataType.NUMBER),+ }, new NodeSocket[]{+ new NodeSocket("c", NodeDataType.NUMBER)+ }),+ info -> {+ try {+ NumberValue a = (NumberValue) info.getValueFromInput(0);+ NumberValue b = (NumberValue) info.getValueFromInput(1);+ return Values.create((float) (a.getNumber() % b.getNumber()));+ } catch (Exception e) {+ return Values.create(0);+ }+ }),;+NodeModel(Node definition, NodeImplementation implementation) {this.definition = definition;definition.setName(this.name());this.implementation = implementation;- this.triggerFunction = (params) -> {- return false;- };+ this.triggerFunction = (params) -> false;}NodeModel(Node definition, NodeImplementation implementation, NodeTriggerFunction triggerFunction) {diff --git a/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts b/ui/component/or-rules/src/flow-viewer/components/node-menu-item.tsindex 8b6f4689f..31b78c79d 100644--- a/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts+++ b/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts@@ -85,8 +85,8 @@ export class NodeMenuItem extends translate(i18next)(LitElement) {}private get flowNodeName() {- const n = this.node.displayCharacter || this.node.name;- return i18next.t(n!, Utilities.humanLike(n!));+ return i18next.t(this.node.displayCharacter || this.node.name!,+ this.node.displayCharacter || Utilities.humanLike(this.node.name || "invalid node name"));}private startDrag = (e: MouseEvent) => {diff --git a/ui/keycloak/themes/openremote/openremote b/ui/keycloak/themes/openremote/openremotenew file mode 100644index 000000000..5d007a269--- /dev/null+++ b/ui/keycloak/themes/openremote/openremote@@ -0,0 +1,5 @@+XSym+0038+a0cbe511788e7da63dbf38ae7c748ce1+/deployment/keycloak/themes/openremote+\ No newline at end of file