Merge branch 'BR_LCM_COMP' into HEAD

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

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
index edee008b0a46d88a1bec766eea333fe107d3c13c..eb89f4c471b89df580dae8eeecf46d1b5ef238c1 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
@@ -1,8 +1,4 @@
-// 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
-//
+// 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
@@ -65,6 +61,9 @@ void HYDROGUI_GeoreferencementOp::startOperation()
   }
 
   aPanel->reset();
+  setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>( 
+                       module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
+  setCursor();
 
   if ( myInitialMode == All ) {
     onModeActivated( HYDROGUI_GeoreferencementDlg::AllProfiles );
@@ -92,6 +91,7 @@ void HYDROGUI_GeoreferencementOp::abortOperation()
     anApp->desktop()->disconnect( this );
   }
 
+  restoreCursor();
   HYDROGUI_Operation::abortOperation();
 }
 
@@ -102,6 +102,7 @@ void HYDROGUI_GeoreferencementOp::commitOperation()
     anApp->desktop()->disconnect( this );
   }
 
+  restoreCursor();
   HYDROGUI_Operation::commitOperation();
 }