Skip to content

P
proview
Commit 6cf1f297 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Mh event types SystemAlarm and MaintenanceAlarm added

parent 3848e8bc
Hide whitespace changes
Inline Side-by-side
Showing with 338 additions and 52 deletions
src/exe/rt_emon/src/rt_emon.c
View file @ 6cf1f297
...@@ -682,6 +682,8 @@ activeListInsert ( ...@@ -682,6 +682,8 @@ activeListInsert (
switch (ap->event) { switch (ap->event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
++l.emon->AlarmCount; ++l.emon->AlarmCount;
break; break;
case mh_eEvent_Block: case mh_eEvent_Block:
...@@ -720,6 +722,8 @@ activeListRemove ( ...@@ -720,6 +722,8 @@ activeListRemove (
switch (ap->event) { switch (ap->event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
--l.emon->AlarmCount; --l.emon->AlarmCount;
break; break;
case mh_eEvent_Block: case mh_eEvent_Block:
...@@ -1073,6 +1077,8 @@ applReturn ( ...@@ -1073,6 +1077,8 @@ applReturn (
switch (aap->link.event) { switch (aap->link.event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
updateAlarm(ap, ep); updateAlarm(ap, ep);
break; break;
case mh_eEvent_Info: case mh_eEvent_Info:
...@@ -1448,6 +1454,8 @@ eventListInsert ( ...@@ -1448,6 +1454,8 @@ eventListInsert (
switch (event) { switch (event) {
case mh_eEvent_Info: case mh_eEvent_Info:
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
case mh_eEvent_Block: case mh_eEvent_Block:
case mh_eEvent_Reblock: case mh_eEvent_Reblock:
ap->idx = idx; ap->idx = idx;
...@@ -1527,11 +1535,15 @@ formatApplEvent ( ...@@ -1527,11 +1535,15 @@ formatApplEvent (
switch (event) { switch (event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
case mh_eEvent_Info: case mh_eEvent_Info:
mp = &up->message; mp = &up->message;
ip->Id.Idx = aap->link.idx; ip->Id.Idx = aap->link.idx;
ip->EventTime = net_TimeToNetTime( &aap->message.EventTime); ip->EventTime = net_TimeToNetTime( &aap->message.EventTime);
if (aap->link.event == mh_eEvent_Alarm) if (aap->link.event == mh_eEvent_Alarm ||
aap->link.event == mh_eEvent_MaintenanceAlarm ||
aap->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = aap->message.EventPrio; ip->EventPrio = aap->message.EventPrio;
strncpy(mp->EventText, aap->message.EventText, sizeof(mp->EventText)); strncpy(mp->EventText, aap->message.EventText, sizeof(mp->EventText));
mp->SupInfo.SupType = aap->message.SupInfo.SupType; mp->SupInfo.SupType = aap->message.SupInfo.SupType;
...@@ -1548,7 +1560,9 @@ formatApplEvent ( ...@@ -1548,7 +1560,9 @@ formatApplEvent (
acp = &up->ack; acp = &up->ack;
ip->Id.Idx = aap->link.ackIdx; ip->Id.Idx = aap->link.ackIdx;
ip->EventTime = net_TimeToNetTime( &aap->ackTime); ip->EventTime = net_TimeToNetTime( &aap->ackTime);
if (aap->link.event == mh_eEvent_Alarm) if (aap->link.event == mh_eEvent_Alarm ||
aap->link.event == mh_eEvent_MaintenanceAlarm ||
aap->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = aap->message.EventPrio; ip->EventPrio = aap->message.EventPrio;
acp->TargetId.Nix = l.head.nix; acp->TargetId.Nix = l.head.nix;
acp->TargetId.BirthTime = l.head.birthTime; acp->TargetId.BirthTime = l.head.birthTime;
...@@ -1567,7 +1581,9 @@ formatApplEvent ( ...@@ -1567,7 +1581,9 @@ formatApplEvent (
rp = &up->ret; rp = &up->ret;
ip->Id.Idx = aap->link.returnIdx; ip->Id.Idx = aap->link.returnIdx;
net_GetTime(&ip->EventTime); net_GetTime(&ip->EventTime);
if (aap->link.event == mh_eEvent_Alarm) if (aap->link.event == mh_eEvent_Alarm ||
aap->link.event == mh_eEvent_MaintenanceAlarm ||
aap->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = aap->message.EventPrio; ip->EventPrio = aap->message.EventPrio;
strncpy(rp->EventText, text, sizeof(rp->EventText)); strncpy(rp->EventText, text, sizeof(rp->EventText));
rp->TargetId.Nix = l.head.nix; rp->TargetId.Nix = l.head.nix;
...@@ -1586,7 +1602,9 @@ formatApplEvent ( ...@@ -1586,7 +1602,9 @@ formatApplEvent (
rp = &up->ret; rp = &up->ret;
ip->Id.Idx = aap->link.returnIdx; ip->Id.Idx = aap->link.returnIdx;
ip->EventTime = net_TimeToNetTime( &aap->returnTime); ip->EventTime = net_TimeToNetTime( &aap->returnTime);
if (aap->link.event == mh_eEvent_Alarm) if (aap->link.event == mh_eEvent_Alarm ||
aap->link.event == mh_eEvent_MaintenanceAlarm ||
aap->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = aap->message.EventPrio; ip->EventPrio = aap->message.EventPrio;
strncpy(rp->EventText, aap->returnText, sizeof(rp->EventText)); strncpy(rp->EventText, aap->returnText, sizeof(rp->EventText));
rp->TargetId.Nix = l.head.nix; rp->TargetId.Nix = l.head.nix;
...@@ -1630,12 +1648,16 @@ formatSupEvent ( ...@@ -1630,12 +1648,16 @@ formatSupEvent (
switch (event) { switch (event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
case mh_eEvent_Info: case mh_eEvent_Info:
mp = &up->message; mp = &up->message;
ip->Id.Idx = sp->link.idx; ip->Id.Idx = sp->link.idx;
ip->EventTime = net_TimeToNetTime( &sup->DetectTime); ip->EventTime = net_TimeToNetTime( &sup->DetectTime);
strncpy(mp->EventText, sup->DetectText, sizeof(mp->EventText)); strncpy(mp->EventText, sup->DetectText, sizeof(mp->EventText));
if (sp->link.event == mh_eEvent_Alarm) if (sp->link.event == mh_eEvent_Alarm ||
sp->link.event == mh_eEvent_MaintenanceAlarm ||
sp->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = sup->EventPriority; ip->EventPrio = sup->EventPriority;
mp->SupInfo.SupType = sp->supType; mp->SupInfo.SupType = sp->supType;
#if 1 #if 1
...@@ -1658,7 +1680,9 @@ formatSupEvent ( ...@@ -1658,7 +1680,9 @@ formatSupEvent (
acp = &up->ack; acp = &up->ack;
ip->Id.Idx = sp->link.ackIdx; ip->Id.Idx = sp->link.ackIdx;
ip->EventTime = net_TimeToNetTime( &sup->AckTime); ip->EventTime = net_TimeToNetTime( &sup->AckTime);
if (sp->link.event == mh_eEvent_Alarm) if (sp->link.event == mh_eEvent_Alarm ||
sp->link.event == mh_eEvent_MaintenanceAlarm ||
sp->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = sup->EventPriority; ip->EventPrio = sup->EventPriority;
acp->TargetId.Idx = sp->link.idx; acp->TargetId.Idx = sp->link.idx;
acp->TargetId.Nix = l.head.nix; acp->TargetId.Nix = l.head.nix;
...@@ -1675,7 +1699,9 @@ formatSupEvent ( ...@@ -1675,7 +1699,9 @@ formatSupEvent (
rp = &up->ret; rp = &up->ret;
ip->Id.Idx = sp->link.returnIdx; ip->Id.Idx = sp->link.returnIdx;
ip->EventTime = net_TimeToNetTime( &sup->ReturnTime); ip->EventTime = net_TimeToNetTime( &sup->ReturnTime);
if (sp->link.event == mh_eEvent_Alarm) if (sp->link.event == mh_eEvent_Alarm ||
sp->link.event == mh_eEvent_MaintenanceAlarm ||
sp->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = sup->EventPriority; ip->EventPrio = sup->EventPriority;
strncpy(rp->EventText, sup->ReturnText, sizeof(rp->EventText)); strncpy(rp->EventText, sup->ReturnText, sizeof(rp->EventText));
rp->TargetId.Idx = sp->link.idx; rp->TargetId.Idx = sp->link.idx;
...@@ -1699,7 +1725,9 @@ formatSupEvent ( ...@@ -1699,7 +1725,9 @@ formatSupEvent (
case mh_eEvent_Cancel: case mh_eEvent_Cancel:
rp = &up->ret; rp = &up->ret;
ip->Id.Idx = sp->link.returnIdx; ip->Id.Idx = sp->link.returnIdx;
if (sp->link.event == mh_eEvent_Alarm) if (sp->link.event == mh_eEvent_Alarm ||
sp->link.event == mh_eEvent_MaintenanceAlarm ||
sp->link.event == mh_eEvent_SystemAlarm)
ip->EventPrio = sup->EventPriority; ip->EventPrio = sup->EventPriority;
net_GetTime(&ip->EventTime); net_GetTime(&ip->EventTime);
strncpy(rp->EventText, text, sizeof(rp->EventText)); strncpy(rp->EventText, text, sizeof(rp->EventText));
...@@ -2218,7 +2246,7 @@ handleAlarm ( ...@@ -2218,7 +2246,7 @@ handleAlarm (
{ {
sEvent *ep; sEvent *ep;
ep = eventListInsert(mh_eEvent_Alarm, NULL, (sActive*) sp); ep = eventListInsert(sp->sup->EventType, NULL, (sActive*) sp);
activeListInsert((sActive *) sp, ep, mh_eSource_Scanner); activeListInsert((sActive *) sp, ep, mh_eSource_Scanner);
updateAlarm((sActive *) sp, ep); updateAlarm((sActive *) sp, ep);
...@@ -2289,6 +2317,8 @@ handleReturn ( ...@@ -2289,6 +2317,8 @@ handleReturn (
switch (sp->link.event) { switch (sp->link.event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
updateAlarm((sActive *) sp, ep); updateAlarm((sActive *) sp, ep);
break; break;
case mh_eEvent_Info: case mh_eEvent_Info:
...@@ -2398,6 +2428,8 @@ handlerEvent ( ...@@ -2398,6 +2428,8 @@ handlerEvent (
switch (eventType) { switch (eventType) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
case mh_eEvent_Info: case mh_eEvent_Info:
if (LstInl(&hp->link.active_l)) /* already active */ if (LstInl(&hp->link.active_l)) /* already active */
...@@ -3250,6 +3282,8 @@ outunitAck ( ...@@ -3250,6 +3282,8 @@ outunitAck (
switch (ap->event) { switch (ap->event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
updateAlarm(ap, ep); updateAlarm(ap, ep);
break; break;
case mh_eEvent_Info: case mh_eEvent_Info:
...@@ -3702,6 +3736,8 @@ reSendEventToOutunit ( ...@@ -3702,6 +3736,8 @@ reSendEventToOutunit (
switch (event.message.Info.EventType) { switch (event.message.Info.EventType) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
case mh_eEvent_Info: case mh_eEvent_Info:
event.message.Status = Status; event.message.Status = Status;
break; break;
...@@ -3796,6 +3832,8 @@ scanSupList () ...@@ -3796,6 +3832,8 @@ scanSupList ()
handleInfo(sp); handleInfo(sp);
break; break;
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
default: default:
handleAlarm(sp); handleAlarm(sp);
break; break;
...@@ -4143,6 +4181,8 @@ updateAlarm ( ...@@ -4143,6 +4181,8 @@ updateAlarm (
switch (ep->event) { switch (ep->event) {
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
ap->status.Event.Status = mh_mEventStatus_NotRet | ap->status.Event.Status = mh_mEventStatus_NotRet |
mh_mEventStatus_NotAck; mh_mEventStatus_NotAck;
if (ap->source == mh_eSource_Scanner) { if (ap->source == mh_eSource_Scanner) {
...@@ -4235,7 +4275,9 @@ updateAlarmInfo ( ...@@ -4235,7 +4275,9 @@ updateAlarmInfo (
for (al = LstFir(&l.active_l); al != LstEnd(&l.active_l) ; al = LstNex(al)) { for (al = LstFir(&l.active_l); al != LstEnd(&l.active_l) ; al = LstNex(al)) {
ap = LstObj(al); ap = LstObj(al);
if (cdh_ArefIsEqual(&iap->object, &ap->object)) if (cdh_ArefIsEqual(&iap->object, &ap->object))
if (ap->event == mh_eEvent_Alarm) if (ap->event == mh_eEvent_Alarm ||
ap->event == mh_eEvent_MaintenanceAlarm ||
ap->event == mh_eEvent_SystemAlarm)
maxAlarm.All = MAX(maxAlarm.All, ap->status.All); maxAlarm.All = MAX(maxAlarm.All, ap->status.All);
} }
......
src/lib/rt/src/rt_mh_net.x
View file @ 6cf1f297
...@@ -77,7 +77,9 @@ enum mh_eEvent { ...@@ -77,7 +77,9 @@ enum mh_eEvent {
mh_eEvent_Unblock = 8, mh_eEvent_Unblock = 8,
mh_eEvent_Info = 32, mh_eEvent_Info = 32,
mh_eEvent_Alarm = 64, mh_eEvent_Alarm = 64,
mh_eEvent_ = 65 mh_eEvent_MaintenanceAlarm = 128,
mh_eEvent_SystemAlarm = 256,
mh_eEvent_ = 257
}; };
%/** %/**
......
src/lib/rt/src/rt_mh_outunit.c
View file @ 6cf1f297
...@@ -871,6 +871,8 @@ handlerEvent ( ...@@ -871,6 +871,8 @@ handlerEvent (
l.cbAck(ap); l.cbAck(ap);
break; break;
case mh_eEvent_Alarm: case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm:
if (l.cbAlarm != NULL) if (l.cbAlarm != NULL)
sts = l.cbAlarm((mh_sMessage*) mp); sts = l.cbAlarm((mh_sMessage*) mp);
break; break;
...@@ -1163,7 +1165,9 @@ static void msgFromV3( mh_sHead *hp) ...@@ -1163,7 +1165,9 @@ static void msgFromV3( mh_sHead *hp)
break; break;
} }
case mh_eEvent_Info: case mh_eEvent_Info:
case mh_eEvent_Alarm: { case mh_eEvent_Alarm:
case mh_eEvent_MaintenanceAlarm:
case mh_eEvent_SystemAlarm: {
mh_sMessage *mp = (mh_sMessage *)ip; mh_sMessage *mp = (mh_sMessage *)ip;
mp->Object = cdh_ObjidToAref( ip->Object_V3); mp->Object = cdh_ObjidToAref( ip->Object_V3);
......
src/wbl/pwrb/src/pwrb_td_eventtypeenum.wb_load
View file @ 6cf1f297
...@@ -73,6 +73,26 @@ SObject pwrb:Type ...@@ -73,6 +73,26 @@ SObject pwrb:Type
Attr Value = 64 Attr Value = 64
EndBody EndBody
EndObject EndObject
!/**
! Type MaintenanceAlarm.
!*/
Object MaintenanceAlarm $Value
Body SysBody
Attr PgmName = "MaintenanceAlarm"
Attr Text = "MaintenanceAlarm"
Attr Value = 128
EndBody
EndObject
!/**
! Type SystemAlarm.
!*/
Object SystemAlarm $Value
Body SysBody
Attr PgmName = "SystemAlarm"
Attr Text = "SystemAlarm"
Attr Value = 256
EndBody
EndObject
EndObject EndObject
EndSObject EndSObject
......
src/wbl/pwrb/src/pwrb_td_eventtypemask.wb_load
View file @ 6cf1f297
...@@ -68,6 +68,26 @@ SObject pwrb:Type ...@@ -68,6 +68,26 @@ SObject pwrb:Type
Attr Value = 64 Attr Value = 64
EndBody EndBody
EndObject EndObject
!/**
! Type MaintenanceAlarm.
!*/
Object MaintenanceAlarm $Bit
Body SysBody
Attr PgmName = "MaintenanceAlarm"
Attr Text = "MaintenanceAlarm"
Attr Value = 128
EndBody
EndObject
!/**
! Type SystemAlarm.
!*/
Object SystemAlarm $Bit
Body SysBody
Attr PgmName = "SystemAlarm"
Attr Text = "SystemAlarm"
Attr Value = 256
EndBody
EndObject
EndObject EndObject
EndSObject EndSObject
......
xtt/exp/inc/src/xnav_bitmap_maintenance10.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance10_width 10
#define xnav_bitmap_maintenance10_height 10
static char xnav_bitmap_maintenance10_bits[] = {
0xe0, 0x00, 0x70, 0x00, 0x30, 0x02, 0x70, 0x03, 0xf8, 0x03, 0xfc, 0x01,
0x3e, 0x00, 0x1f, 0x00, 0x0f, 0x00, 0x07, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance12.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance12_width 12
#define xnav_bitmap_maintenance12_height 12
static char xnav_bitmap_maintenance12_bits[] = {
0xc0, 0x01, 0xe0, 0x00, 0x60, 0x00, 0x60, 0x08, 0xe0, 0x0c, 0xf0, 0x0f,
0xf8, 0x07, 0x7c, 0x00, 0x3e, 0x00, 0x1f, 0x00, 0x0f, 0x00, 0x07, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance14.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance14_width 14
#define xnav_bitmap_maintenance14_height 14
static char xnav_bitmap_maintenance14_bits[] = {
0x00, 0x07, 0x80, 0x03, 0xc0, 0x01, 0xc0, 0x20, 0xc0, 0x30, 0xc0, 0x39,
0xe0, 0x1f, 0xf0, 0x0f, 0xf8, 0x00, 0x7c, 0x00, 0x3e, 0x00, 0x1f, 0x00,
0x0f, 0x00, 0x07, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance16.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance16_width 16
#define xnav_bitmap_maintenance16_height 16
static char xnav_bitmap_maintenance16_bits[] = {
0x00, 0x00, 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0x80, 0x41, 0x80, 0x63,
0x80, 0x77, 0xc0, 0x3f, 0xe0, 0x1f, 0xf0, 0x01, 0xf8, 0x00, 0x7c, 0x00,
0x3e, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x00, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance18.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance18_width 18
#define xnav_bitmap_maintenance18_height 18
static char xnav_bitmap_maintenance18_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x07, 0x00,
0x00, 0x03, 0x00, 0x00, 0x03, 0x01, 0x00, 0x87, 0x01, 0x00, 0xcf, 0x01,
0x80, 0xff, 0x00, 0xc0, 0x7f, 0x00, 0xe0, 0x03, 0x00, 0xf0, 0x01, 0x00,
0xf8, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x1e, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x00, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance20.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance20_width 20
#define xnav_bitmap_maintenance20_height 20
static char xnav_bitmap_maintenance20_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x38, 0x00, 0x00, 0x1c, 0x00,
0x00, 0x0c, 0x00, 0x00, 0x0c, 0x04, 0x00, 0x1c, 0x06, 0x00, 0x3c, 0x07,
0x00, 0xfe, 0x03, 0x00, 0xf9, 0x01, 0x80, 0x0c, 0x00, 0x40, 0x06, 0x00,
0x20, 0x03, 0x00, 0x90, 0x01, 0x00, 0xc8, 0x00, 0x00, 0x64, 0x00, 0x00,
0x32, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance24.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance24_width 24
#define xnav_bitmap_maintenance24_height 24
static char xnav_bitmap_maintenance24_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0xc0, 0x03, 0x00, 0xe0, 0x01,
0x00, 0xf0, 0x00, 0x00, 0x78, 0x20, 0x00, 0x68, 0x60, 0x00, 0xd8, 0x70,
0x00, 0xa8, 0x79, 0x00, 0x58, 0x3f, 0x00, 0xac, 0x1e, 0x00, 0x56, 0x0d,
0x00, 0xeb, 0x07, 0x80, 0x35, 0x00, 0xc0, 0x1a, 0x00, 0x60, 0x0d, 0x00,
0xb0, 0x06, 0x00, 0x58, 0x03, 0x00, 0xac, 0x01, 0x00, 0xd6, 0x00, 0x00,
0x6a, 0x00, 0x00, 0x36, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00};
xtt/exp/inc/src/xnav_bitmap_maintenance8.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_maintenance8_width 8
#define xnav_bitmap_maintenance8_height 8
static char xnav_bitmap_maintenance8_bits[] = {
0x30, 0x18, 0x98, 0xf8, 0x7c, 0x0e, 0x07, 0x03};
xtt/exp/inc/src/xnav_bitmap_system10.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system10_width 10
#define xnav_bitmap_system10_height 10
static char xnav_bitmap_system10_bits[] = {
0xff, 0x03, 0xff, 0x03, 0x31, 0x02, 0x19, 0x02, 0x99, 0x02, 0xf9, 0x02,
0x7d, 0x02, 0x0f, 0x02, 0x07, 0x02, 0xff, 0x03};
xtt/exp/inc/src/xnav_bitmap_system12.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system12_width 12
#define xnav_bitmap_system12_height 12
static char xnav_bitmap_system12_bits[] = {
0xff, 0x0f, 0x01, 0x08, 0xff, 0x0f, 0x41, 0x08, 0x21, 0x08, 0x21, 0x09,
0xf1, 0x08, 0x39, 0x08, 0x1d, 0x08, 0x0d, 0x08, 0x01, 0x08, 0xff, 0x0f};
xtt/exp/inc/src/xnav_bitmap_system14.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system14_width 14
#define xnav_bitmap_system14_height 14
static char xnav_bitmap_system14_bits[] = {
0xff, 0x3f, 0x01, 0x20, 0xff, 0x3f, 0x81, 0x21, 0xc1, 0x20, 0x41, 0x24,
0xc1, 0x26, 0xe1, 0x23, 0x71, 0x20, 0x39, 0x20, 0x1d, 0x20, 0x09, 0x20,
0x01, 0x20, 0xff, 0x3f};
xtt/exp/inc/src/xnav_bitmap_system16.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system16_width 16
#define xnav_bitmap_system16_height 16
static char xnav_bitmap_system16_bits[] = {
0xff, 0xff, 0x01, 0x80, 0xff, 0xff, 0x01, 0x80, 0x01, 0x83, 0x81, 0x81,
0x81, 0x88, 0x81, 0x8d, 0xc1, 0x87, 0xe1, 0x80, 0x71, 0x80, 0x39, 0x80,
0x1d, 0x80, 0x0d, 0x80, 0x01, 0x80, 0xff, 0xff};
xtt/exp/inc/src/xnav_bitmap_system18.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system18_width 18
#define xnav_bitmap_system18_height 18
static char xnav_bitmap_system18_bits[] = {
0xff, 0xff, 0x03, 0x01, 0x00, 0x02, 0xff, 0xff, 0x03, 0x01, 0x0e, 0x02,
0x01, 0x07, 0x02, 0x01, 0x03, 0x02, 0x01, 0x43, 0x02, 0x01, 0x67, 0x02,
0x81, 0x7e, 0x02, 0x41, 0x3d, 0x02, 0xa1, 0x02, 0x02, 0x51, 0x01, 0x02,
0xa9, 0x00, 0x02, 0x55, 0x00, 0x02, 0x2d, 0x00, 0x02, 0x1d, 0x00, 0x02,
0x01, 0x00, 0x02, 0xff, 0xff, 0x03};
xtt/exp/inc/src/xnav_bitmap_system20.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system20_width 20
#define xnav_bitmap_system20_height 20
static char xnav_bitmap_system20_bits[] = {
0xff, 0xff, 0x0f, 0x01, 0x00, 0x08, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x08,
0x01, 0x0c, 0x08, 0x01, 0x0e, 0x08, 0x01, 0x07, 0x08, 0x01, 0x03, 0x08,
0x01, 0xc7, 0x08, 0x01, 0xed, 0x08, 0x81, 0x7a, 0x08, 0x41, 0x3d, 0x08,
0xa1, 0x02, 0x08, 0x51, 0x01, 0x08, 0xa9, 0x00, 0x08, 0x55, 0x00, 0x08,
0x2d, 0x00, 0x08, 0x19, 0x00, 0x08, 0x01, 0x00, 0x08, 0xff, 0xff, 0x0f};
xtt/exp/inc/src/xnav_bitmap_system24.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system24_width 24
#define xnav_bitmap_system24_height 24
static char xnav_bitmap_system24_bits[] = {
0xff, 0xff, 0x7f, 0x01, 0x00, 0x40, 0x01, 0x00, 0x40, 0xff, 0xff, 0x7f,
0x01, 0x00, 0x40, 0x01, 0x00, 0x40, 0x01, 0x70, 0x40, 0x01, 0x38, 0x40,
0x01, 0x1c, 0x40, 0x01, 0x0c, 0x42, 0x01, 0x1c, 0x43, 0x01, 0xbc, 0x43,
0x01, 0xfe, 0x41, 0x01, 0xfd, 0x40, 0x81, 0x0a, 0x40, 0x41, 0x05, 0x40,
0xa1, 0x02, 0x40, 0x51, 0x01, 0x40, 0xa9, 0x00, 0x40, 0x55, 0x00, 0x40,
0x2d, 0x00, 0x40, 0x19, 0x00, 0x40, 0x01, 0x00, 0x40, 0xff, 0xff, 0x7f};
xtt/exp/inc/src/xnav_bitmap_system8.h 0 → 100644
View file @ 6cf1f297
#define xnav_bitmap_system8_width 8
#define xnav_bitmap_system8_height 8
static char xnav_bitmap_system8_bits[] = {
0xff, 0x91, 0x89, 0xd9, 0xbd, 0x8f, 0x87, 0xff};
xtt/lib/xtt/src/xtt_evlist.cpp
View file @ 6cf1f297
...@@ -107,6 +107,22 @@ ...@@ -107,6 +107,22 @@
#include "xnav_bitmap_info18.h" #include "xnav_bitmap_info18.h"
#include "xnav_bitmap_info20.h" #include "xnav_bitmap_info20.h"
#include "xnav_bitmap_info24.h" #include "xnav_bitmap_info24.h"
#include "xnav_bitmap_system8.h"
#include "xnav_bitmap_system10.h"
#include "xnav_bitmap_system12.h"
#include "xnav_bitmap_system14.h"
#include "xnav_bitmap_system16.h"
#include "xnav_bitmap_system18.h"
#include "xnav_bitmap_system20.h"
#include "xnav_bitmap_system24.h"
#include "xnav_bitmap_maintenance8.h"
#include "xnav_bitmap_maintenance10.h"
#include "xnav_bitmap_maintenance12.h"
#include "xnav_bitmap_maintenance14.h"
#include "xnav_bitmap_maintenance16.h"
#include "xnav_bitmap_maintenance18.h"
#include "xnav_bitmap_maintenance20.h"
#include "xnav_bitmap_maintenance24.h"
#include "xnav_bitmap_blockr_12.h" #include "xnav_bitmap_blockr_12.h"
#include "xnav_bitmap_blockl_12.h" #include "xnav_bitmap_blockl_12.h"
...@@ -137,6 +153,8 @@ void EvListBrow::free_pixmaps() ...@@ -137,6 +153,8 @@ void EvListBrow::free_pixmaps()
brow_FreeAnnotPixmap( ctx, pixmap_eventacked); brow_FreeAnnotPixmap( ctx, pixmap_eventacked);
brow_FreeAnnotPixmap( ctx, pixmap_eventreturn); brow_FreeAnnotPixmap( ctx, pixmap_eventreturn);
brow_FreeAnnotPixmap( ctx, pixmap_info); brow_FreeAnnotPixmap( ctx, pixmap_info);
brow_FreeAnnotPixmap( ctx, pixmap_system);
brow_FreeAnnotPixmap( ctx, pixmap_maintenance);
brow_FreeAnnotPixmap( ctx, pixmap_blockr); brow_FreeAnnotPixmap( ctx, pixmap_blockr);
brow_FreeAnnotPixmap( ctx, pixmap_blockl); brow_FreeAnnotPixmap( ctx, pixmap_blockl);
} }
...@@ -378,6 +396,70 @@ void EvListBrow::allocate_pixmaps() ...@@ -378,6 +396,70 @@ void EvListBrow::allocate_pixmaps()
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmap_info); brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmap_info);
i = 0;
pixmap_data[i].width =xnav_bitmap_maintenance8_width;
pixmap_data[i].height =xnav_bitmap_maintenance8_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance8_bits;
pixmap_data[i].width =xnav_bitmap_maintenance10_width;
pixmap_data[i].height =xnav_bitmap_maintenance10_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance10_bits;
pixmap_data[i].width =xnav_bitmap_maintenance12_width;
pixmap_data[i].height =xnav_bitmap_maintenance12_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance12_bits;
pixmap_data[i].width =xnav_bitmap_maintenance14_width;
pixmap_data[i].height =xnav_bitmap_maintenance14_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance14_bits;
pixmap_data[i].width =xnav_bitmap_maintenance16_width;
pixmap_data[i].height =xnav_bitmap_maintenance16_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance16_bits;
pixmap_data[i].width =xnav_bitmap_maintenance18_width;
pixmap_data[i].height =xnav_bitmap_maintenance18_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance18_bits;
pixmap_data[i].width =xnav_bitmap_maintenance20_width;
pixmap_data[i].height =xnav_bitmap_maintenance20_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance20_bits;
pixmap_data[i].width =xnav_bitmap_maintenance20_width;
pixmap_data[i].height =xnav_bitmap_maintenance20_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance20_bits;
pixmap_data[i].width =xnav_bitmap_maintenance24_width;
pixmap_data[i].height =xnav_bitmap_maintenance24_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_maintenance24_bits;
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmap_maintenance);
i = 0;
pixmap_data[i].width =xnav_bitmap_system8_width;
pixmap_data[i].height =xnav_bitmap_system8_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system8_bits;
pixmap_data[i].width =xnav_bitmap_system10_width;
pixmap_data[i].height =xnav_bitmap_system10_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system10_bits;
pixmap_data[i].width =xnav_bitmap_system12_width;
pixmap_data[i].height =xnav_bitmap_system12_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system12_bits;
pixmap_data[i].width =xnav_bitmap_system14_width;
pixmap_data[i].height =xnav_bitmap_system14_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system14_bits;
pixmap_data[i].width =xnav_bitmap_system16_width;
pixmap_data[i].height =xnav_bitmap_system16_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system16_bits;
pixmap_data[i].width =xnav_bitmap_system18_width;
pixmap_data[i].height =xnav_bitmap_system18_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system18_bits;
pixmap_data[i].width =xnav_bitmap_system20_width;
pixmap_data[i].height =xnav_bitmap_system20_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system20_bits;
pixmap_data[i].width =xnav_bitmap_system20_width;
pixmap_data[i].height =xnav_bitmap_system20_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system20_bits;
pixmap_data[i].width =xnav_bitmap_system24_width;
pixmap_data[i].height =xnav_bitmap_system24_height;
pixmap_data[i++].bits = (char *)xnav_bitmap_system24_bits;
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmap_system);
for ( i = 0; i < 9; i++) { for ( i = 0; i < 9; i++) {
pixmap_data[i].width =xnav_bitmap_blockr_12_width; pixmap_data[i].width =xnav_bitmap_blockr_12_width;
pixmap_data[i].height =xnav_bitmap_blockr_12_height; pixmap_data[i].height =xnav_bitmap_blockr_12_height;
...@@ -411,16 +493,16 @@ void EvListBrow::create_nodeclasses() ...@@ -411,16 +493,16 @@ void EvListBrow::create_nodeclasses()
brow_AddAnnotPixmap( nc_event, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_event, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_event, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_event, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmapButton( nc_event, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmapButton( nc_event, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_event, 4.3, 0.6, 1, brow_AddAnnot( nc_event, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0); 0);
brow_AddAnnot( nc_event, 11, 0.6, 2, brow_AddAnnot( nc_event, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0); 0);
brow_AddAnnot( nc_event, 13, 0.6, 3, brow_AddAnnot( nc_event, 13.5, 0.6, 3,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1); 1);
brow_AddAnnot( nc_event, 29, 0.6, 4, brow_AddAnnot( nc_event, 29.5, 0.6, 4,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1); 1);
brow_AddFrame( nc_event, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_event, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -435,13 +517,14 @@ void EvListBrow::create_nodeclasses() ...@@ -435,13 +517,14 @@ void EvListBrow::create_nodeclasses()
brow_AddAnnotPixmap( nc_a_alarm, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_a_alarm, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_a_alarm, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_a_alarm, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmapButton( nc_a_alarm, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmapButton( nc_a_alarm, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_a_alarm, 4.3, 0.6, 1, brow_AddAnnotPixmap( nc_a_alarm, 3, 3.8, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_a_alarm, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_a_alarm, 11, 0.6, 2, brow_AddAnnot( nc_a_alarm, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_a_alarm, 13, 0.6, 3, brow_AddAnnot( nc_a_alarm, 13.5, 0.6, 3,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1);
brow_AddAnnot( nc_a_alarm, 29, 0.6, 4, brow_AddAnnot( nc_a_alarm, 29.5, 0.6, 4,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1);
brow_AddFrame( nc_a_alarm, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_a_alarm, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -455,13 +538,14 @@ void EvListBrow::create_nodeclasses() ...@@ -455,13 +538,14 @@ void EvListBrow::create_nodeclasses()
brow_AddAnnotPixmap( nc_b_alarm, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_b_alarm, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_b_alarm, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_b_alarm, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmapButton( nc_b_alarm, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmapButton( nc_b_alarm, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_b_alarm, 4.3, 0.6, 1, brow_AddAnnotPixmap( nc_b_alarm, 3, 3.8, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_b_alarm, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_b_alarm, 11, 0.6, 2, brow_AddAnnot( nc_b_alarm, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_b_alarm, 13, 0.6, 3, brow_AddAnnot( nc_b_alarm, 13.5, 0.6, 3,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1);
brow_AddAnnot( nc_b_alarm, 29, 0.6, 4, brow_AddAnnot( nc_b_alarm, 29.5, 0.6, 4,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1);
brow_AddFrame( nc_b_alarm, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_b_alarm, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -475,13 +559,13 @@ void EvListBrow::create_nodeclasses() ...@@ -475,13 +559,13 @@ void EvListBrow::create_nodeclasses()
brow_AddAnnotPixmap( nc_info, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_info, 0, 1.6, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_info, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmap( nc_info, 1, 2.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmapButton( nc_info, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0); brow_AddAnnotPixmapButton( nc_info, 2, 3.0, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_info, 4.3, 0.6, 1, brow_AddAnnot( nc_info, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_info, 11, 0.6, 2, brow_AddAnnot( nc_info, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_info, 13, 0.6, 3, brow_AddAnnot( nc_info, 13.5, 0.6, 3,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1);
brow_AddAnnot( nc_info, 29, 0.6, 4, brow_AddAnnot( nc_info, 29.5, 0.6, 4,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 1);
brow_AddFrame( nc_info, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_info, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -493,9 +577,9 @@ void EvListBrow::create_nodeclasses() ...@@ -493,9 +577,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_LineGray, 0, 0); brow_AddRect( nc_category, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_LineGray, 0, 0);
brow_AddAnnot( nc_category, 2.5, 0.6, 0, brow_AddAnnot( nc_category, 2.5, 0.6, 0,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category, 4.3, 0.6, 1, brow_AddAnnot( nc_category, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category, 11, 0.6, 2, brow_AddAnnot( nc_category, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -508,9 +592,9 @@ void EvListBrow::create_nodeclasses() ...@@ -508,9 +592,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category_a, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0); brow_AddRect( nc_category_a, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0);
brow_AddAnnot( nc_category_a, 2.5, 0.6, 0, brow_AddAnnot( nc_category_a, 2.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_a, 4.3, 0.6, 1, brow_AddAnnot( nc_category_a, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_a, 11, 0.6, 2, brow_AddAnnot( nc_category_a, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category_a, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category_a, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -523,9 +607,9 @@ void EvListBrow::create_nodeclasses() ...@@ -523,9 +607,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category_b, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0); brow_AddRect( nc_category_b, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0);
brow_AddAnnot( nc_category_b, 2.5, 0.6, 0, brow_AddAnnot( nc_category_b, 2.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_b, 4.3, 0.6, 1, brow_AddAnnot( nc_category_b, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_b, 11, 0.6, 2, brow_AddAnnot( nc_category_b, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category_b, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category_b, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -538,9 +622,9 @@ void EvListBrow::create_nodeclasses() ...@@ -538,9 +622,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category_c, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0); brow_AddRect( nc_category_c, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0);
brow_AddAnnot( nc_category_c, 2.5, 0.6, 0, brow_AddAnnot( nc_category_c, 2.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_c, 4.3, 0.6, 1, brow_AddAnnot( nc_category_c, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_c, 11, 0.6, 2, brow_AddAnnot( nc_category_c, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category_c, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category_c, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -553,9 +637,9 @@ void EvListBrow::create_nodeclasses() ...@@ -553,9 +637,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category_d, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0); brow_AddRect( nc_category_d, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0);
brow_AddAnnot( nc_category_d, 2.5, 0.6, 0, brow_AddAnnot( nc_category_d, 2.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_d, 4.3, 0.6, 1, brow_AddAnnot( nc_category_d, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_d, 11, 0.6, 2, brow_AddAnnot( nc_category_d, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category_d, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category_d, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -568,9 +652,9 @@ void EvListBrow::create_nodeclasses() ...@@ -568,9 +652,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category_i, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0); brow_AddRect( nc_category_i, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0);
brow_AddAnnot( nc_category_i, 2.5, 0.6, 0, brow_AddAnnot( nc_category_i, 2.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_i, 4.3, 0.6, 1, brow_AddAnnot( nc_category_i, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_i, 11, 0.6, 2, brow_AddAnnot( nc_category_i, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category_i, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category_i, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
...@@ -583,9 +667,9 @@ void EvListBrow::create_nodeclasses() ...@@ -583,9 +667,9 @@ void EvListBrow::create_nodeclasses()
brow_AddRect( nc_category_flash, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0); brow_AddRect( nc_category_flash, 1.2, 0.15, 0.4, 0.4, flow_eDrawType_Line, 0, 0);
brow_AddAnnot( nc_category_flash, 2.5, 0.6, 0, brow_AddAnnot( nc_category_flash, 2.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_flash, 4.3, 0.6, 1, brow_AddAnnot( nc_category_flash, 4.8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddAnnot( nc_category_flash, 11, 0.6, 2, brow_AddAnnot( nc_category_flash, 11.5, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0); flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 0);
brow_AddFrame( nc_category_flash, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1); brow_AddFrame( nc_category_flash, 0, 0, 35, 0.83, flow_eDrawType_LineGray, -1, 1);
} }
...@@ -786,7 +870,7 @@ void EvList::event_info( mh_sMessage *msg) ...@@ -786,7 +870,7 @@ void EvList::event_info( mh_sMessage *msg)
new ItemAlarm( this, "Alarm", new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText, net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText,
event->Msg.EventName, event->Info.EventFlags, event->Msg.EventName, event->Info.EventType, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id, event->Info.EventPrio, event->Info.Id,
&event->Msg.Object, &event->Msg.EventSound, &event->Msg.Object, &event->Msg.EventSound,
event->Msg.EventMoreText, msg->Status, event->Msg.EventMoreText, msg->Status,
...@@ -832,7 +916,7 @@ void EvList::event_alarm( mh_sMessage *msg) ...@@ -832,7 +916,7 @@ void EvList::event_alarm( mh_sMessage *msg)
ItemAlarm *item = new ItemAlarm( this, "Alarm", ItemAlarm *item = new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText, net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText,
event->Msg.EventName, event->Info.EventFlags, event->Msg.EventName, event->Info.EventType, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id, event->Info.EventPrio, event->Info.Id,
&event->Msg.Object, &event->Msg.EventSound, &event->Msg.Object, &event->Msg.EventSound,
event->Msg.EventMoreText, msg->Status, event->Msg.EventMoreText, msg->Status,
...@@ -885,7 +969,7 @@ void EvList::event_block( mh_sBlock *msg) ...@@ -885,7 +969,7 @@ void EvList::event_block( mh_sBlock *msg)
new ItemAlarm( this, "Alarm", new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), event->Block.EventName, net_NetTimeToTime( &event->Info.EventTime), event->Block.EventName,
text, event->Info.EventFlags, text, event->Info.EventType, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id, event->Info.EventPrio, event->Info.Id,
&event->Block.Object, 0, 0, 0, evlist_eEventType_Block, &event->Block.Object, 0, 0, 0, evlist_eEventType_Block,
&event->Block.SupObject, dest_node, dest_code, &sts); &event->Block.SupObject, dest_node, dest_code, &sts);
...@@ -942,7 +1026,7 @@ void EvList::event_block( mh_sBlock *msg) ...@@ -942,7 +1026,7 @@ void EvList::event_block( mh_sBlock *msg)
ItemAlarm *item = new ItemAlarm( this, "Alarm", ItemAlarm *item = new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), text, net_NetTimeToTime( &event->Info.EventTime), text,
event->Block.EventName, event->Info.EventFlags, event->Block.EventName, event->Info.EventType, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id, event->Info.EventPrio, event->Info.Id,
&event->Block.Object, 0, 0, 0, evlist_eEventType_Block, &event->Block.Object, 0, 0, 0, evlist_eEventType_Block,
&event->Block.SupObject, dest_node, dest_code, &sts); &event->Block.SupObject, dest_node, dest_code, &sts);
...@@ -1028,7 +1112,7 @@ void EvList::event_ack( mh_sAck *msg) ...@@ -1028,7 +1112,7 @@ void EvList::event_ack( mh_sAck *msg)
} }
ItemAlarm *item = new ItemAlarm( this, "Alarm", ItemAlarm *item = new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), "", net_NetTimeToTime( &event->Info.EventTime), "",
event->Ack.EventName, event->Info.EventFlags, event->Ack.EventName, event->Info.EventType, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id, event->Info.EventPrio, event->Info.Id,
&event->Ack.Object, 0, 0, 0, evlist_eEventType_Ack, &event->Ack.Object, 0, 0, 0, evlist_eEventType_Ack,
&event->Ack.SupObject, dest_node, dest_code, &sts); &event->Ack.SupObject, dest_node, dest_code, &sts);
...@@ -1107,7 +1191,7 @@ void EvList::event_return( mh_sReturn *msg) ...@@ -1107,7 +1191,7 @@ void EvList::event_return( mh_sReturn *msg)
} }
ItemAlarm *item = new ItemAlarm( this, "Alarm", ItemAlarm *item = new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText, net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText,
event->Return.EventName, event->Info.EventFlags, event->Return.EventName, event->Info.EventType, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id, event->Info.EventPrio, event->Info.Id,
&event->Return.Object, 0, 0, 0, evlist_eEventType_Return, &event->Return.Object, 0, 0, 0, evlist_eEventType_Return,
&event->Return.SupObject, dest_node, dest_code, &sts); &event->Return.SupObject, dest_node, dest_code, &sts);
...@@ -1698,13 +1782,13 @@ int EvList::brow_cb( FlowCtx *ctx, flow_tEvent event) ...@@ -1698,13 +1782,13 @@ int EvList::brow_cb( FlowCtx *ctx, flow_tEvent event)
} }
ItemAlarm::ItemAlarm( EvList *item_evlist, const char *item_name, pwr_tTime item_time, ItemAlarm::ItemAlarm( EvList *item_evlist, const char *item_name, pwr_tTime item_time,
const char *item_eventtext, char *item_eventname, int item_eventflags, const char *item_eventtext, char *item_eventname, int item_eventtype, int item_eventflags,
unsigned long item_eventprio, mh_sEventId item_eventid, unsigned long item_eventprio, mh_sEventId item_eventid,
pwr_tAttrRef *item_object, pwr_tAttrRef *item_eventsound, char *item_eventmoretext, pwr_tAttrRef *item_object, pwr_tAttrRef *item_eventsound, char *item_eventmoretext,
unsigned long item_status, evlist_eEventType item_event_type, pwr_tAttrRef *item_supobject, unsigned long item_status, evlist_eEventType item_event_type, pwr_tAttrRef *item_supobject,
brow_tNode dest, flow_eDest dest_code, int *rsts): brow_tNode dest, flow_eDest dest_code, int *rsts):
event_type(item_event_type), evlist(item_evlist), tree_node(0), time(item_time), event_type(item_event_type), evlist(item_evlist), tree_node(0), time(item_time),
eventflags(item_eventflags), eventprio(item_eventprio), eventtype(item_eventtype), eventflags(item_eventflags), eventprio(item_eventprio),
eventid(item_eventid), object(*item_object), status(item_status), supobject(*item_supobject) eventid(item_eventid), object(*item_object), status(item_status), supobject(*item_supobject)
{ {
type = evlist_eItemType_Alarm; type = evlist_eItemType_Alarm;
...@@ -1899,6 +1983,15 @@ void ItemAlarm::update_text( int use_treenode) ...@@ -1899,6 +1983,15 @@ void ItemAlarm::update_text( int use_treenode)
if ( strcmp( eventmoretext, "") != 0) if ( strcmp( eventmoretext, "") != 0)
brow_SetAnnotPixmap( n, 2, evlist->browbase->pixmap_info); brow_SetAnnotPixmap( n, 2, evlist->browbase->pixmap_info);
switch ( eventtype) {
case mh_eEvent_SystemAlarm:
brow_SetAnnotPixmap( n, 3, evlist->browbase->pixmap_system);
break;
case mh_eEvent_MaintenanceAlarm:
brow_SetAnnotPixmap( n, 3, evlist->browbase->pixmap_maintenance);
break;
default: ;
}
} }
ItemCategory::ItemCategory( EvList *item_evlist, const char *item_name, pwr_sClass_AlarmCategory *cop, ItemCategory::ItemCategory( EvList *item_evlist, const char *item_name, pwr_sClass_AlarmCategory *cop,
...@@ -2844,7 +2937,7 @@ void EvList::copy_list( EvList* evl) ...@@ -2844,7 +2937,7 @@ void EvList::copy_list( EvList* evl)
switch( item->type) { switch( item->type) {
case evlist_eItemType_Alarm: case evlist_eItemType_Alarm:
new ItemAlarm( evl, item->name, new ItemAlarm( evl, item->name,
item->time, item->eventtext, item->eventname, item->eventflags, item->time, item->eventtext, item->eventname, item->eventtype, item->eventflags,
item->eventprio, item->eventid, &item->object, &item->eventsound, item->eventprio, item->eventid, &item->object, &item->eventsound,
item->eventmoretext, item->status, item->event_type, item->eventmoretext, item->status, item->event_type,
&item->supobject, 0, flow_eDest_IntoLast, &sts); &item->supobject, 0, flow_eDest_IntoLast, &sts);
......
xtt/lib/xtt/src/xtt_evlist.h
View file @ 6cf1f297
...@@ -167,6 +167,8 @@ class EvListBrow { ...@@ -167,6 +167,8 @@ class EvListBrow {
flow_sAnnotPixmap *pixmap_eventacked; flow_sAnnotPixmap *pixmap_eventacked;
flow_sAnnotPixmap *pixmap_eventreturn; flow_sAnnotPixmap *pixmap_eventreturn;
flow_sAnnotPixmap *pixmap_info; flow_sAnnotPixmap *pixmap_info;
flow_sAnnotPixmap *pixmap_maintenance;
flow_sAnnotPixmap *pixmap_system;
flow_sAnnotPixmap *pixmap_blockr; flow_sAnnotPixmap *pixmap_blockr;
flow_sAnnotPixmap *pixmap_blockl; flow_sAnnotPixmap *pixmap_blockl;
...@@ -280,7 +282,7 @@ class ItemEvBase { ...@@ -280,7 +282,7 @@ class ItemEvBase {
class ItemAlarm : public ItemEvBase { class ItemAlarm : public ItemEvBase {
public: public:
ItemAlarm( EvList *evlist, const char *item_name, pwr_tTime item_time, ItemAlarm( EvList *evlist, const char *item_name, pwr_tTime item_time,
const char *item_eventtext, char *item_eventname, int item_eventflags, const char *item_eventtext, char *item_eventname, int item_eventttype, int item_eventflags,
unsigned long item_eventprio, mh_sEventId item_eventid, unsigned long item_eventprio, mh_sEventId item_eventid,
pwr_tAttrRef *item_object, pwr_tAttrRef *item_eventsound, pwr_tAttrRef *item_object, pwr_tAttrRef *item_eventsound,
char *item_eventmoretext,unsigned long item_status, char *item_eventmoretext,unsigned long item_status,
...@@ -294,6 +296,7 @@ class ItemAlarm : public ItemEvBase { ...@@ -294,6 +296,7 @@ class ItemAlarm : public ItemEvBase {
pwr_tTime time; pwr_tTime time;
char eventtext[80]; char eventtext[80];
pwr_tAName eventname; pwr_tAName eventname;
int eventtype;
int eventflags; int eventflags;
unsigned long eventprio; unsigned long eventprio;
mh_sEventId eventid; mh_sEventId eventid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7