Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DataObject.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_DataObject.cxx
b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index e0183809bff9da876c0cd9f5bdcd50d93d4ed0e5..890e29a9b62441aaf0e15f14a286ab519bf246d5 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/
src/HYDROGUI/HYDROGUI_DataObject.cxx
@@
-74,7
+74,7
@@
QFont HYDROGUI_DataObject::font( const int theId ) const
if( theId == NameId )
{
Handle(HYDROData_Entity) aDataObject = modelObject();
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 );
{
aFont.setItalic( true );
aFont.setBold( true );
@@
-108,7
+108,7
@@
QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co
if ( !aColor.isValid() )
{
Handle(HYDROData_Entity) aDataObject = modelObject();
if ( !aColor.isValid() )
{
Handle(HYDROData_Entity) aDataObject = modelObject();
- if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() )
+ if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated(
HYDROData_Entity::Geom_All
) )
{
switch ( theRole )
{
{
switch ( theRole )
{
@@
-148,7
+148,7
@@
QPixmap HYDROGUI_DataObject::icon( const int theId ) const
}
else
{
}
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 )
int anObjectKind = (int)aDataObject->GetKind();
if ( anObjectKind == KIND_DUMMY_3D )
@@
-161,7
+161,7
@@
QPixmap HYDROGUI_DataObject::icon( const int theId ) const
anObjectKind = aFatherObj->GetKind();
}
anObjectKind = aFatherObj->GetKind();
}
- anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).to
Ascii
() );
+ anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).to
Latin1
() );
}
return aResMgr->loadPixmap( "HYDRO", anIcon );
}
return aResMgr->loadPixmap( "HYDRO", anIcon );