Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
027e7cac
Commit
027e7cac
authored
7 years ago
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
App, Info and InfoSuccess added to alarm list
parent
0a140e55
master
bugfix_backports
slapos-adapt
slapos-adapt-release
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
66 additions
and
10 deletions
+66
-10
java/aapp/app/src/AEv.java
java/aapp/app/src/AEv.java
+36
-0
java/aapp/app/src/AEvItemAlarm.java
java/aapp/app/src/AEvItemAlarm.java
+30
-10
No files found.
java/aapp/app/src/AEv.java
View file @
027e7cac
...
...
@@ -23,6 +23,8 @@ public class AEv {
public
PlowNodeClass
alaNcBAlarm
;
public
PlowNodeClass
alaNcCAlarm
;
public
PlowNodeClass
alaNcDAlarm
;
public
PlowNodeClass
alaNcInfoSuccess
;
public
PlowNodeClass
alaNcInfo
;
public
PlowNodeClass
eveNcAlarm
;
public
PlowNodeClass
eveNcAAlarm
;
public
PlowNodeClass
eveNcBAlarm
;
...
...
@@ -258,6 +260,40 @@ public class AEv {
alaNcDAlarm
.
insert
(
p2
);
cmnAla
.
insert_nc
(
alaNcDAlarm
);
r1
=
new
PlowRect
(
cmnAla
,
0
D
,
0
D
,
50
D
,
1.5
D
,
Plow
.
COLOR_WHITE
,
Plow
.
COLOR_BLACK
,
true
,
false
,
false
);
r2
=
new
PlowRect
(
cmnAla
,
0.4
D
,
0.3
D
,
0.9
D
,
0.9
D
,
Plow
.
COLOR_GREEN
,
Plow
.
COLOR_BLACK
,
true
,
true
,
true
);
a1
=
new
PlowAnnot
(
cmnAla
,
4
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
NEXT_RELATIVE_POSITION
,
0
);
a2
=
new
PlowAnnot
(
cmnAla
,
10
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
RELATIVE_POSITION
,
1
);
a3
=
new
PlowAnnot
(
cmnAla
,
26
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
RELATIVE_POSITION
,
2
);
p1
=
new
PlowAnnotPixmap
(
cmnAla
,
2
D
,
0.28
D
,
0
);
p2
=
new
PlowAnnotPixmap
(
cmnAla
,
3
D
,
0.28
D
,
1
);
alaNcInfoSuccess
=
new
PlowNodeClass
(
cmnAla
);
alaNcInfoSuccess
.
insert
(
r1
);
alaNcInfoSuccess
.
insert
(
r2
);
alaNcInfoSuccess
.
insert
(
a1
);
alaNcInfoSuccess
.
insert
(
a2
);
alaNcInfoSuccess
.
insert
(
a3
);
alaNcInfoSuccess
.
insert
(
p1
);
alaNcInfoSuccess
.
insert
(
p2
);
cmnAla
.
insert_nc
(
alaNcInfoSuccess
);
r1
=
new
PlowRect
(
cmnAla
,
0
D
,
0
D
,
50
D
,
1.5
D
,
Plow
.
COLOR_WHITE
,
Plow
.
COLOR_BLACK
,
true
,
false
,
false
);
r2
=
new
PlowRect
(
cmnAla
,
0.4
D
,
0.3
D
,
0.9
D
,
0.9
D
,
Plow
.
COLOR_WHITE
,
Plow
.
COLOR_BLACK
,
true
,
true
,
true
);
a1
=
new
PlowAnnot
(
cmnAla
,
4
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
NEXT_RELATIVE_POSITION
,
0
);
a2
=
new
PlowAnnot
(
cmnAla
,
10
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
RELATIVE_POSITION
,
1
);
a3
=
new
PlowAnnot
(
cmnAla
,
26
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
RELATIVE_POSITION
,
2
);
p1
=
new
PlowAnnotPixmap
(
cmnAla
,
2
D
,
0.28
D
,
0
);
p2
=
new
PlowAnnotPixmap
(
cmnAla
,
3
D
,
0.28
D
,
1
);
alaNcInfo
=
new
PlowNodeClass
(
cmnAla
);
alaNcInfo
.
insert
(
r1
);
alaNcInfo
.
insert
(
r2
);
alaNcInfo
.
insert
(
a1
);
alaNcInfo
.
insert
(
a2
);
alaNcInfo
.
insert
(
a3
);
alaNcInfo
.
insert
(
p1
);
alaNcInfo
.
insert
(
p2
);
cmnAla
.
insert_nc
(
alaNcInfo
);
r1
=
new
PlowRect
(
cmnAla
,
0
D
,
0
D
,
50
D
,
1.5
D
,
Plow
.
COLOR_WHITE
,
Plow
.
COLOR_BLACK
,
true
,
false
,
false
);
a1
=
new
PlowAnnot
(
cmnAla
,
5
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
NEXT_RELATIVE_POSITION
,
0
);
a2
=
new
PlowAnnot
(
cmnAla
,
11
D
,
1.1
D
,
12
,
Plow
.
COLOR_BLACK
,
0
,
PlowAnnot
.
RELATIVE_POSITION
,
1
);
...
...
This diff is collapsed.
Click to expand it.
java/aapp/app/src/AEvItemAlarm.java
View file @
027e7cac
...
...
@@ -9,6 +9,7 @@ import jpwr.app.*;
public
class
AEvItemAlarm
extends
AXttItemBase
{
static
double
y
=
10
D
;
public
MhrEvent
e
;
public
PlowNodeClass
nc
;
public
AEvItemAlarm
(
AEv
aev
,
MhrEvent
e
,
PlowNode
destination
,
int
destCode
)
{
...
...
@@ -16,20 +17,39 @@ public class AEvItemAlarm extends AXttItemBase {
System
.
out
.
println
(
"New itemalarm Status: "
+
e
.
eventStatus
+
" "
+
e
.
eventPrio
+
" "
+
e
.
eventText
+
" "
+
e
.
eventName
);
switch
(
this
.
e
.
eventPrio
)
{
case
Mh
.
mh_eEventPrio_A
:
node
=
new
PlowNode
(
aev
.
cmnAla
,
3
D
,
y
,
aev
.
alaNcAAlarm
);
switch
(
this
.
e
.
eventType
)
{
case
Mh
.
mh_eEvent_Alarm
:
case
Mh
.
mh_eEvent_MaintenanceAlarm
:
case
Mh
.
mh_eEvent_SystemAlarm
:
case
Mh
.
mh_eEvent_UserAlarm1
:
case
Mh
.
mh_eEvent_UserAlarm2
:
case
Mh
.
mh_eEvent_UserAlarm3
:
case
Mh
.
mh_eEvent_UserAlarm4
:
switch
(
this
.
e
.
eventPrio
)
{
case
Mh
.
mh_eEventPrio_A
:
nc
=
aev
.
alaNcAAlarm
;
break
;
case
Mh
.
mh_eEventPrio_B
:
n
ode
=
new
PlowNode
(
aev
.
cmnAla
,
3
D
,
y
,
aev
.
alaNcBAlarm
)
;
case
Mh
.
mh_eEventPrio_B
:
n
c
=
aev
.
alaNcBAlarm
;
break
;
case
Mh
.
mh_eEventPrio_C
:
n
ode
=
new
PlowNode
(
aev
.
cmnAla
,
3
D
,
y
,
aev
.
alaNcCAlarm
)
;
case
Mh
.
mh_eEventPrio_C
:
n
c
=
aev
.
alaNcCAlarm
;
break
;
case
Mh
.
mh_eEventPrio_D
:
n
ode
=
new
PlowNode
(
aev
.
cmnAla
,
3
D
,
y
,
aev
.
alaNcDAlarm
)
;
case
Mh
.
mh_eEventPrio_D
:
n
c
=
aev
.
alaNcDAlarm
;
break
;
}
}
break
;
case
Mh
.
mh_eEvent_Info
:
nc
=
aev
.
alaNcInfo
;
break
;
case
Mh
.
mh_eEvent_InfoSuccess
:
nc
=
aev
.
alaNcInfoSuccess
;
break
;
default
:
return
;
}
node
=
new
PlowNode
(
aev
.
cmnAla
,
3
D
,
y
,
nc
);
node
.
setAnnotation
(
0
,
this
.
e
.
eventTime
,
1
);
node
.
setAnnotation
(
1
,
this
.
e
.
eventText
,
1
);
node
.
setAnnotation
(
2
,
this
.
e
.
eventName
,
1
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment