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
Dump to Python script correction.
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Image.cxx
diff --git
a/src/HYDROData/HYDROData_Image.cxx
b/src/HYDROData/HYDROData_Image.cxx
index 8a94d751075b9b40b1b998b154324aee01b03ce9..ca01c6555c646d0b7083e3a118b7a871688941f8 100644
(file)
--- a/
src/HYDROData/HYDROData_Image.cxx
+++ b/
src/HYDROData/HYDROData_Image.cxx
@@
-3,7
+3,7
@@
#include "HYDROData_Document.h"
#include "HYDROData_Tool.h"
#include "HYDROData_Document.h"
#include "HYDROData_Tool.h"
-#include "HYDRO
Operations_
Factory.h"
+#include "HYDRO
Data_Operations
Factory.h"
#include <TDataStd_RealArray.hxx>
#include <TDataStd_ByteArray.hxx>
#include <TDataStd_RealArray.hxx>
#include <TDataStd_ByteArray.hxx>
@@
-24,10
+24,11
@@
static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad0
#define PYTHON_IMAGE_ID "KIND_IMAGE"
#define PYTHON_IMAGE_ID "KIND_IMAGE"
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_
Object
)
-IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_
Object
)
+IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_
Entity
)
+IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_
Entity
)
HYDROData_Image::HYDROData_Image()
HYDROData_Image::HYDROData_Image()
+: HYDROData_Entity()
{
}
{
}
@@
-126,7
+127,7
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
aResList << QString( "%1.SetOperatorName( \"%2\" );" )
.arg( anImageName ).arg( anOperatorName );
aResList << QString( "%1.SetOperatorName( \"%2\" );" )
.arg( anImageName ).arg( anOperatorName );
- ImageComposer_Operator* anImageOp = HYDRO
Operations_
Factory::Factory()->Operator( this );
+ ImageComposer_Operator* anImageOp = HYDRO
Data_Operations
Factory::Factory()->Operator( this );
if ( anImageOp )
{
// Dump operation arguments
if ( anImageOp )
{
// Dump operation arguments
@@
-166,7
+167,7
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
void HYDROData_Image::Update( const bool theIsForce )
{
void HYDROData_Image::Update( const bool theIsForce )
{
- HYDRO
Operations_Factory* aFactory = HYDROOperations_
Factory::Factory();
+ HYDRO
Data_OperationsFactory* aFactory = HYDROData_Operations
Factory::Factory();
// Update image only if there is an operation
ImageComposer_Operator* anOp = aFactory->Operator( OperatorName() );
// Update image only if there is an operation
ImageComposer_Operator* anOp = aFactory->Operator( OperatorName() );
@@
-179,7
+180,7
@@
void HYDROData_Image::Update( const bool theIsForce )
if ( aNbReferences > 0 )
{
// First referenced object
if ( aNbReferences > 0 )
{
// First referenced object
- Handle(HYDROData_
Object
) aRefObj = Reference( 0 );
+ Handle(HYDROData_
Entity
) aRefObj = Reference( 0 );
if ( !aRefObj.IsNull() )
{
anObj1 = aRefObj->GetDataVariant();
if ( !aRefObj.IsNull() )
{
anObj1 = aRefObj->GetDataVariant();
@@
-195,7
+196,7
@@
void HYDROData_Image::Update( const bool theIsForce )
if ( aNbReferences > 1 )
{
// Second referenced object
if ( aNbReferences > 1 )
{
// Second referenced object
- Handle(HYDROData_
Object
) aRefObj = Reference( 1 );
+ Handle(HYDROData_
Entity
) aRefObj = Reference( 1 );
if ( !aRefObj.IsNull() )
anObj2 = aRefObj->GetDataVariant();
}
if ( !aRefObj.IsNull() )
anObj2 = aRefObj->GetDataVariant();
}
@@
-399,7
+400,7
@@
int HYDROData_Image::TrsfMode() const
return 0;
}
return 0;
}
-void HYDROData_Image::AppendReference( const Handle(HYDROData_
Object
)& theReferenced )
+void HYDROData_Image::AppendReference( const Handle(HYDROData_
Entity
)& theReferenced )
{
AddReferenceObject( theReferenced, 0 );
}
{
AddReferenceObject( theReferenced, 0 );
}
@@
-409,13
+410,13
@@
int HYDROData_Image::NbReferences() const
return NbReferenceObjects( 0 );
}
return NbReferenceObjects( 0 );
}
-Handle(HYDROData_
Object
) HYDROData_Image::Reference( const int theIndex ) const
+Handle(HYDROData_
Entity
) HYDROData_Image::Reference( const int theIndex ) const
{
return GetReferenceObject( 0, theIndex );
}
void HYDROData_Image::ChangeReference(
{
return GetReferenceObject( 0, theIndex );
}
void HYDROData_Image::ChangeReference(
- const int theIndex, Handle(HYDROData_
Object
) theReferenced)
+ const int theIndex, Handle(HYDROData_
Entity
) theReferenced)
{
SetReferenceObject( theReferenced, 0, theIndex );
}
{
SetReferenceObject( theReferenced, 0, theIndex );
}