From 61cdfc6ee7f013c4533add51d797c1886b312883 Mon Sep 17 00:00:00 2001
From: Alejandro Acuña <alejandro.acuna@aluvisagrupo.com>
Date: Tue, 21 Jan 2025 08:12:12 +0000
Subject: [PATCH] as
---
svgDevicesTest/src/Rtz/RtzMapComplex.java | 186 +++++++++++++--------------------------------
1 files changed, 55 insertions(+), 131 deletions(-)
diff --git a/svgDevicesTest/src/Rtz/RtzMapComplex.java b/svgDevicesTest/src/Rtz/RtzMapComplex.java
index cad8a33..bf5c063 100644
--- a/svgDevicesTest/src/Rtz/RtzMapComplex.java
+++ b/svgDevicesTest/src/Rtz/RtzMapComplex.java
@@ -17,30 +17,29 @@
super(device, commands, diagram);
}
- public void status()
+ public void status()
{
try
{
statusSubcontroller();
- } catch (Exception e)
+ }
+ catch (Exception e)
{
}
}
public void statusSubcontroller()
- {
+ {
java.util.Calendar calendardate = java.util.Calendar.getInstance();
calendardate.set(java.util.Calendar.MILLISECOND, 0);
long seconds = calendardate.getTimeInMillis() / 1000;
boolean even = seconds % 2 == 0;
-
art.library.model.devices.colors.controller.RTZ32.RTZ32_Controller controller = (art.library.model.devices.colors.controller.RTZ32.RTZ32_Controller) getDevice();
art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerStatus controllerStatus = (art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerStatus) controller.getDeviceStatus();
art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation controllerInformation = (art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation) controller.getDeviceInformation();
art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status subcontrollerStatus = controllerStatus.rtz32;
art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerRealtime subcontrollerRealtime = (art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerRealtime) device.getDeviceRealtime();
art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerConfiguration subcontrollerConfiguration = (art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerConfiguration) device.getDeviceConfiguration();
-
SVGElement emergency = getElement("Emergency");
SVGElement lock = getElement("Lock");
SVGElement run = getElement("Run");
@@ -63,6 +62,8 @@
setText("Text offset", "");
setText("Text cycle", "");
setText("Text elapsed", "");
+
+ setAttribute(background, "display", "inline");
try
{
@@ -82,85 +83,65 @@
} catch (Exception ex)
{
}
-
-
setAttribute(elapsed1, "display", "none");
setAttribute(elapsed2, "display", "none");
- /* setAttribute(border, "stroke", "#800080");*/
- setAttribute(border, "display", "inline");
+ /* setAttribute(border, "stroke", "#800080");*/ setAttribute(border, "display", "inline");
setAttribute(border, "stroke-width", 6.5);
setAttribute(border, "stroke-opacity", 0.75);
setAttribute(ribbon, "stroke-opacity", 0.50);
setAttribute(ribbon, "stroke", "#FF80FF");
setAttribute(background, "fill", "#FF80FF");
-
if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_NON_CENTRALIZED)
{
- setAttribute(border, "stroke", "#FFFFFF",999);
- setAttribute(background, "fill", "#FFFFFF",999);
- setAttribute(ribbon, "stroke", "#FFFFFF",999);
- }
- else
+ setAttribute(border, "stroke", "#FFFFFF", 999);
+ setAttribute(background, "fill", "#FFFFFF", 999);
+ setAttribute(ribbon, "stroke", "#FFFFFF", 999);
+ } else
{
- setAttribute(border, "display", "none", 999);
-
+ setAttribute(border, "display", "none", 999);
if (controllerStatus.rtz32.centralized.centralized == false)
{
setAttribute(border, "fill", "#808080", 999);
setAttribute(background, "fill", "#808080", 999);
setAttribute(ribbon, "stroke", "#808080", 999);
- }
- else
+ } else
{
- boolean semiactuated = controllerStatus.rtz32.general.semiactuated ;
+ boolean semiactuated = controllerStatus.rtz32.general.semiactuated;
boolean offline = false;
-
if (device.getAlarm("alarm_controller_offline") > 0 || device.getAlarm("alarm_offline") > 0)
{
offline = true;
setAttribute(background, "display", even ? "inline" : "none", 999);
}
-
if (controllerStatus.rtz32.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_COMPUTER)
{
setAttribute(background, "fill", "#00FF00", 999);
setAttribute(ribbon, "stroke", "#00FF00", 999);
-
- if(offline == true)
+ if (offline == true)
{
setAttribute(background, "display", even || semiactuated ? "none" : "inline", 999);
}
- }
- else if (controllerStatus.rtz32.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_LOCAL)
+ } else if (controllerStatus.rtz32.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_LOCAL)
{
setAttribute(background, "fill", "#FF0000", 999);
- setAttribute(ribbon, "stroke", "#FF0000", 999);
-
+ setAttribute(ribbon, "stroke", "#FF0000", 999);
if (offline == true)
{
setAttribute(background, "display", even ? "none" : "inline", 999);
}
}
-
if (device.getAlarm("alarm_controller_offline") <= 0 && device.getAlarm("alarm_offline") <= 0)
{
if (art.library.model.devices.colors.controller.RTZ32.RTZ32_Controller.class.cast(device).getDeviceAlarms().rtz32.flashing.getServerityAlarm() > 0)
{
setAttribute(background, "fill", "#FFFF00", 999);
- setAttribute(ribbon, "stroke", "#FFFF00", 999);
+ setAttribute(ribbon, "stroke", "#FFFF00", 999);
setAttribute(background, "display", even ? "inline" : "none", 999);
-
}
}
}
}
-
- if (subcontrollerStatus.forcings != null
- && (subcontrollerStatus.forcings.centralized != null
- || subcontrollerStatus.forcings.colorsMode != null
- || subcontrollerStatus.forcings.computerMode != null
- || subcontrollerStatus.forcings.control != null
- || subcontrollerStatus.forcings.plan != null))
+ if (subcontrollerStatus.forcings != null && (subcontrollerStatus.forcings.centralized != null || subcontrollerStatus.forcings.colorsMode != null || subcontrollerStatus.forcings.computerMode != null || subcontrollerStatus.forcings.control != null || subcontrollerStatus.forcings.plan != null))
{
setAttribute(lock, "fill-opacity", "1.0", 999);
setAttribute(lock, "fill", "#FF0000", 999);
@@ -169,7 +150,7 @@
setAttribute(lock, "fill-opacity", "0.15", 999);
setAttribute(lock, "fill", "#000000", 999);
}
- if (subcontrollerStatus.general.emergency == true)
+ if (subcontrollerStatus.general.emergency == true)
{
setAttribute(emergency, "fill-opacity", "1.0", 999);
} else if (subcontrollerStatus.general.emergency == false)
@@ -177,18 +158,14 @@
setAttribute(emergency, "fill-opacity", "0.15", 999);
setAttribute(emergency, "fill", "#000000", 999);
}
-
-
-
setAttribute("Text information", "display", "iniline", 999);
setAttribute("Text offset", "display", "iniline", 999);
setAttribute("Text cycle", "display", "iniline", 999);
-
if ((subcontrollerStatus.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_COMPUTER))
{
setAttribute(remote, "fill-opacity", "1.0", 999);
setAttribute(remote, "fill", "#0000FF", 999);
- } else
+ } else
{
setAttribute(remote, "fill-opacity", "0.15", 999);
setAttribute(remote, "fill", "#000000", 999);
@@ -202,87 +179,49 @@
setAttribute(run, "fill-opacity", "0.15", 999);
setAttribute(run, "fill", "#000000", 999);
}
-
double strokeopacity = Math.pow(2, controller.getDeviceAlarms().getServerityAlarm()) / 32;
-
- /* if (controller.getDeviceAlarms().getServerityAlarm() > 0)
- {
- setAttribute(border, "display", "inline");
- setAttribute(border, "stroke", "#FF0000");
- setAttribute(border, "stroke-opacity", strokeopacity);
- setAttribute(border, "stroke-width", 6.5 + (6.5 * strokeopacity));
- } else
- {
- setAttribute(border, "stroke", "#808080");
- setAttribute(border, "display", "inline");
- setAttribute(border, "stroke-width", 6.5);
- setAttribute(border, "stroke-opacity", 1.0);
- }*/
-
-
-
- switch (subcontrollerStatus.general.state)
+ /* if (controller.getDeviceAlarms().getServerityAlarm() > 0) { setAttribute(border, "display", "inline"); setAttribute(border, "stroke", "#FF0000"); setAttribute(border, "stroke-opacity", strokeopacity); setAttribute(border, "stroke-width", 6.5 + (6.5 * strokeopacity)); } else { setAttribute(border, "stroke", "#808080"); setAttribute(border, "display", "inline"); setAttribute(border, "stroke-width", 6.5); setAttribute(border, "stroke-opacity", 1.0); }*/ switch (subcontrollerStatus.general.state)
{
case art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.STATE_UNKNOWN:
- /*setAttribute(background, "fill", "#808080");
- setAttribute(ribbon, "stroke", "#808080");*/
- setAttribute(elapsed2, "fill", "#808080");
+ /*setAttribute(background, "fill", "#808080"); setAttribute(ribbon, "stroke", "#808080");*/ setAttribute(elapsed2, "fill", "#808080");
setText("Text information", "OFF");
return;
-
case art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.STATE_FLASHING:
- setAttribute("Text information", "display","none",999);
- setAttribute("Text offset", "display","none",999);
- setAttribute("Text cycle", "display","none",999);
-
+ setAttribute("Text information", "display", "none", 999);
+ setAttribute("Text offset", "display", "none", 999);
+ setAttribute("Text cycle", "display", "none", 999);
if (even)
{
- /* setAttribute(background, "fill", "#FFFF00");
- setAttribute(ribbon, "stroke", "#FFFF00");*/
- setAttribute(elapsed2, "fill", "#FFFF00");
+ /* setAttribute(background, "fill", "#FFFF00"); setAttribute(ribbon, "stroke", "#FFFF00");*/ setAttribute(elapsed2, "fill", "#FFFF00");
} else
{
- /* setAttribute(background, "fill", "#808000");
- setAttribute(ribbon, "stroke", "#808000");*/
- setAttribute(elapsed2, "fill", "#808000");
+ /* setAttribute(background, "fill", "#808000"); setAttribute(ribbon, "stroke", "#808000");*/ setAttribute(elapsed2, "fill", "#808000");
}
setText("Text information", "Y^");
break;
case art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.STATE_STARTUP:
if (subcontrollerStatus.general.emergency == true)
{
- /* setAttribute(background, "fill", even ? "#FF8000" : "#804000");
- setAttribute(ribbon, "stroke", even ? "#FF8000" : "#804000");*/
- setAttribute(elapsed2, "fill", even ? "#FF8000" : "#804000");
+ /* setAttribute(background, "fill", even ? "#FF8000" : "#804000"); setAttribute(ribbon, "stroke", even ? "#FF8000" : "#804000");*/ setAttribute(elapsed2, "fill", even ? "#FF8000" : "#804000");
} else if (subcontrollerStatus.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_LOCAL)
{
- /* setAttribute(background, "fill", even ? "#008000" : "#004000");
- setAttribute(ribbon, "stroke", even ?"#008000" : "#004000");*/
- setAttribute(elapsed2, "fill",even ? "#008000" : "#004000");
+ /* setAttribute(background, "fill", even ? "#008000" : "#004000"); setAttribute(ribbon, "stroke", even ?"#008000" : "#004000");*/ setAttribute(elapsed2, "fill", even ? "#008000" : "#004000");
} else
{
- /* setAttribute(background, "fill", even ? "#00FF00" : "#008000");
- setAttribute(ribbon, "stroke", even ? "#00FF00" : "#008000");*/
- setAttribute(elapsed2, "fill", even ? "#00FF00" : "#008000");
+ /* setAttribute(background, "fill", even ? "#00FF00" : "#008000"); setAttribute(ribbon, "stroke", even ? "#00FF00" : "#008000");*/ setAttribute(elapsed2, "fill", even ? "#00FF00" : "#008000");
}
break;
case art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.STATE_COLORS:
if (subcontrollerStatus.general.emergency == true)
{
- /* setAttribute(background, "fill", "#FF8000"); */
- setAttribute(ribbon, "stroke", "#FF8000");
+ /* setAttribute(background, "fill", "#FF8000"); */ setAttribute(ribbon, "stroke", "#FF8000");
setAttribute(elapsed2, "fill", "#FF8000");
- }
- else if (subcontrollerStatus.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_LOCAL)
+ } else if (subcontrollerStatus.general.control == art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.CONTROL_LOCAL)
{
- /* setAttribute(background, "fill", "#008000");
- setAttribute(ribbon, "stroke", "#008000");*/
- setAttribute(elapsed2, "fill", "#008000");
+ /* setAttribute(background, "fill", "#008000"); setAttribute(ribbon, "stroke", "#008000");*/ setAttribute(elapsed2, "fill", "#008000");
} else
{
- /* setAttribute(background, "fill", "#00FF00");
- setAttribute(ribbon, "stroke", "#00FF00");*/
- setAttribute(elapsed2, "fill", "#00FF00");
+ /* setAttribute(background, "fill", "#00FF00"); setAttribute(ribbon, "stroke", "#00FF00");*/ setAttribute(elapsed2, "fill", "#00FF00");
}
break;
}
@@ -296,31 +235,35 @@
{
}
}
-
if (plan != null)
{
-
String information = "";
-
- if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED)
+ if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED)
+ {
information = "C";
- else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_MASTER)
+ } else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_MASTER)
+ {
information = "M";
- else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_MASTER_SLAVE)
+ } else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_MASTER_SLAVE)
+ {
information = "M-E";
- else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_SLAVE)
+ } else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_SLAVE)
+ {
information = "E";
- else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_SLAVE_MASTER)
+ } else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_SLAVE_MASTER)
+ {
information = "E-M";
- else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_TROLLEY)
+ } else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_CENTRALIZED_TROLLEY)
+ {
information = "CTw";
- else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_NON_CENTRALIZED)
+ } else if (controllerInformation.mode == art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation.MODE_NON_CENTRALIZED)
+ {
information = "NC";
- else
+ } else
+ {
information = "?";
-
+ }
information = information + plan.number;
-
switch (subcontrollerStatus.general.planMode)
{
case art.library.model.devices.colors.controller.RTZ32.status.RTZ32_Status_General.PLAN_MODE_DELAYED_ORDERS:
@@ -339,7 +282,6 @@
information = information + "t";
break;
}
-
setText("Text information", information);
if (plan.offset > 0)
{
@@ -349,13 +291,11 @@
setText("Text offset", "");
}
setText("Text cycle", "" + plan.cycle);
-
if (subcontrollerRealtime != null)
{
try
{
String text = subcontrollerRealtime.rtz32.phase.phaseNumber + ":" + subcontrollerRealtime.rtz32.counters.cycle;
-
setText("Text elapsed", text);
setAttribute(elapsed1, "display", "inline");
setAttribute(elapsed2, "display", "inline");
@@ -367,15 +307,12 @@
{
}
}
-
java.awt.Color bckColor = java.awt.Color.decode(background.getStyleAbsolute("fill").getStringValue());
- java.awt.Color darkerColor = bckColor.darker();
- String darkHex = String.format("#%02x%02x%02x", darkerColor.darker().getRed(), darkerColor.darker().getGreen(), darkerColor.darker().getBlue());
-
+ java.awt.Color darkerColor = java.awt.Color.BLACK;
+ String darkHex = String.format("#%02x%02x%02x", darkerColor.getRed(),darkerColor.getBlue(),darkerColor.getGreen());
setAttribute("Text information", "fill", darkHex, 999);
setAttribute("Text offset", "fill", darkHex, 999);
setAttribute("Text cycle", "fill", darkHex, 999);
-
setAttribute(emergency, "fill", darkHex, 999);
setAttribute(lock, "fill", darkHex, 999);
setAttribute(run, "fill", darkHex, 999);
@@ -429,22 +366,17 @@
{
final String colorNoCommandsBorder = "#00007C";
final String colorNoCommandsBackground = "#7C7CFA";
-
final String colorCommandsBorder = "#007C00";
final String colorCommandsBackground = "#7CFA7C";
-
art.library.model.devices.colors.controller.RTZ32.RTZ32_Controller controller = (art.library.model.devices.colors.controller.RTZ32.RTZ32_Controller) getDevice();
art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation controllerInformation = (art.library.model.devices.colors.controller.RTZ32.RTZ32_ControllerInformation) controller.getDeviceInformation();
-
SVGElement background = getElement("Background");
SVGElement border = getElement("Border");
SVGElement ribbon = getElement("Ribbon");
-
SVGElement emergency = getElement("Emergency");
SVGElement lock = getElement("Lock");
SVGElement run = getElement("Run");
SVGElement remote = getElement("Remote");
-
setAttribute(border, "stroke", !getDeviceCommands().isEmpty() ? colorCommandsBorder : colorNoCommandsBorder);
setAttribute(border, "display", "inline");
setAttribute(border, "stroke-width", 6.5);
@@ -452,22 +384,14 @@
setAttribute(ribbon, "stroke-opacity", 0.50);
setAttribute(ribbon, "stroke", !getDeviceCommands().isEmpty() ? colorCommandsBackground : colorNoCommandsBackground);
setAttribute(background, "fill", !getDeviceCommands().isEmpty() ? colorCommandsBackground : colorNoCommandsBackground);
-
setAttribute(emergency, "fill", !getDeviceCommands().isEmpty() ? colorCommandsBackground : colorNoCommandsBackground, 999);
setAttribute(lock, "fill", !getDeviceCommands().isEmpty() ? colorCommandsBackground : colorNoCommandsBackground, 999);
setAttribute(run, "fill", !getDeviceCommands().isEmpty() ? colorCommandsBackground : colorNoCommandsBackground, 999);
setAttribute(remote, "fill", !getDeviceCommands().isEmpty() ? colorCommandsBackground : colorNoCommandsBackground, 999);
-
setText("Text number", String.format("%04d", controllerInformation.number));
setAttribute("Text information", "display", "none", 999);
setAttribute("Text offset", "display", "none", 999);
setAttribute("Text cycle", "display", "none", 999);
setAttribute("Text elapsed", "display", "none", 999);
-
- }
-
-
-// java.io.StringWriter sw = new java.io.StringWriter();
-// art.library.gui.flat.FlatDialog.showDialog(null, "Error", e.getMessage() + "\n\n" + sw.toString(), true, art.library.gui.flat.FlatDialog.DIALOG_ERROR);
-//
+ }
}
--
Gitblit v1.10.0