X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesOp.cxx;h=38375491e69589af4e8b15b80029f11cfd1affd1;hb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;hp=d946766c8e1b781d66f2e304ed05fac26e6279b5;hpb=ca0e09c1e1bb19c9855e2f3839243da36097ee1c;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
index d946766c..38375491 100644
--- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
@@ -31,7 +31,7 @@
 #include <HYDROData_Image.h>
 #include <HYDROData_Polyline.h>
 
-#include <HYDROOperations_Factory.h>
+#include <HYDROData_OperationsFactory.h>
 
 #include <ImageComposer_CutOperator.h>
 #include <ImageComposer_CropOperator.h>
@@ -103,19 +103,19 @@ void HYDROGUI_TwoImagesOp::startOperation()
   {
     if( myEditedObject->NbReferences() > 0 )
     {
-      Handle(HYDROData_Object) anObject1 = myEditedObject->Reference( 0 );
+      Handle(HYDROData_Entity) anObject1 = myEditedObject->Reference( 0 );
       if( !anObject1.IsNull() )
         aSelectedName1 = anObject1->GetName();
     }
     if( myEditedObject->NbReferences() > 1 )
     {
-      Handle(HYDROData_Object) anObject2 = myEditedObject->Reference( 1 );
+      Handle(HYDROData_Entity) anObject2 = myEditedObject->Reference( 1 );
       if( !anObject2.IsNull() )
         aSelectedName2 = anObject2->GetName();
     }
     aPanel->setSelectedObjects( aSelectedName1, aSelectedName2 );
 
-    HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory();
+    HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory();
     if( ImageComposer_Operator* anOperator = aFactory->Operator( myEditedObject ) )
     {
       QColor aColor;
@@ -154,7 +154,7 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
       ( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) ) )
   {
     // check that there are no other objects with the same name in the document
-    Handle(HYDROData_Object) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName );
+    Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName );
     if( !anObject.IsNull() )
     {
       theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anImageName );
@@ -162,14 +162,14 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
     }
   }
 
-  Handle(HYDROData_Object) anObject1 = Handle(HYDROData_Object)::DownCast(
-    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_UNKNOWN ) );
-  Handle(HYDROData_Object) anObject2 = Handle(HYDROData_Object)::DownCast(
-    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_UNKNOWN ) );
+  Handle(HYDROData_Entity) anObject1 =
+    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_UNKNOWN ) ;
+  Handle(HYDROData_Entity) anObject2 =
+    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_UNKNOWN );
   if( anObject1.IsNull() || anObject2.IsNull() )
     return false;
 
-  HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory();
+  HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory();
 
   Handle(HYDROData_Image) aResult;
   ImageComposer_Operator* anOperator = 0;