Skip to content

P
proview
Commit 9f068076 authored by claes's avatar claes
Browse files
Options

Enum and Mask displayed in xtt

parent 779272bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 404 additions and 155 deletions
xtt/lib/xtt/src/xtt_item.cpp
View file @ 9f068076
This diff is collapsed.
xtt/lib/xtt/src/xtt_item.h
View file @ 9f068076
......@@ -54,7 +54,9 @@ typedef enum {
xnav_eItemType_HelpBold,
xnav_eItemType_HelpHeader,
xnav_eItemType_ObjectStruct,
xnav_eItemType_AttrObject
xnav_eItemType_AttrObject,
xnav_eItemType_Enum,
xnav_eItemType_Mask
} xnav_eItemType;
typedef enum {
......@@ -115,14 +117,19 @@ class Item {
class ItemBaseAttr : public Item {
public:
ItemBaseAttr( pwr_tObjid item_objid,
char *attr_name, int attr_type_id, int attr_size, int attr_flags,
char *attr_name, int attr_type_id, pwr_tTid attr_tid,
int attr_size, int attr_flags,
int item_is_root, item_eDisplayType item_display_type) :
Item( item_objid, item_is_root),
type_id(attr_type_id), size(attr_size), flags(attr_flags),
type_id(attr_type_id), tid(attr_tid), size(attr_size), flags(attr_flags),
subid(pwr_cNSubid), first_scan(1), display_type(item_display_type)
{ strcpy( attr, attr_name);
memset( old_value, 0, sizeof(old_value));};
virtual int open_children( XNavBrow *brow, double x, double y);
virtual void close( XNavBrow *brow, double x, double y);
int type_id;
pwr_tTid tid;
int size;
int flags;
pwr_tSubid subid;
......@@ -224,6 +231,10 @@ class ItemObject : public ItemBaseObject {
public:
ItemObject( XNavBrow *brow, pwr_tObjid item_objid,
brow_tNode dest, flow_eDest dest_code, int item_is_root);
pwr_tUInt32 alarm_level;
pwr_tUInt32 max_alarm_level;
pwr_tUInt32 block_level;
pwr_tUInt32 max_block_level;
};
......@@ -231,7 +242,8 @@ class ItemAttr : public ItemBaseAttr {
public:
ItemAttr( XNavBrow *brow, pwr_tObjid item_objid,
brow_tNode dest, flow_eDest dest_code,
char *attr_name, int attr_type_id, int attr_size, int attr_flags,
char *attr_name, int attr_type_id, pwr_tTid attr_tid,
int attr_size, int attr_flags,
int item_is_root, item_eDisplayType item_display_type);
};
......@@ -239,11 +251,12 @@ class ItemAttrArray : public Item {
public:
int elements;
int type_id;
pwr_tTid tid;
int size;
int flags;
ItemAttrArray( XNavBrow *brow, pwr_tObjid item_objid,
brow_tNode dest, flow_eDest dest_code,
char *attr_name, int attr_elements, int attr_type_id,
char *attr_name, int attr_elements, int attr_type_id, pwr_tTid attr_tid,
int attr_size, int attr_flags, int item_is_root);
int open_children( XNavBrow *brow, double x, double y) {return 1;};
int open_attributes( XNavBrow *brow, double x, double y);
......@@ -255,7 +268,7 @@ class ItemAttrArrayElem : public ItemBaseAttr {
int element;
ItemAttrArrayElem( XNavBrow *brow, pwr_tObjid item_objid,
brow_tNode dest, flow_eDest dest_code,
char *attr_name, int attr_element, int attr_type_id,
char *attr_name, int attr_element, int attr_type_id, pwr_tTid attr_tid,
int attr_size, int attr_flags, int item_is_root, item_eDisplayType item_display_type);
};
......@@ -277,7 +290,7 @@ class ItemAttrObject : public Item {
class ItemCollect : public ItemBaseAttr {
public:
ItemCollect( XNavBrow *brow, pwr_tObjid item_objid, char *attr_name,
brow_tNode dest, flow_eDest dest_code, int attr_type_id,
brow_tNode dest, flow_eDest dest_code, int attr_type_id, pwr_tTid attr_tid,
int attr_size, int item_is_root);
};
......@@ -442,6 +455,44 @@ class ItemPlc : public ItemTable {
int open_children( XNavBrow *brow, double x, double y);
};
class ItemEnum : public ItemBaseAttr {
public:
ItemEnum::ItemEnum(
XNavBrow *brow,
pwr_tObjid item_objid,
brow_tNode dest, flow_eDest dest_code,
char *attr_enum_name, char *attr_name,
int attr_type_id, pwr_tTid attr_tid,
int attr_size, int attr_flags,
unsigned int item_num, int item_is_element, int item_element);
int set_value();
int num;
char enum_name[32];
int is_element;
int element;
};
class ItemMask : public ItemBaseAttr {
public:
ItemMask::ItemMask(
XNavBrow *brow,
pwr_tObjid item_objid,
brow_tNode dest, flow_eDest dest_code,
char *attr_enum_name, char *attr_name,
int attr_type_id, pwr_tTid attr_tid,
int attr_size, int attr_flags,
unsigned int item_num, int item_is_element, int item_element);
int set_value( int bittrue);
int toggle_value();
int num;
char mask_name[32];
int is_element;
int element;
};
#if defined __cplusplus
}
#endif
......
xtt/lib/xtt/src/xtt_xatt.cpp
View file @ 9f068076
......@@ -487,7 +487,7 @@ XAtt::XAtt(
objar(*xa_objar),
input_open(0), input_multiline(0),
close_cb(0), redraw_cb(0), client_data(0),
set_focus_disabled(0)
set_focus_disabled(0), value_current_recall(0)
{
char uid_filename[120] = {"xtt_xatt.uid"};
char *uid_filename_p = uid_filename;
......
xtt/lib/xtt/src/xtt_xattnav.cpp
View file @ 9f068076
......@@ -415,53 +415,38 @@ static int xattnav_brow_cb( FlowCtx *ctx, flow_tEvent event)
{
brow_tNode *node_list;
int node_count;
pwr_tStatus sts;
brow_GetSelectedNodes( xattnav->brow->ctx, &node_list, &node_count);
if ( !node_count)
return 1;
brow_GetUserData( node_list[0], (void **)&item);
switch( item->type)
{
case xnav_eItemType_Attr:
if ( xattnav->advanced_user && xattnav->change_value_cb)
(xattnav->change_value_cb)( xattnav->parent_ctx);
break;
case xnav_eItemType_AttrArrayElem:
if ( xattnav->advanced_user && xattnav->change_value_cb)
(xattnav->change_value_cb)( xattnav->parent_ctx);
break;
case xnav_eItemType_AttrArray:
((ItemAttrArray *)item)->open_attributes( xattnav->brow, 0, 0);
break;
case xnav_eItemType_AttrObject:
((ItemAttrObject *)item)->open_attributes( xattnav->brow, 0, 0);
break;
#if 0
case xnav_eItemType_Enum:
{
int value;
if ( !xattnav->advanced_user)
break;
brow_GetRadiobutton( node_list[0], 0, &value);
if ( !value)
((ItemEnum *)item)->set();
break;
}
case xnav_eItemType_Mask:
{
int value;
if ( !xattnav->advanced_user)
break;
brow_GetRadiobutton( node_list[0], 0, &value);
((ItemMask *)item)->set( !value);
break;
}
#endif
default:
;
switch( item->type) {
case xnav_eItemType_Attr:
case xnav_eItemType_AttrArrayElem:
sts = item->open_children( xattnav->brow, 0, 0);
if (ODD(sts)) break;
if ( xattnav->advanced_user && xattnav->change_value_cb)
(xattnav->change_value_cb)( xattnav->parent_ctx);
break;
case xnav_eItemType_AttrArray:
((ItemAttrArray *)item)->open_attributes( xattnav->brow, 0, 0);
break;
case xnav_eItemType_AttrObject:
((ItemAttrObject *)item)->open_attributes( xattnav->brow, 0, 0);
break;
case xnav_eItemType_Enum:
if ( xattnav->advanced_user)
((ItemEnum *)item)->set_value();
break;
case xnav_eItemType_Mask:
if ( xattnav->advanced_user)
((ItemMask *)item)->toggle_value();
break;
default:
;
}
free( node_list);
break;
......@@ -513,26 +498,21 @@ static int xattnav_brow_cb( FlowCtx *ctx, flow_tEvent event)
{
case flow_eObjectType_Node:
brow_GetUserData( event->object.object, (void **)&item);
switch( item->type)
{
#if 0
case xnav_eItemType_Enum:
if ( !event->radiobutton.value)
((ItemEnum *)item)->set();
break;
case xnav_eItemType_Mask:
((ItemMask *)item)->set( !event->radiobutton.value);
break;
#endif
default:
;
switch( item->type) {
case xnav_eItemType_Enum:
if ( !event->radiobutton.value)
((ItemEnum *)item)->set_value();
break;
case xnav_eItemType_Mask:
((ItemMask *)item)->set_value( !event->radiobutton.value);
break;
default:
;
}
break;
default:
;
}
break;
}
case flow_eEvent_Map:
......@@ -563,6 +543,8 @@ static int xattnav_trace_connect_bc( brow_tObject object, char *name,
switch( base_item->type)
{
case xnav_eItemType_Attr:
case xnav_eItemType_Enum:
case xnav_eItemType_Mask:
case xnav_eItemType_AttrArrayElem:
{
ItemAttr *item;
......@@ -632,11 +614,49 @@ static int xattnav_trace_scan_bc( brow_tObject object, void *p)
else
item->first_scan = 0;
xnav_attrvalue_to_string( item->type_id, p, buf, sizeof(buf), &len, NULL);
xnav_attrvalue_to_string( item->type_id, item->tid, p, buf, sizeof(buf), &len, NULL);
brow_SetAnnotation( object, 1, buf, len);
memcpy( item->old_value, p, min(item->size, (int) sizeof(item->old_value)));
break;
}
case xnav_eItemType_Enum: {
ItemEnum *item;
item = (ItemEnum *)base_item;
if ( !item->first_scan) {
if ( memcmp( item->old_value, p, sizeof(pwr_tEnum)) == 0)
// No change since last time
return 1;
}
else
item->first_scan = 0;
if ( *(pwr_tEnum *)p == item->num)
brow_SetRadiobutton( object, 0, 1);
else
brow_SetRadiobutton( object, 0, 0);
memcpy( item->old_value, p, sizeof(pwr_tEnum));
break;
}
case xnav_eItemType_Mask: {
ItemMask *item;
item = (ItemMask *)base_item;
if ( !item->first_scan) {
if ( memcmp( item->old_value, p, sizeof(pwr_tMask)) == 0)
// No change since last time
return 1;
}
else
item->first_scan = 0;
if ( *(pwr_tMask *)p & item->num)
brow_SetRadiobutton( object, 0, 1);
else
brow_SetRadiobutton( object, 0, 0);
memcpy( item->old_value, p, sizeof(pwr_tMask));
break;
}
default:
;
}
......@@ -746,6 +766,7 @@ int XAttNav::object_attr()
name,
bd[i].attr->Param.Info.Elements,
bd[i].attr->Param.Info.Type,
bd[i].attr->Param.TypeRef,
bd[i].attr->Param.Info.Size,
bd[i].attr->Param.Info.Flags, 0);
}
......@@ -764,6 +785,7 @@ int XAttNav::object_attr()
flow_eDest_IntoLast,
name,
bd[i].attr->Param.Info.Type,
bd[i].attr->Param.TypeRef,
bd[i].attr->Param.Info.Size,
bd[i].attr->Param.Info.Flags, 0,
item_eDisplayType_Attr);
......
xtt/lib/xtt/src/xtt_xnav_tables.cpp
View file @ 9f068076
......@@ -1086,21 +1086,13 @@ int XNav::show_object( pwr_tObjid objid, brow_tNode node)
else
{
int sts;
pwr_tObjid parameter;
char classname[80];
char hiername[80];
char parname[80];
char fullname[80];
char *s;
pwr_tClassId classid;
unsigned long elements;
pwr_sParInfo parinfo;
pwr_tObjid body;
pwr_tClassId parameter_class;
gdh_sAttrDef *bd;
int rows;
Item *item;
int attr_exist;
int i, j;
int i;
if ( brow_IsOpen( node) & xnav_mOpen_Children ||
brow_IsOpen( node) & xnav_mOpen_Crossref)
......@@ -1118,85 +1110,46 @@ int XNav::show_object( pwr_tObjid objid, brow_tNode node)
// Create some attributes
brow_SetNodraw( brow->ctx);
// Get objid for rtbody or sysbody
sts = gdh_GetObjectClass ( objid, &classid);
if ( EVEN(sts)) return sts;
sts = gdh_ObjidToName ( cdh_ClassIdToObjid(classid), classname,
sizeof(classname), cdh_mName_volumeStrict);
// Get attributes for this class
sts = gdh_GetObjectBodyDef( classid, &bd, &rows);
if ( EVEN(sts)) return sts;
attr_exist = 0;
for ( j = 0; j < 2; j++)
{
strcpy( hiername, classname);
if ( j == 0)
strcat( hiername, "-RtBody");
else
strcat( hiername, "-SysBody");
sts = gdh_NameToObjid( hiername, &body);
if ( EVEN(sts))
continue;
for ( i = 0; i < rows; i++) {
// Get first attribute of the body
i = 0;
sts = gdh_GetChild( body, &parameter);
while ( ODD(sts))
{
sts = gdh_ObjidToName ( parameter, hiername, sizeof(hiername),
cdh_mName_volumeStrict);
if ( EVEN(sts)) return sts;
/* Skip hierarchy */
s = strrchr( hiername, '-');
if ( s == 0)
strcpy( parname, hiername);
else
strcpy( parname, s + 1);
/* Get parameter info for this parameter */
strcpy( fullname, hiername);
sts = gdh_GetObjectInfo( fullname, &parinfo, sizeof(parinfo));
if (EVEN(sts)) return sts;
sts = gdh_GetObjectClass( parameter, &parameter_class);
if ( EVEN(sts)) return sts;
if ( parinfo.Flags & PWR_MASK_RTVIRTUAL ||
parinfo.Flags & PWR_MASK_PRIVATE)
{
/* This parameter does not contain any useful information, take the
next one */
sts = gdh_GetNextSibling ( parameter, &parameter);
i++;
continue;
}
if ( bd[i].attr->Param.Info.Flags & PWR_MASK_RTVIRTUAL ||
bd[i].attr->Param.Info.Flags & PWR_MASK_PRIVATE)
continue;
elements = 1;
if ( parinfo.Flags & PWR_MASK_ARRAY )
{
elements = 1;
if ( bd[i].attr->Param.Info.Flags & PWR_MASK_ARRAY ) {
attr_exist = 1;
item = (Item *) new ItemAttrArray( brow, objid, node,
flow_eDest_IntoLast,
parname,
parinfo.Elements,
parinfo.Type, parinfo.Size, parinfo.Flags, 0);
}
else
{
attr_exist = 1;
item = (Item *) new ItemAttr( brow, objid, node,
flow_eDest_IntoLast, parname,
parinfo.Type, parinfo.Size, parinfo.Flags, 0, item_eDisplayType_Attr);
}
sts = gdh_GetNextSibling ( parameter, &parameter);
i++;
flow_eDest_IntoLast,
bd[i].attrName,
bd[i].attr->Param.Info.Elements,
bd[i].attr->Param.Info.Type,
bd[i].attr->Param.TypeRef,
bd[i].attr->Param.Info.Size,
bd[i].attr->Param.Info.Flags, 0);
}
else {
attr_exist = 1;
item = (Item *) new ItemAttr( brow, objid, node,
flow_eDest_IntoLast,
bd[i].attrName,
bd[i].attr->Param.Info.Type,
bd[i].attr->Param.TypeRef,
bd[i].attr->Param.Info.Size,
bd[i].attr->Param.Info.Flags, 0,
item_eDisplayType_Attr);
}
}
if ( attr_exist)
{
free( (char *)bd);
if ( attr_exist) {
brow_SetOpen( node, xnav_mOpen_Attributes);
brow_SetAnnotPixmap( node, 1, brow->pixmap_openattr);
}
......
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