refs #476: more robust resolving conflicts

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ExportImageOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ExportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
index d4b3fccf7553d6f58accb439e7ec6b27a08feac6..7a3a7caa950c7ad4ef0086d7027ea01527c142fb 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
@@ -53,8 +53,16 @@ void HYDROGUI_ExportImageOp::startOperation()
     QImage anImage = anImageObj->Image();
     QTransform aTransform = anImageObj->Trsf();
 
-    anImage = anImage.transformed( aTransform, Qt::SmoothTransformation );
+    // Scale image to it origin imported size
+    double aCoefX = aTransform.m11() < 0 ? -1.0 : 1.0;
+    double aCoefY = aTransform.m22() < 0 ? -1.0 : 1.0;
+    aTransform.scale( aCoefX * ( 1 / aTransform.m11() ), aCoefY * ( 1 / aTransform.m22() ) );
 
+    anImage = anImage.transformed( aTransform, Qt::SmoothTransformation );
+    
+    // Invert the Y axis direction from down to up
+    anImage = anImage.transformed( QTransform::fromScale( 1, -1 ), Qt::SmoothTransformation );
+    
     QString aFilter( tr( "IMAGE_FILTER" ) );
     QString aFileName = SUIT_FileDlg::getFileName( module()->getApp()->desktop(),
                                                    "", aFilter, tr( "EXPORT_IMAGE_TO_FILE" ), false );
@@ -62,5 +70,5 @@ void HYDROGUI_ExportImageOp::startOperation()
       anImage.save( aFileName );
   }
 
-  abort(); // do not commit the document command
+  commit();
 }