X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CopyPastePositionOp.cxx;h=afe0ba93b4048eef2a8990fc24dfb12d69efceca;hb=cd6ea20d9a76665a24a533d0340385a335961f05;hp=c959cf544795c03cb4c21ea4aa773a12f7745c69;hpb=e8c1369317da0dca7532281d3f131bc25875e1f4;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx b/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx
index c959cf54..afe0ba93 100644
--- a/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CopyPastePositionOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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
@@ -22,14 +22,15 @@
 
 #include "HYDROGUI_CopyPastePositionOp.h"
 
-#include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_UpdateFlags.h"
+#include "HYDROGUI_Displayer.h"
+#include "HYDROGUI_Tool.h"
 
-#include <gp_Pnt.hxx>
+#include <SUIT_ViewManager.h>
+#include <LightApp_Application.h>
 
-#include <QApplication>
 #include <QClipboard>
+#include <QApplication>
 
 HYDROGUI_CopyPastePositionOp::HYDROGUI_CopyPastePositionOp( HYDROGUI_Module* theModule,
                                                             const bool theIsPaste )
@@ -47,22 +48,26 @@ void HYDROGUI_CopyPastePositionOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  HYDROGUI_DataModel* aModel = module()->getDataModel();
-
   if( !myIsPaste )
   {
-    QClipboard* aClBoard = QApplication::clipboard();
-
-
-    gp_Pnt aPoint( 100, 100, 0 );
-    QString aResult = tr( "%1,%2" ).arg( aPoint.X() ).arg( aPoint.Y() );
+    QString aResult;
+    HYDROGUI_Module* aModule = module();
+    HYDROGUI_Displayer* aDisplayer = aModule->getDisplayer();
+    if ( aDisplayer ) {
+      SUIT_ViewManager* aViewMgr = aModule->getApp()->activeViewManager();
+      SUIT_ViewWindow* aViewWindow = aViewMgr ? aViewMgr->getActiveView() : 0;
+      double aX, aY, aZ;
+      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();
       aClBoard->clear();
       QApplication::clipboard()->setText( aResult );
     }
   }
-  else
-  {
-  }
   commit();
 }