Commit f2410197 authored by claes's avatar claes

Show device table on attribute object channels and signals

parent 5e4fc084
/* /*
* Proview $Id: xtt_item.cpp,v 1.15 2005-12-06 10:52:08 claes Exp $ * Proview $Id: xtt_item.cpp,v 1.16 2006-06-15 12:17:40 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -1836,10 +1836,10 @@ int ItemChannel::open_children( XNavBrow *brow, double x, double y) ...@@ -1836,10 +1836,10 @@ int ItemChannel::open_children( XNavBrow *brow, double x, double y)
XNav *xnav = (XNav *) brow->userdata; XNav *xnav = (XNav *) brow->userdata;
if ( cdh_ObjidIsNull( objid)) if ( cdh_ObjidIsNull( objid) || cdh_ObjidIsNull( signal_aref.Objid))
return 1; return 1;
return xnav->show_object( signal_objid, node); return xnav->show_object( &signal_aref, node);
} }
int ItemChannel::open_crossref( XNavBrow *brow, double x, double y) int ItemChannel::open_crossref( XNavBrow *brow, double x, double y)
...@@ -1855,7 +1855,7 @@ int ItemChannel::open_crossref( XNavBrow *brow, double x, double y) ...@@ -1855,7 +1855,7 @@ int ItemChannel::open_crossref( XNavBrow *brow, double x, double y)
else else
xnav = 0; xnav = 0;
if ( cdh_ObjidIsNull( signal_objid)) if ( cdh_ObjidIsNull( signal_aref.Objid))
return 1; return 1;
if ( !is_root) if ( !is_root)
...@@ -1882,7 +1882,7 @@ int ItemChannel::open_crossref( XNavBrow *brow, double x, double y) ...@@ -1882,7 +1882,7 @@ int ItemChannel::open_crossref( XNavBrow *brow, double x, double y)
crossref_exist = 0; crossref_exist = 0;
brow_SetNodraw( brow->ctx); brow_SetNodraw( brow->ctx);
sts = gdh_ObjidToName( signal_objid, signal_name, sizeof(signal_name), sts = gdh_AttrrefToName( &signal_aref, signal_name, sizeof(signal_name),
cdh_mNName); cdh_mNName);
sts = xnav_crr_signal( brow, NULL, signal_name, node); sts = xnav_crr_signal( brow, NULL, signal_name, node);
......
/* /*
* Proview $Id: xtt_item.h,v 1.11 2006-05-21 22:30:50 lw Exp $ * Proview $Id: xtt_item.h,v 1.12 2006-06-15 12:17:40 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -419,7 +419,7 @@ class ItemChannel : public ItemTable { ...@@ -419,7 +419,7 @@ class ItemChannel : public ItemTable {
tab_change_value_idx, tab_min_limit, tab_max_limit, tab_change_value_idx, tab_min_limit, tab_max_limit,
relative_pos, dest, dest_code) relative_pos, dest, dest_code)
{ type = xnav_eItemType_Channel;}; { type = xnav_eItemType_Channel;};
pwr_tObjid signal_objid; pwr_tAttrRef signal_aref;
int open_children( XNavBrow *brow, double x, double y); int open_children( XNavBrow *brow, double x, double y);
int open_crossref( XNavBrow *brow, double x, double y); int open_crossref( XNavBrow *brow, double x, double y);
}; };
......
/* /*
* Proview $Id: xtt_xnav.h,v 1.17 2006-04-12 12:19:08 claes Exp $ * Proview $Id: xtt_xnav.h,v 1.18 2006-06-15 12:17:40 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -440,7 +440,7 @@ class XNav { ...@@ -440,7 +440,7 @@ class XNav {
int show_subcli(); int show_subcli();
int show_device(); int show_device();
int show_channels( pwr_tObjid card_objid); int show_channels( pwr_tObjid card_objid);
int show_object( pwr_tObjid objid, brow_tNode node); int show_object( pwr_tAttrRef *oarp, brow_tNode node);
int show_remnode(); int show_remnode();
int show_remtrans( pwr_tObjid remnode_objid); int show_remtrans( pwr_tObjid remnode_objid);
int show_plcpgm(); int show_plcpgm();
......
This diff is collapsed.
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