Skip to content

P
proview
Commit 027a8fa5 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Wb reference list for reference attributes added

parent 1c86c07f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 383 additions and 13 deletions
otherio/wbl/mcomp/src/otherio.wb_load
View file @ 027a8fa5
This diff is collapsed.
profibus/wbl/mcomp/src/profibus.wb_load
View file @ 027a8fa5
Volume Profibus $ClassVolume 0.0.250.7
Body SysBody 05-SEP-2005 17:51:40.00
Attr NextOix = "_X253"
Attr NextOix = "_X262"
Attr NextCix = "_X22"
Attr NextTix[0] = "_X14"
EndBody
......@@ -1644,6 +1644,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 262 02-MAY-2017 13:30:03.78
Body SysBody 02-MAY-2017 13:29:55.00
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object ConfiguratorPosnn $Menu 18 16-JAN-2006 09:46:40.50
Object Pointed $Menu 19 16-JAN-2006 09:46:40.50
Object ConfigureSlave $MenuButton 20 14-MAR-2006 07:38:53.51
......@@ -2103,6 +2108,11 @@ Volume Profibus $ClassVolume 0.0.250.7
Attr Process = 1
EndBody
EndObject
Object ThreadObject $ReferenceList 254 02-MAY-2017 13:27:20.02
Body SysBody 02-MAY-2017 13:27:39.87
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object ConfiguratorPoson $Menu 82 05-MAY-2006 15:41:43.54
Object Pointed $Menu 83 05-MAY-2006 15:41:43.54
Object ConnectThread $MenuButton 84 05-MAY-2006 15:41:43.54
......@@ -2541,6 +2551,11 @@ Volume Profibus $ClassVolume 0.0.250.7
Attr DataControlTime = 100
EndBody
EndObject
Object ThreadObject $ReferenceList 255 02-MAY-2017 13:28:23.09
Body SysBody 02-MAY-2017 13:28:23.09
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object IoMethods $RtMethod 48 16-JAN-2006 09:46:40.51
Object IoAgentInit $Method 49 16-JAN-2006 09:46:40.51
Body SysBody 16-JAN-2006 09:46:40.51
......@@ -2903,6 +2918,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 256 02-MAY-2017 13:28:39.87
Body SysBody 02-MAY-2017 13:28:39.87
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object IoMethods $RtMethod 110 09-DEC-2008 13:19:32.10
Object IoAgentInit $Method 111 09-DEC-2008 13:19:32.10
Body SysBody 09-DEC-2008 13:20:59.19
......@@ -3352,6 +3372,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 257 02-MAY-2017 13:28:55.45
Body SysBody 02-MAY-2017 13:28:55.45
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object IoMethods $RtMethod 116 21-APR-2009 13:41:08.17
Object IoAgentInit $Method 117 21-APR-2009 13:41:08.17
Body SysBody 21-APR-2009 13:41:08.17
......@@ -3657,6 +3682,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 258 02-MAY-2017 13:29:04.30
Body SysBody 02-MAY-2017 13:29:04.30
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object ConfiguratorPosnn $Menu 122 21-APR-2009 13:41:08.17
Object Pointed $Menu 123 21-APR-2009 13:41:08.17
Object ConfigureDevice $MenuButton 124 21-APR-2009 13:41:08.17
......@@ -3954,6 +3984,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 259 02-MAY-2017 13:29:14.23
Body SysBody 02-MAY-2017 13:29:14.23
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object ConfiguratorPoson $Menu 154 21-APR-2009 13:41:08.17
Object Pointed $Menu 155 21-APR-2009 13:41:08.17
Object ConnectThread $MenuButton 156 21-APR-2009 13:41:08.17
......@@ -4243,6 +4278,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 260 02-MAY-2017 13:29:29.13
Body SysBody 02-MAY-2017 13:29:29.13
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object ConfiguratorPoson $Menu 219 14-AUG-2014 13:10:10.59
Object Pointed $Menu 220 14-AUG-2014 13:10:10.59
Object ConnectThread $MenuButton 221 14-AUG-2014 13:10:10.59
......@@ -4461,6 +4501,11 @@ Volume Profibus $ClassVolume 0.0.250.7
EndBody
EndObject
EndObject
Object ThreadObject $ReferenceList 261 02-MAY-2017 13:29:37.11
Body SysBody 02-MAY-2017 13:29:37.11
Attr ObjectClass[0] = "pwrb:Class-PlcThread"
EndBody
EndObject
Object ConfiguratorPoson $Menu 228 14-AUG-2014 15:41:08.64
Object Pointed $Menu 229 14-AUG-2014 15:41:08.64
Object ConnectThread $MenuButton 230 14-AUG-2014 15:41:08.64
......
src/exp/inc/src/pwr.h
View file @ 027a8fa5
......@@ -526,7 +526,8 @@ typedef enum {
pwr_mRefListFilterMask_Siblings = 16,
pwr_mRefListFilterMask_AttrObjects = 32,
pwr_mRefListFilterMask_PwrsVolume = 64,
pwr_mRefListFilterMask_Other = 128
pwr_mRefListFilterMask_Other = 128,
pwr_mRefListFilterMask_Children = 256
} pwr_mRefListFilterMask;
typedef pwr_tMask pwr_tRefListFilterMask; //!< Reference list filter Mask.
......
src/wbl/pwrb/src/pwrb_c_buildconfig.wb_load
View file @ 027a8fa5
......@@ -112,6 +112,19 @@ SObject pwrb:Class
Attr TypeRef = "pwrs:Type-$String80"
EndBody
EndObject
!/**
! Version manager.
!*/
Object VersionManager $Attribute 2
Body SysBody
Attr TypeRef = "pwrb:Type-VersionManagerEnum"
EndBody
EndObject
EndObject
Object Template BuildConfig
Body DevBody
Attr VersionManager = 1
EndBody
EndObject
EndObject
EndSObject
src/wbl/pwrb/src/pwrb_c_dsfastcurve.wb_load
View file @ 027a8fa5
......@@ -400,6 +400,24 @@ SObject pwrb:Class
Attr NoOfPoints = 100
EndBody
EndObject
Object Buffers $ReferenceList
Body SysBody
Attr ObjectClass[0] = pwr_cClass_Buff256
Attr ObjectClass[1] = pwr_cClass_Buff1440
Attr ObjectClass[2] = pwr_cClass_Buff4096
Attr ObjectClass[3] = pwr_cClass_Buff32k
Attr Filter = 384
EndBody
EndObject
Object TimeBuffer $ReferenceList
Body SysBody
Attr ObjectClass[0] = pwr_cClass_Buff256
Attr ObjectClass[1] = pwr_cClass_Buff1440
Attr ObjectClass[2] = pwr_cClass_Buff4096
Attr ObjectClass[3] = pwr_cClass_Buff32k
Attr Filter = 384
EndBody
EndObject
EndObject
EndSObject
......
src/wbl/pwrb/src/pwrb_c_dstrendcurve.wb_load
View file @ 027a8fa5
......@@ -293,6 +293,28 @@ SObject pwrb:Class
Attr DisplayUpdateTime = 1
EndBody
EndObject
Object Buffers $ReferenceList
Body SysBody
Attr ObjectClass[0] = pwr_cClass_CircBuff1k
Attr ObjectClass[1] = pwr_cClass_CircBuff2k
Attr ObjectClass[2] = pwr_cClass_CircBuff10k
Attr ObjectClass[3] = pwr_cClass_CircBuff20k
Attr ObjectClass[4] = pwr_cClass_CircBuff100k
Attr ObjectClass[5] = pwr_cClass_CircBuff200k
Attr Filter = 384
EndBody
EndObject
Object TimeBuffer $ReferenceList
Body SysBody
Attr ObjectClass[0] = pwr_cClass_CircBuff1k
Attr ObjectClass[1] = pwr_cClass_CircBuff2k
Attr ObjectClass[2] = pwr_cClass_CircBuff10k
Attr ObjectClass[3] = pwr_cClass_CircBuff20k
Attr ObjectClass[4] = pwr_cClass_CircBuff100k
Attr ObjectClass[5] = pwr_cClass_CircBuff200k
Attr Filter = 384
EndBody
EndObject
EndObject
EndSObject
......
src/wbl/pwrb/src/pwrb_c_plcpgm.wb_load
View file @ 027a8fa5
......@@ -195,6 +195,12 @@ SObject pwrb:Class
Attr Filter = 1
EndBody
EndObject
Object ResetObject $ReferenceList
Body SysBody
Attr ObjectClass[0] = "pwrb:Class-Dv"
Attr Filter = 145
EndBody
EndObject
Object NavigatorPosnn $Menu
Object Pointed $Menu
Object OpenProgram $MenuButton
......
src/wbl/pwrs/src/pwrs_c_planthier.wb_load
View file @ 027a8fa5
......@@ -169,6 +169,21 @@ SObject pwrs:Class
EndBody
EndObject
EndObject
Object DefGraph $ReferenceList
Body SysBody
Attr ObjectClass[0] = pwr_cClass_XttGraph
Attr ObjectClass[1] = pwr_cClass_XttMultiView
Attr ObjectClass[2] = pwr_cClass_XttCamera
Attr Filter = 129
EndBody
EndObject
Object DefTrend $ReferenceList
Body SysBody
Attr ObjectClass[0] = pwr_cClass_DsTrendCurve
Attr ObjectClass[1] = pwr_cClass_DsTrend
Attr Filter = 161
EndBody
EndObject
Object NavigatorPosnn $Menu
Object Pointed $Menu
Object Build $MenuButton
......
src/wbl/pwrs/src/pwrs_c_referencelist.wb_load
View file @ 027a8fa5
......@@ -62,7 +62,7 @@ SObject pwrs:Class
Body SysBody
Attr TypeRef = "pwrs:Type-$ClassId"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 5
Attr Elements = 10
EndBody
EndObject
!/**
......
src/wbl/pwrs/src/pwrs_td_reflistfiltermask.wb_load
View file @ 027a8fa5
......@@ -130,6 +130,16 @@ SObject pwrs:Type
Attr Value = 128
EndBody
EndObject
!/**
! List references that are children
!*/
Object Children $Bit
Body SysBody
Attr PgmName = "Children"
Attr Text = "Children"
Attr Value = 256
EndBody
EndObject
EndObject
EndSObject
......
wb/lib/wb/src/wb_wnav_item.cpp
View file @ 027a8fa5
......@@ -1766,6 +1766,18 @@ int WItemAttr::open_children( double x, double y)
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_Children) {
// Check if object are children
wb_object co = sp->object( aref.Objid);
if ( !co) continue;
wb_object p1 = co.parent();
if ( !p1) continue;
if (cdh_ObjidIsNotEqual( p1.oid(), o.oid()))
continue;
}
wb_attribute ca = sp->attribute( &aref);
if ( listbody.Filter & pwr_mRefListFilterMask_AllVolumes)
nametype = cdh_mName_volumeStrict;
......@@ -1794,6 +1806,15 @@ int WItemAttr::open_children( double x, double y)
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_Children) {
// Check if object are children
wb_object p1 = co.parent();
if ( !p1) continue;
if (cdh_ObjidIsNotEqual( p1.oid(), o.oid()))
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_AllVolumes)
nametype = cdh_mName_volumeStrict;
else
......@@ -3340,12 +3361,18 @@ int WItemAttrArrayElem::open_children( double x, double y)
if ( type_id == pwr_eType_Objid) {
brow_SetNodraw( brow->ctx);
if ( listbody.Filter & pwr_mRefListFilterMask_Other)
new WItemEnumObject( brow, ldhses, objid, (char *)"Other", attr,
item_eType_Other, tid,
size, flags, body, &objid, 0, 0,
idx++, node, flow_eDest_IntoLast);
for ( wb_object co = sp->object( listbody.ObjectClass[0]);
co;
co = co.next()) {
if ( listbody.Filter & pwr_mRefListFilterMask_Siblings) {
// Check if object are siblings
// Check if objects are siblings
wb_object p1 = o.parent();
wb_object p2 = co.parent();
if ( (!p1 && !p2) ||
......@@ -3353,6 +3380,15 @@ int WItemAttrArrayElem::open_children( double x, double y)
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_Children) {
// Check if object is child
wb_object p1 = co.parent();
if ( !p1) continue;
if ( cdh_ObjidIsNotEqual( p1.oid(), o.oid()))
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_AllVolumes)
nametype = cdh_mName_volumeStrict;
else
......@@ -3373,6 +3409,12 @@ int WItemAttrArrayElem::open_children( double x, double y)
brow_SetNodraw( brow->ctx);
if ( listbody.Filter & pwr_mRefListFilterMask_Other)
new WItemEnumObject( brow, ldhses, objid, (char *)"Other", attr,
item_eType_Other, tid,
size, flags, body, &objid, 0, 0,
idx++, node, flow_eDest_IntoLast);
for ( unsigned int i = 0; i < sizeof(listbody.ObjectClass)/sizeof(listbody.ObjectClass[0]); i++) {
if ( listbody.ObjectClass[i] == 0)
break;
......@@ -3394,6 +3436,18 @@ int WItemAttrArrayElem::open_children( double x, double y)
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_Children) {
// Check if object is child
wb_object co = sp->object( aref.Objid);
if ( !co) continue;
wb_object p1 = co.parent();
if ( !p1) continue;
if ( cdh_ObjidIsNotEqual( p1.oid(), o.oid()))
continue;
}
wb_attribute ca = sp->attribute( &aref);
if ( listbody.Filter & pwr_mRefListFilterMask_AllVolumes)
nametype = cdh_mName_volumeStrict;
......@@ -3422,6 +3476,15 @@ int WItemAttrArrayElem::open_children( double x, double y)
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_Children) {
// Check if object is child
wb_object p1 = co.parent();
if ( !p1) continue;
if ( cdh_ObjidIsNotEqual( p1.oid(), o.oid()))
continue;
}
if ( listbody.Filter & pwr_mRefListFilterMask_AllVolumes)
nametype = cdh_mName_volumeStrict;
else
......@@ -3821,7 +3884,6 @@ WItemEnumObject::WItemEnumObject(
attr_type_id, attr_tid, attr_size, attr_flags, attr_body),
is_element(item_is_element), element(item_element)
{
ldh_sSessInfo info;
type = wnav_eItemType_EnumObject;
switch ( type_id) {
......@@ -3846,14 +3908,17 @@ WItemEnumObject::WItemEnumObject(
brow_CreateNode( brow->ctx, enum_name, brow->nc_enumobject,
dest, dest_code, (void *) this, 1, &node);
brow_SetAnnotPixmap( node, 0, brow->pixmap_attr);
// brow_SetAnnotPixmap( node, 0, brow->pixmap_attr);
brow_SetAnnotation( node, 0, enum_name, strlen(enum_name));
// Examine access
#if 0
ldh_sSessInfo info;
ldh_GetSessionInfo( ldhses, &info);
if ( info.Access == ldh_eAccess_ReadWrite &&
!(flags & PWR_MASK_NOEDIT || flags & PWR_MASK_STATE))
brow_SetAnnotPixmap( node, 1, brow->pixmap_morehelp);
#endif
update();
}
......
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