const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
+#ifndef TEST_MODE
LightApp_DataObject( theParent ),
+#endif
myData( theData ),
myParentEntry( theParentEntry ),
myIsValid( true ),
QString HYDROGUI_DataObject::entry() const
{
QString anEntry = HYDROGUI_DataObject::dataObjectEntry( modelObject() );
- if( isReference() )
+ if( !refEntry().isEmpty() )
anEntry.prepend( myParentEntry + "_" );
return anEntry;
}
QFont HYDROGUI_DataObject::font( const int theId ) const
{
- QFont aFont = LightApp_DataObject::font( theId );
+ QFont aFont = PARENT::font( theId );
if( theId == NameId )
{
Handle(HYDROData_Entity) aDataObject = modelObject();
- if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() )
+ if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
{
aFont.setItalic( true );
aFont.setBold( true );
if ( !aColor.isValid() )
{
Handle(HYDROData_Entity) aDataObject = modelObject();
- if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() )
+ if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
{
switch ( theRole )
{
}
if ( !aColor.isValid() ) {
- aColor = LightApp_DataObject::color( theRole, theId );
+ aColor = PARENT::color( theRole, theId );
}
return aColor;
}
else
{
- QString aNeedUpdate( aDataObject->IsMustBeUpdated() ? "M_" : "" );
+ QString aNeedUpdate( aDataObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) ? "M_" : "" );
int anObjectKind = (int)aDataObject->GetKind();
if ( anObjectKind == KIND_DUMMY_3D )
anObjectKind = aFatherObj->GetKind();
}
- anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).toAscii() );
+ anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).toLatin1() );
}
return aResMgr->loadPixmap( "HYDRO", anIcon );
}
- return LightApp_DataObject::icon( theId );
+ return PARENT::icon( theId );
}
QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
}
else
{
- aRes = LightApp_DataObject::renameAllowed( theColumnId );
+ aRes = PARENT::renameAllowed( theColumnId );
}
return aRes;
}
const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
+#ifndef TEST_MODE
LightApp_DataObject( theParent ),
+#endif
myName( theName ),
myParentEntry( theParentEntry ),
myIsInOperation( theIsInOperation )
{
return aResMgr->loadPixmap( "HYDRO", QObject::tr( "PARTITION_ICO" ) );
}
- return LightApp_DataObject::icon( theId );
+ return PARENT::icon( theId );
}
QFont HYDROGUI_NamedObject::font( const int theId ) const
{
- QFont aFont = LightApp_DataObject::font( theId );
+ QFont aFont = PARENT::font( theId );
if( theId == NameId )
{
if ( dynamic_cast<CAM_ModuleObject*>( parent() ) )