X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=890e29a9b62441aaf0e15f14a286ab519bf246d5;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=dc9a1d17cc152955ed32dcf624bdc2d2d097835e;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx index dc9a1d17..890e29a9 100644 --- a/src/HYDROGUI/HYDROGUI_DataObject.cxx +++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx @@ -1,8 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -78,7 +74,7 @@ QFont HYDROGUI_DataObject::font( const int theId ) const 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 ); @@ -112,7 +108,7 @@ QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co if ( !aColor.isValid() ) { Handle(HYDROData_Entity) aDataObject = modelObject(); - if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() ) + if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) ) { switch ( theRole ) { @@ -152,7 +148,7 @@ QPixmap HYDROGUI_DataObject::icon( const int theId ) const } 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 ) @@ -165,7 +161,7 @@ QPixmap HYDROGUI_DataObject::icon( const int theId ) const 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 );