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

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

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
index 4aaf3214fa327a6b7eedce682c0aa51f422160e8..5713af106d5e45bd85d003889f85fa719b6fdb2e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
@@ -21,7 +21,7 @@
 #include "HYDROGUI_GeoreferencementDlg.h"
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Profile.h>
@@ -61,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 );
@@ -88,6 +91,7 @@ void HYDROGUI_GeoreferencementOp::abortOperation()
     anApp->desktop()->disconnect( this );
   }
 
+  restoreCursor();
   HYDROGUI_Operation::abortOperation();
 }
 
@@ -98,6 +102,7 @@ void HYDROGUI_GeoreferencementOp::commitOperation()
     anApp->desktop()->disconnect( this );
   }
 
+  restoreCursor();
   HYDROGUI_Operation::commitOperation();
 }