X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=ca01c6555c646d0b7083e3a118b7a871688941f8;hb=0d9decc8762a829f1bdc69048fab08122e441ec0;hp=8a94d751075b9b40b1b998b154324aee01b03ce9;hpb=41f291766eb87fc4ed3871fc89d3371581b8014d;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 8a94d751..ca01c655 100644
--- 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 "HYDROOperations_Factory.h"
+#include "HYDROData_OperationsFactory.h"
 
 #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"
 
-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_Entity()
 {
 }
 
@@ -126,7 +127,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
       aResList << QString( "%1.SetOperatorName( \"%2\" );" )
                   .arg( anImageName ).arg( anOperatorName );
 
-      ImageComposer_Operator* anImageOp = HYDROOperations_Factory::Factory()->Operator( this );
+      ImageComposer_Operator* anImageOp = HYDROData_OperationsFactory::Factory()->Operator( this );
       if ( anImageOp )
       {
         // Dump operation arguments
@@ -166,7 +167,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
 
 void HYDROData_Image::Update( const bool theIsForce )
 {
-  HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory();
+  HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory();
 
   // 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
-      Handle(HYDROData_Object) aRefObj = Reference( 0 );
+      Handle(HYDROData_Entity) aRefObj = Reference( 0 );
       if ( !aRefObj.IsNull() )
       {
         anObj1 = aRefObj->GetDataVariant();
@@ -195,7 +196,7 @@ void HYDROData_Image::Update( const bool theIsForce )
     if ( aNbReferences > 1 )
     {
       // Second referenced object
-      Handle(HYDROData_Object) aRefObj = Reference( 1 );
+      Handle(HYDROData_Entity) aRefObj = Reference( 1 );
       if ( !aRefObj.IsNull() )
         anObj2 = aRefObj->GetDataVariant();
     }
@@ -399,7 +400,7 @@ int HYDROData_Image::TrsfMode() const
   return 0;
 }
 
-void HYDROData_Image::AppendReference( const Handle(HYDROData_Object)& theReferenced )
+void HYDROData_Image::AppendReference( const Handle(HYDROData_Entity)& theReferenced )
 {
   AddReferenceObject( theReferenced, 0 );
 }
@@ -409,13 +410,13 @@ int HYDROData_Image::NbReferences() const
   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(
-    const int theIndex, Handle(HYDROData_Object) theReferenced)
+    const int theIndex, Handle(HYDROData_Entity) theReferenced)
 {
   SetReferenceObject( theReferenced, 0, theIndex );
 }