patch for install error on Linux

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

diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
index ff20db083ede50f98bb0072955c86a9d680d9f9a..11a60f85217ae0411dd43c1cf4168220d1c7ce27 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.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
@@ -23,7 +19,7 @@
 #include <HYDROGUI_Module.h>
 #include <HYDROGUI_ProfileOp.h>
 #include <HYDROGUI_ProfileDlg.h>
-#include <HYDROGUI_Tool.h>
+#include <HYDROGUI_Tool2.h>
 #include <HYDROGUI_UpdateFlags.h>
 #include <HYDROGUI_DataObject.h>
 #include <HYDROData_Document.h>
@@ -85,6 +81,8 @@ void HYDROGUI_ProfileOp::startOperation()
 
   HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
   aPanel->reset();
+  setPreviewManager( aPanel->viewManager() );
+  setCursor();
 
   if( myIsEdit )
     if ( isApplyAndClose() )
@@ -139,6 +137,7 @@ void HYDROGUI_ProfileOp::startOperation()
 void HYDROGUI_ProfileOp::abortOperation()
 {
   erasePreview();
+  restoreCursor();
 
   HYDROGUI_Operation::abortOperation();
 }
@@ -146,6 +145,7 @@ void HYDROGUI_ProfileOp::abortOperation()
 void HYDROGUI_ProfileOp::commitOperation()
 {
   erasePreview();
+  restoreCursor();
 
   HYDROGUI_Operation::commitOperation();
 }
@@ -228,11 +228,11 @@ bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
 
   if ( !myIsEdit )
   {
-    aProfileObj->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
+    aProfileObj->SetBorderColor( aProfileObj->DefaultBorderColor() );
   }
 
   // At first we update the child u,z profile object
-  aProfileUZ->SetToUpdate( true );
+  aProfileUZ->Changed( HYDROData_Entity::Geom_2d );
   aProfileUZ->Update();
 
   // And now we update our edited object