Merge branch 'BR_H2018_2' of https://codev-tuleap.cea.fr/plugins/git/salome/hydro...

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

diff --git a/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx b/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx
index 0139ce9ce95bcfe50be20cb1292bb3264d0bd481..848ff0b42da2c1812f0ddb2a5ba2acb0a21fdcc0 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.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
-// 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
@@ -24,6 +20,7 @@
 
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Displayer.h"
+#include "HYDROGUI_Tool.h"
 
 #include <SUIT_ViewManager.h>
 #include <LightApp_Application.h>
@@ -56,9 +53,11 @@ void HYDROGUI_CopyPastePositionOp::startOperation()
       SUIT_ViewManager* aViewMgr = aModule->getApp()->activeViewManager();
       SUIT_ViewWindow* aViewWindow = aViewMgr ? aViewMgr->getActiveView() : 0;
       double aX, aY, aZ;
-      if ( aDisplayer->GetCursorViewCoordinates( aViewWindow, aModule->getPopupPosition(),
-                                                 aX, aY, aZ ) )
-        aResult = tr( "%1,%2" ).arg( aX ).arg( aY );
+      if ( aDisplayer->GetCursorViewCoordinates( aViewWindow, aX, aY, aZ ) ) {
+        QString aXStr = HYDROGUI_Tool::GetCoordinateString( aX, false );
+        QString anYStr = HYDROGUI_Tool::GetCoordinateString( aY, false );
+        aResult = tr( "%1,%2" ).arg( aXStr ).arg( anYStr );
+      }
     }
     if ( !aResult.isEmpty() ) {
       QClipboard* aClBoard = QApplication::clipboard();