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
Merge remote-tracking branch 'origin/BR_1339' into BR_2017
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DataObject.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_DataObject.cxx
b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index 8ec9658dab3b3c3120276eaca84a192d9b5e15f6..ffaefe8310e87cec6bf41946c0397ce212f8b349 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/
src/HYDROGUI/HYDROGUI_DataObject.cxx
@@
-38,7
+38,9
@@
HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent,
const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
+#ifndef TEST_MODE
LightApp_DataObject( theParent ),
LightApp_DataObject( theParent ),
+#endif
myData( theData ),
myParentEntry( theParentEntry ),
myIsValid( true ),
myData( theData ),
myParentEntry( theParentEntry ),
myIsValid( true ),
@@
-49,7
+51,7
@@
HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent,
QString HYDROGUI_DataObject::entry() const
{
QString anEntry = HYDROGUI_DataObject::dataObjectEntry( modelObject() );
QString HYDROGUI_DataObject::entry() const
{
QString anEntry = HYDROGUI_DataObject::dataObjectEntry( modelObject() );
- if(
isReference
() )
+ if(
!refEntry().isEmpty
() )
anEntry.prepend( myParentEntry + "_" );
return anEntry;
}
anEntry.prepend( myParentEntry + "_" );
return anEntry;
}
@@
-70,7
+72,7
@@
QString HYDROGUI_DataObject::name() const
QFont HYDROGUI_DataObject::font( const int theId ) const
{
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( theId == NameId )
{
Handle(HYDROData_Entity) aDataObject = modelObject();
@@
-129,7
+131,7
@@
QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co
}
if ( !aColor.isValid() ) {
}
if ( !aColor.isValid() ) {
- aColor =
LightApp_DataObject
::color( theRole, theId );
+ aColor =
PARENT
::color( theRole, theId );
}
return aColor;
}
return aColor;
@@
-161,12
+163,12
@@
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 );
}
- return
LightApp_DataObject
::icon( theId );
+ return
PARENT
::icon( theId );
}
QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
}
QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
@@
-211,7
+213,7
@@
bool HYDROGUI_DataObject::renameAllowed( const int theColumnId ) const
}
else
{
}
else
{
- aRes =
LightApp_DataObject
::renameAllowed( theColumnId );
+ aRes =
PARENT
::renameAllowed( theColumnId );
}
return aRes;
}
}
return aRes;
}
@@
-235,7
+237,9
@@
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
+#ifndef TEST_MODE
LightApp_DataObject( theParent ),
LightApp_DataObject( theParent ),
+#endif
myName( theName ),
myParentEntry( theParentEntry ),
myIsInOperation( theIsInOperation )
myName( theName ),
myParentEntry( theParentEntry ),
myIsInOperation( theIsInOperation )
@@
-262,12
+266,12
@@
QPixmap HYDROGUI_NamedObject::icon( const int theId ) const
{
return aResMgr->loadPixmap( "HYDRO", QObject::tr( "PARTITION_ICO" ) );
}
{
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 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() ) )
if( theId == NameId )
{
if ( dynamic_cast<CAM_ModuleObject*>( parent() ) )