Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #727, #736: fix for the first bug and for the second part (Bug2) of the last...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ExportImageOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
b/src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
index d4b3fccf7553d6f58accb439e7ec6b27a08feac6..e6e3c72edbdf870ed980489667471b6b8fff5f59 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ExportImageOp.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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
-//
+// Copyright (C) 2014-2015 EDF-R&D
// 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
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,7
+19,7
@@
#include "HYDROGUI_ExportImageOp.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_ExportImageOp.h"
#include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool
2
.h"
#include <HYDROData_Image.h>
#include <HYDROData_Image.h>
@@
-53,8
+49,16
@@
void HYDROGUI_ExportImageOp::startOperation()
QImage anImage = anImageObj->Image();
QTransform aTransform = anImageObj->Trsf();
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 );
QString aFilter( tr( "IMAGE_FILTER" ) );
QString aFileName = SUIT_FileDlg::getFileName( module()->getApp()->desktop(),
"", aFilter, tr( "EXPORT_IMAGE_TO_FILE" ), false );
@@
-62,5
+66,5
@@
void HYDROGUI_ExportImageOp::startOperation()
anImage.save( aFileName );
}
anImage.save( aFileName );
}
- abort(); // do not commit the document command
+ commit();
}
}