X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=ea1fed9cac64ed1f1c764bd8569ed1ccfdffdf6b;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=ef915a0045f10cc6d415c783a052ad44d4ff7318;hpb=63cfcd8fde33b237c06377b628b4e9e8027a425f;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index ef915a00..ea1fed9c 100644
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -52,19 +52,27 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
 
     // Dump transformation points for image
 
-    QString aGap = QString().fill( ' ', anImageName.size() + 16 );
-
     bool anIsByTwoPoints = IsByTwoPoints();
 
     QPoint aLocalPointA, aLocalPointB, aLocalPointC;
     if ( GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC ) )
     {
+      QString aGap = QString().fill( ' ', anImageName.size() + 17 );
+
       aResList << QString( "%1.SetLocalPoints( QPoint( %2, %3 )," )
                   .arg( anImageName ).arg( aLocalPointA.x() ).arg( aLocalPointA.y() );
-      aResList << QString( aGap             + "QPoint( %1, %2 )," )
+      aResList << QString( aGap             + "QPoint( %1, %2 )" )
                   .arg( aLocalPointB.x() ).arg( aLocalPointB.y() );
-      aResList << QString( aGap             + "QPoint( %1, %2 ) );" )
-                  .arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
+      if ( !anIsByTwoPoints )
+      {
+        aResList.last().append( "," );
+        aResList << QString( aGap             +  "QPoint( %1, %2 ) );" )
+                    .arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
+      }
+      else
+      {
+        aResList.last().append( " );" );
+      }
       aResList << QString( "" );
     }
 
@@ -72,14 +80,24 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
     QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
     if ( GetGlobalPoints( aTransformationMode, aTrsfPointA, aTrsfPointB, aTrsfPointC ) )
     {
+      QString aGap = QString().fill( ' ', anImageName.size() + 18 );
+
       aResList << QString( "%1.SetGlobalPoints( %2," )
                   .arg( anImageName ).arg( aTransformationMode );
       aResList << QString( aGap             +  "QPointF( %1, %2 )," )
                   .arg( aTrsfPointA.x() ).arg( aTrsfPointA.y() );
-      aResList << QString( aGap             +  "QPointF( %1, %2 )," )
+      aResList << QString( aGap             +  "QPointF( %1, %2 )" )
                   .arg( aTrsfPointB.x() ).arg( aTrsfPointB.y() );
-      aResList << QString( aGap             +  "QPointF( %1, %2 ) );" )
-                  .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() );
+      if ( !anIsByTwoPoints )
+      {
+        aResList.last().append( "," );
+        aResList << QString( aGap             +  "QPointF( %1, %2 ) );" )
+                    .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() );
+      }
+      else
+      {
+        aResList.last().append( " );" );
+      }
 
       if ( aTransformationMode == ReferenceImage )
       {
@@ -130,13 +148,10 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
         setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "AppendReference" );
       }
     }
-
-    // Necessary to update image in case of composed operator
-    aResList << QString( "" );
-    aResList << QString( "%1.Update();" ).arg( anImageName );
   }
 
   aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( anImageName );
 
   return aResList;
 }
@@ -197,6 +212,11 @@ void HYDROData_Image::Update()
   SetToUpdate( false );
 }
 
+bool HYDROData_Image::IsHas2dPrs() const
+{
+  return true;
+}
+
 QVariant HYDROData_Image::GetDataVariant()
 {
   QTransform aTransform = Trsf();
@@ -264,6 +284,9 @@ bool HYDROData_Image::LoadImage( const QString& theFilePath )
 {
   QImage anImage( theFilePath );
   SetImage( anImage );
+
+  SetFilePath( theFilePath );
+
   return !anImage.isNull();
 }