Commit 31d8a8f7 authored by claes's avatar claes

Fix to load unknown class from remote node

parent 986d9e13
...@@ -578,7 +578,7 @@ static pwr_tStatus OpenObjectGraphFilter( xmenu_sMenuCall *ip) ...@@ -578,7 +578,7 @@ static pwr_tStatus OpenObjectGraphFilter( xmenu_sMenuCall *ip)
for ( sts = gdh_GetAttrRefTid( objar, &classid); for ( sts = gdh_GetAttrRefTid( objar, &classid);
ODD(sts); ODD(sts);
sts = gdh_GetSuperClass( classid, &classid)) { sts = gdh_GetSuperClass( classid, &classid, pwr_cNObjid)) {
sts = gdh_ObjidToName( cdh_ClassIdToObjid( classid), sts = gdh_ObjidToName( cdh_ClassIdToObjid( classid),
classname, sizeof(classname), cdh_mName_object); classname, sizeof(classname), cdh_mName_object);
......
...@@ -297,7 +297,7 @@ int ItemBaseObject::open_attributes( XNavBrow *brow, double x, double y) ...@@ -297,7 +297,7 @@ int ItemBaseObject::open_attributes( XNavBrow *brow, double x, double y)
if ( brow->usertype == brow_eUserType_XNav && ((XNav *)brow->userdata)->gbl.show_truedb) if ( brow->usertype == brow_eUserType_XNav && ((XNav *)brow->userdata)->gbl.show_truedb)
sts = gdh_GetTrueObjectBodyDef( classid, &bd, &rows); sts = gdh_GetTrueObjectBodyDef( classid, &bd, &rows);
else else
sts = gdh_GetObjectBodyDef( classid, &bd, &rows); sts = gdh_GetObjectBodyDef( classid, &bd, &rows, objid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
for ( i = 0; i < rows; i++) { for ( i = 0; i < rows; i++) {
...@@ -376,7 +376,7 @@ int ItemBaseObject::open_attribute( XNavBrow *brow, double x, double y, ...@@ -376,7 +376,7 @@ int ItemBaseObject::open_attribute( XNavBrow *brow, double x, double y,
sts = gdh_GetObjectClass ( objid, &classid); sts = gdh_GetObjectClass ( objid, &classid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
sts = gdh_GetObjectBodyDef( classid, &bd, &rows); sts = gdh_GetObjectBodyDef( classid, &bd, &rows, objid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
attr_exist = 0; attr_exist = 0;
...@@ -935,7 +935,7 @@ int ItemAttrObject::open_attributes( XNavBrow *brow, double x, double y) ...@@ -935,7 +935,7 @@ int ItemAttrObject::open_attributes( XNavBrow *brow, double x, double y)
if ( brow->usertype == brow_eUserType_XNav && ((XNav *)brow->userdata)->gbl.show_truedb) if ( brow->usertype == brow_eUserType_XNav && ((XNav *)brow->userdata)->gbl.show_truedb)
sts = gdh_GetTrueObjectBodyDef( cid, &bd, &rows); sts = gdh_GetTrueObjectBodyDef( cid, &bd, &rows);
else else
sts = gdh_GetObjectBodyDef( cid, &bd, &rows); sts = gdh_GetObjectBodyDef( cid, &bd, &rows, objid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
for ( i = 0; i < rows; i++) { for ( i = 0; i < rows; i++) {
......
...@@ -460,7 +460,7 @@ static int xnav_GetObjectMenu( ...@@ -460,7 +460,7 @@ static int xnav_GetObjectMenu(
// Get the RtXtt menu-objects for superclasses // Get the RtXtt menu-objects for superclasses
// TODO shadow overlayed methods... // TODO shadow overlayed methods...
sts = gdh_GetSuperClass( classid, &supercid); sts = gdh_GetSuperClass( classid, &supercid, CurrentObject->Objid);
while ( ODD(sts)) { while ( ODD(sts)) {
sts = gdh_ObjidToName( cdh_ClassIdToObjid( supercid), classname, sts = gdh_ObjidToName( cdh_ClassIdToObjid( supercid), classname,
sizeof(classname), cdh_mName_volumeStrict); sizeof(classname), cdh_mName_volumeStrict);
...@@ -476,7 +476,7 @@ static int xnav_GetObjectMenu( ...@@ -476,7 +476,7 @@ static int xnav_GetObjectMenu(
sts = gdh_GetNextSibling( child, &child); sts = gdh_GetNextSibling( child, &child);
} }
} }
sts = gdh_GetSuperClass( supercid, &supercid); sts = gdh_GetSuperClass( supercid, &supercid, CurrentObject->Objid);
} }
// Get the RtXtt menu-objects for this class, or for superclasses // Get the RtXtt menu-objects for this class, or for superclasses
......
...@@ -744,7 +744,7 @@ int XAttNav::object_attr() ...@@ -744,7 +744,7 @@ int XAttNav::object_attr()
sts = gdh_GetAttrRefTid( &objar, &classid); sts = gdh_GetAttrRefTid( &objar, &classid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
sts = gdh_GetObjectBodyDef( classid, &bd, &rows); sts = gdh_GetObjectBodyDef( classid, &bd, &rows, objar.Objid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
for ( i = 0; i < rows; i++) { for ( i = 0; i < rows; i++) {
......
...@@ -2348,7 +2348,7 @@ static int xnav_open_func( void *client_data, ...@@ -2348,7 +2348,7 @@ static int xnav_open_func( void *client_data,
dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_END); dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_END);
if ( ODD(sts)) break; if ( ODD(sts)) break;
sts = gdh_GetSuperClass( cid, &cid); sts = gdh_GetSuperClass( cid, &cid, aref.Objid);
} }
if ( EVEN(sts)) { if ( EVEN(sts)) {
xnav->message('E',"No classgraph found"); xnav->message('E',"No classgraph found");
...@@ -4369,7 +4369,7 @@ static int xnav_print_func(void *client_data, ...@@ -4369,7 +4369,7 @@ static int xnav_print_func(void *client_data,
dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_END); dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_END);
if ( ODD(sts)) break; if ( ODD(sts)) break;
sts = gdh_GetSuperClass( cid, &cid); sts = gdh_GetSuperClass( cid, &cid, aref.Objid);
} }
if ( EVEN(sts)) { if ( EVEN(sts)) {
xnav->message('E',"No classgraph found"); xnav->message('E',"No classgraph found");
......
...@@ -1114,7 +1114,7 @@ int XNav::show_object( pwr_tObjid objid, brow_tNode node) ...@@ -1114,7 +1114,7 @@ int XNav::show_object( pwr_tObjid objid, brow_tNode node)
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
// Get attributes for this class // Get attributes for this class
sts = gdh_GetObjectBodyDef( classid, &bd, &rows); sts = gdh_GetObjectBodyDef( classid, &bd, &rows, objid);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
for ( i = 0; i < rows; i++) { for ( i = 0; i < rows; i++) {
......
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