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 a259a866e83a88b6078527673b852c0e1d089a07..ffaefe8310e87cec6bf41946c0397ce212f8b349 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
@@
-42,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 ),
@@
-53,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;
}
@@
-74,11
+72,11
@@
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();
- 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
+110,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 )
{
@@
-133,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;
@@
-152,7
+150,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,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,
@@
-215,19
+213,33
@@
bool HYDROGUI_DataObject::renameAllowed( const int theColumnId ) const
}
else
{
}
else
{
- aRes =
LightApp_DataObject
::renameAllowed( theColumnId );
+ aRes =
PARENT
::renameAllowed( theColumnId );
}
return aRes;
}
}
return aRes;
}
-
+void HYDROGUI_DataObject::updateBy( SUIT_DataObject* theObj )
+{
+ HYDROGUI_DataObject* aDataObj = dynamic_cast<HYDROGUI_DataObject*>( theObj );
+ if( !aDataObj )
+ return;
+
+ myData = aDataObj->myData;
+ myParentEntry = aDataObj->myParentEntry;
+ myIsValid = aDataObj->myIsValid;
+ myIsInOperation = aDataObj->myIsInOperation;
+ myIcon = aDataObj->myIcon;
+ setModified( true );
+}
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,
const bool theIsInOperation )
: CAM_DataObject( theParent ),
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theName,
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 )
@@
-254,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() ) )
@@
-270,6
+282,24
@@
QFont HYDROGUI_NamedObject::font( const int theId ) const
return aFont;
}
return aFont;
}
+void HYDROGUI_NamedObject::updateBy( SUIT_DataObject* theObj )
+{
+ HYDROGUI_NamedObject* aNamedObj = dynamic_cast<HYDROGUI_NamedObject*>( theObj );
+ if( !aNamedObj )
+ return;
+
+ myName = aNamedObj->myName;
+ myParentEntry = aNamedObj->myParentEntry;
+ myIcon = aNamedObj->myIcon;
+ myIsInOperation = aNamedObj->myIsInOperation;
+ setModified( true );
+}
+
+
+
+
+
+
HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,
HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,