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 9701970ad2ee07bfdeae4a3e043341e1d861ba24..890e29a9b62441aaf0e15f14a286ab519bf246d5 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/
src/HYDROGUI/HYDROGUI_DataObject.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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
// 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
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-78,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 );
@@
-112,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 )
{
@@
-152,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 )
@@
-165,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 );
@@
-234,11
+230,6
@@
void HYDROGUI_DataObject::updateBy( SUIT_DataObject* theObj )
setModified( true );
}
setModified( true );
}
-
-
-
-
-
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,