Commit 42d95f55 authored by claes's avatar claes

Simulate method was'n iherited from superclass

parent 80e6a41f
/* /*
* Proview $Id: xtt_c_object.cpp,v 1.13 2005-10-21 16:11:22 claes Exp $ * Proview $Id: xtt_c_object.cpp,v 1.14 2005-12-06 10:49:51 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
...@@ -1168,9 +1168,9 @@ static pwr_tStatus Simulate( xmenu_sMenuCall *ip) ...@@ -1168,9 +1168,9 @@ static pwr_tStatus Simulate( xmenu_sMenuCall *ip)
pwr_tFileName found_file; pwr_tFileName found_file;
char *s; char *s;
sts = gdh_GetAttrRefTid( objar, &classid); for ( sts = gdh_GetAttrRefTid( objar, &classid);
if ( EVEN(sts)) return sts; ODD(sts);
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);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
...@@ -1187,6 +1187,9 @@ static pwr_tStatus Simulate( xmenu_sMenuCall *ip) ...@@ -1187,6 +1187,9 @@ static pwr_tStatus Simulate( xmenu_sMenuCall *ip)
sts = dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_INIT); sts = dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_INIT);
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 ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
s = strrchr( fname, '.'); s = strrchr( fname, '.');
...@@ -1259,8 +1262,9 @@ static pwr_tStatus SimulateFilter( xmenu_sMenuCall *ip) ...@@ -1259,8 +1262,9 @@ static pwr_tStatus SimulateFilter( xmenu_sMenuCall *ip)
sts = gdh_GetObjectInfo( name, (void *)&simconnect, sizeof(simconnect)); sts = gdh_GetObjectInfo( name, (void *)&simconnect, sizeof(simconnect));
if ( EVEN(sts)) { if ( EVEN(sts)) {
// Look for sim graph to main object // Look for sim graph to main object
sts = gdh_GetAttrRefTid( objar, &classid); for ( sts = gdh_GetAttrRefTid( objar, &classid);
if ( EVEN(sts)) return XNAV__INVISIBLE; ODD(sts);
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);
...@@ -1280,6 +1284,7 @@ static pwr_tStatus SimulateFilter( xmenu_sMenuCall *ip) ...@@ -1280,6 +1284,7 @@ static pwr_tStatus SimulateFilter( xmenu_sMenuCall *ip)
} }
if ( ODD(sts)) if ( ODD(sts))
return XNAV__SUCCESS; return XNAV__SUCCESS;
}
return XNAV__INVISIBLE; return XNAV__INVISIBLE;
} }
else if ( cdh_ObjidIsNull( simconnect.Objid)) else if ( cdh_ObjidIsNull( simconnect.Objid))
......
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