Skip to content

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

Objects in mounted volumes has to use its own metavolumes

parent 797be048
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 34 deletions
wb/lib/wb/src/wb_ldh.cpp
View file @ e18e4469
/*
* Proview $Id: wb_ldh.cpp,v 1.58 2007-04-26 12:39:50 claes Exp $
* Proview $Id: wb_ldh.cpp,v 1.59 2007-08-27 09:32:45 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -2164,6 +2164,27 @@ ldh_AttributeDisabled(ldh_tSession session, pwr_sAttrRef *arp, pwr_tDisableAttr
return LDH__SUCCESS;
}
int
ldh_ExternObject(ldh_tSession session, pwr_tOid oid)
{
return oid.vid != ((wb_session *)session)->vid();
}
pwr_tStatus
ldh_OpenMntSession(ldh_tSession session, pwr_tOid oid, ldh_tSession *mntses)
{
wb_session *sp = (wb_session*)session;
wb_object o = sp->object(oid);
if (!o) return o.sts();
wb_vrep *vrep = ((wb_orep *)o)->vrep();
wb_volume *v = new wb_volume( vrep);
wb_session *s = new wb_session( *v);
*mntses = (ldh_tSession) s;
return LDH__SUCCESS;
}
#endif
......
wb/lib/wb/src/wb_ldh.h
View file @ e18e4469
/*
* Proview $Id: wb_ldh.h,v 1.37 2007-01-04 07:29:03 claes Exp $
* Proview $Id: wb_ldh.h,v 1.38 2007-08-27 09:32:45 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -1225,6 +1225,20 @@ ldh_AttributeDisabled(
pwr_tDisableAttr *disabled
);
int
ldh_ExternObject(
ldh_tSession session,
pwr_tOid oid
);
pwr_tStatus
ldh_OpenMntSession(
ldh_tSession session,
pwr_tOid oid,
ldh_tSession *mntses
);
#ifdef __cplusplus
}
#endif
......
wb/lib/wb/src/wb_nav.cpp
View file @ e18e4469
/*
* Proview $Id: wb_nav.cpp,v 1.12 2007-08-24 13:40:27 claes Exp $
* Proview $Id: wb_nav.cpp,v 1.13 2007-08-27 09:32:45 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -184,6 +184,7 @@ ItemObject::ItemObject( Nav *nav, pwr_tObjid item_objid,
pwr_tObjid child;
pwr_tClassId classid;
char *descr;
ldh_tSession ldhses;
type = nav_eItemType_Object;
if ( !is_root) {
......@@ -204,8 +205,19 @@ ItemObject::ItemObject( Nav *nav, pwr_tObjid item_objid,
// Set class annotation
sts = ldh_GetObjectClass( nav->ldhses, objid, &classid);
sts = ldh_ObjidToName( nav->ldhses, cdh_ClassIdToObjid( classid),
// Objects in mounted volumes has to use its own metavolumes.
if ( ldh_ExternObject( nav->ldhses, objid))
ldh_OpenMntSession( nav->ldhses, objid, &ldhses);
else
ldhses = nav->ldhses;
sts = ldh_ObjidToName( ldhses, cdh_ClassIdToObjid( classid),
ldh_eName_Object, name, sizeof(name), &size);
if ( ldhses != nav->ldhses)
ldh_CloseSession( ldhses);
brow_SetAnnotation( node, 1, name, strlen(name));
brow_SetUserData( node, (void *)this);
......@@ -321,6 +333,7 @@ int ItemObject::open_attributes( Nav *nav, double x, double y)
pwr_tClassId classid;
char body[20];
char parname[40];
ldh_tSession ldhses;
pwr_tAttrRef aref = cdh_ObjidToAref( objid);
if ( brow_IsOpen( node) & nav_mOpen_Children) {
......@@ -336,7 +349,13 @@ int ItemObject::open_attributes( Nav *nav, double x, double y)
// Create some attributes
brow_SetNodraw( nav->brow_ctx);
sts = ldh_GetObjectClass( nav->ldhses, objid, &classid);
// Objects in mounted volumes has to use its own metavolumes.
if ( ldh_ExternObject( nav->ldhses, objid))
ldh_OpenMntSession( nav->ldhses, objid, &ldhses);
else
ldhses = nav->ldhses;
sts = ldh_GetObjectClass( ldhses, objid, &classid);
if ( EVEN(sts)) return sts;
attr_exist = 0;
......@@ -348,7 +367,7 @@ int ItemObject::open_attributes( Nav *nav, double x, double y)
else
strcpy( body, "SysBody");
sts = ldh_GetObjectBodyDef( nav->ldhses, classid, body, 1,
sts = ldh_GetObjectBodyDef( ldhses, classid, body, 1,
&bodydef, &rows);
if ( EVEN(sts) ) continue;
......@@ -371,10 +390,10 @@ int ItemObject::open_attributes( Nav *nav, double x, double y)
pwr_sAttrRef aar;
pwr_sAttrRef ar = cdh_ObjidToAref( objid);
sts = ldh_ArefANameToAref( nav->ldhses, &ar, parname, &aar);
sts = ldh_ArefANameToAref( ldhses, &ar, parname, &aar);
if ( EVEN(sts)) return sts;
sts = ldh_AttributeDisabled( nav->ldhses, &aar, &disabled);
sts = ldh_AttributeDisabled( ldhses, &aar, &disabled);
if ( EVEN(sts)) return sts;
if ( disabled)
......@@ -399,6 +418,9 @@ int ItemObject::open_attributes( Nav *nav, double x, double y)
free( (char *)bodydef);
}
if ( ldhses != nav->ldhses)
ldh_CloseSession( ldhses);
if ( attr_exist && !is_root) {
brow_SetOpen( node, nav_mOpen_Attributes);
brow_SetAnnotPixmap( node, 1, nav->pixmap_openattr);
......
wb/lib/wb/src/wb_wnav_item.cpp
View file @ e18e4469
/*
* Proview $Id: wb_wnav_item.cpp,v 1.22 2007-01-04 07:29:04 claes Exp $
* Proview $Id: wb_wnav_item.cpp,v 1.23 2007-08-27 09:32:45 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -102,11 +102,21 @@ WItemObject::WItemObject( WNav *wnav, pwr_tObjid item_objid,
next_annot = 1;
// Set class annotation
if ( wnav->gbl.show_class)
{
sts = ldh_ObjidToName( wnav->ldhses, cdh_ClassIdToObjid( classid), ldh_eName_Object,
segname, sizeof(segname), &size);
if ( wnav->gbl.show_class) {
ldh_tSession ldhses;
// Objects in mounted volumes has to use its own metavolumes.
if ( ldh_ExternObject( wnav->ldhses, objid))
ldh_OpenMntSession( wnav->ldhses, objid, &ldhses);
else
ldhses = wnav->ldhses;
sts = ldh_ObjidToName( ldhses, cdh_ClassIdToObjid( classid), ldh_eName_Object,
segname, sizeof(segname), &size);
brow_SetAnnotation( node, next_annot++, segname, strlen(segname));
if ( ldhses != wnav->ldhses)
ldh_CloseSession( ldhses);
}
// Set description annotation
......@@ -313,6 +323,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
int output_cnt = 0;
char *block;
int size;
ldh_tSession ldhses;
if ( brow_IsOpen( node) & wnav_mOpen_Children ||
brow_IsOpen( node) & wnav_mOpen_Crossref)
......@@ -330,16 +341,22 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
// Create some attributes
brow_SetNodraw( wnav->brow->ctx);
// Objects in mounted volumes has to use its own metavolumes.
if ( ldh_ExternObject( wnav->ldhses, objid))
ldh_OpenMntSession( wnav->ldhses, objid, &ldhses);
else
ldhses = wnav->ldhses;
// Display object name
if ( wnav->editmode) {
item = (WItem *) new WItemObjectName( wnav->brow, wnav->ldhses, objid,
item = (WItem *) new WItemObjectName( wnav->brow, ldhses, objid,
node, flow_eDest_IntoLast);
attr_exist = 1;
}
// Display modification time
if ( wnav->gbl.show_truedb) {
item = (WItem *) new WItemObjectModTime( wnav->brow, wnav->ldhses, objid,
item = (WItem *) new WItemObjectModTime( wnav->brow, ldhses, objid,
node, flow_eDest_IntoLast);
attr_exist = 1;
}
......@@ -347,7 +364,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
// Get bodydef for rtbody, devbody or sysbody
sts = ldh_GetObjectClass( wnav->ldhses, objid, &classid);
sts = ldh_GetObjectClass( ldhses, objid, &classid);
if ( EVEN(sts)) return sts;
for ( i = 0; i < 3; i++)
......@@ -360,10 +377,10 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
strcpy( body, "SysBody");
if ( wnav->gbl.show_truedb)
sts = ldh_GetTrueObjectBodyDef( wnav->ldhses, classid, body, 1,
sts = ldh_GetTrueObjectBodyDef( ldhses, classid, body, 1,
&bodydef, &rows);
else
sts = ldh_GetObjectBodyDef( wnav->ldhses, classid, body, 1,
sts = ldh_GetObjectBodyDef( ldhses, classid, body, 1,
&bodydef, &rows);
if ( EVEN(sts))
continue;
......@@ -386,10 +403,10 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
pwr_sAttrRef aar;
pwr_sAttrRef ar = cdh_ObjidToAref( objid);
sts = ldh_ArefANameToAref( wnav->ldhses, &ar, parname, &aar);
sts = ldh_ArefANameToAref( ldhses, &ar, parname, &aar);
if ( EVEN(sts)) return sts;
sts = ldh_AttributeDisabled( wnav->ldhses, &aar, &disabled);
sts = ldh_AttributeDisabled( ldhses, &aar, &disabled);
if ( EVEN(sts)) return sts;
if ( disabled)
......@@ -402,7 +419,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
if ( bodydef[j].ParClass == pwr_eClass_Output)
{
new WItemAttrArrayOutput( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrArrayOutput( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast,
parname,
bodydef[j].Par->Output.Info.Elements,
......@@ -414,7 +431,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
output_cnt++;
}
else
new WItemAttrArray( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrArray( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast,
parname,
bodydef[j].Par->Output.Info.Elements,
......@@ -431,7 +448,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
{
if ( bodydef[j].Par->Input.Info.Flags & PWR_MASK_NOREMOVE &&
bodydef[j].Par->Input.Info.Flags & PWR_MASK_NOINVERT)
new WItemAttr( wnav->brow, wnav->ldhses, objid, node,
new WItemAttr( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Input.Info.Type,
bodydef[j].Par->Input.TypeRef,
......@@ -439,7 +456,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
bodydef[j].Par->Input.Info.Flags,
body, 0);
else if ( bodydef[j].Par->Input.Info.Flags & PWR_MASK_NOREMOVE)
new WItemAttrInputInv( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrInputInv( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Input.Info.Type,
bodydef[j].Par->Input.TypeRef,
......@@ -447,7 +464,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
bodydef[j].Par->Input.Info.Flags,
body, input_cnt);
else if ( bodydef[j].Par->Input.Info.Flags & PWR_MASK_NOINVERT)
new WItemAttrInputF( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrInputF( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Input.Info.Type,
bodydef[j].Par->Input.TypeRef,
......@@ -455,7 +472,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
bodydef[j].Par->Input.Info.Flags,
body, input_cnt);
else
new WItemAttrInput( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrInput( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Input.Info.Type,
bodydef[j].Par->Input.TypeRef,
......@@ -466,7 +483,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
else
{
if ( bodydef[j].Par->Input.Info.Flags & PWR_MASK_NOREMOVE)
new WItemAttr( wnav->brow, wnav->ldhses, objid, node,
new WItemAttr( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Input.Info.Type,
bodydef[j].Par->Input.TypeRef,
......@@ -474,7 +491,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
bodydef[j].Par->Input.Info.Flags,
body, 0);
else
new WItemAttrInputF( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrInputF( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Input.Info.Type,
bodydef[j].Par->Input.TypeRef,
......@@ -488,7 +505,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
else if ( bodydef[j].ParClass == pwr_eClass_Output)
{
if ( bodydef[j].Par->Output.Info.Flags & PWR_MASK_NOREMOVE)
new WItemAttr( wnav->brow, wnav->ldhses, objid, node,
new WItemAttr( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Output.Info.Type,
bodydef[j].Par->Output.TypeRef,
......@@ -496,7 +513,7 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
bodydef[j].Par->Output.Info.Flags,
body, 0);
else
new WItemAttrOutput( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrOutput( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Output.Info.Type,
bodydef[j].Par->Output.TypeRef,
......@@ -509,14 +526,14 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
else
{
if ( bodydef[j].Par->Output.Info.Flags & PWR_MASK_CLASS)
new WItemAttrObject( wnav->brow, wnav->ldhses, objid, node,
new WItemAttrObject( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Output.Info.Type,
bodydef[j].Par->Output.Info.Size, false, 0,
bodydef[j].Par->Output.Info.Flags,
body, 0);
else
new WItemAttr( wnav->brow, wnav->ldhses, objid, node,
new WItemAttr( wnav->brow, ldhses, objid, node,
flow_eDest_IntoLast, parname,
bodydef[j].Par->Output.Info.Type,
bodydef[j].Par->Output.TypeRef,
......@@ -528,14 +545,17 @@ int WItemBaseObject::open_attributes( WNav *wnav, double x, double y)
}
free((char *) bodydef);
sts = ldh_GetDocBlock( wnav->ldhses, objid, &block, &size);
sts = ldh_GetDocBlock( ldhses, objid, &block, &size);
if ( ODD(sts)) {
new WItemDocBlock( wnav->brow, wnav->ldhses, objid, block, size,
new WItemDocBlock( wnav->brow, ldhses, objid, block, size,
node, flow_eDest_IntoLast);
attr_exist = 1;
}
}
if ( ldhses != wnav->ldhses)
ldh_CloseSession( ldhses);
if ( attr_exist && !is_root)
{
brow_SetOpen( node, wnav_mOpen_Attributes);
......
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