X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=3647683011ee99d21e7b59a92219c4fc56eb835c;hb=f7c005b67e48ec7bac99c566fb4f34215ec1a4b1;hp=108ba6423376de5e85fe0770c329df86571a041e;hpb=29527ae70e9cc00e9f7017f9ab4f7af4091dbf7f;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 108ba642..36476830 100644
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -1,3 +1,24 @@
+// Copyright (C) 2007-2015  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
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "HYDROData_Image.h"
 
@@ -40,7 +61,7 @@ HYDROData_Image::~HYDROData_Image()
 QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString anImageName = GetName();
+  QString anImageName = GetObjPyName();
 
   QString aFilePath = GetFilePath();
   if ( !aFilePath.isEmpty() )
@@ -52,19 +73,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 +101,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,12 +169,11 @@ 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;
 }
 
@@ -195,6 +233,11 @@ void HYDROData_Image::Update()
   SetToUpdate( false );
 }
 
+bool HYDROData_Image::IsHas2dPrs() const
+{
+  return true;
+}
+
 QVariant HYDROData_Image::GetDataVariant()
 {
   QTransform aTransform = Trsf();
@@ -262,6 +305,9 @@ bool HYDROData_Image::LoadImage( const QString& theFilePath )
 {
   QImage anImage( theFilePath );
   SetImage( anImage );
+
+  SetFilePath( theFilePath );
+
   return !anImage.isNull();
 }