-// 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
#include <HYDROData_Document.h>
#include <CurveCreator_Curve.hxx>
-#include <CurveCreator_Displayer.h>
+#include <CurveCreator_Displayer.hxx>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
{
if( myIsEdit )
{
- myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if ( !myEditedObject.IsNull() && !myEditedObject->IsEditable() )
{
// Polyline is imported from GEOM module an is not recognized as
aPanel->setOCCViewer( aViewManager ? aViewManager->getOCCViewer() : 0 );
setPreviewManager( aViewManager );
+ if ( isApplyAndClose() )
+ setCursor();
+
QString aPolylineName;
if( !myEditedObject.IsNull() )
{
void HYDROGUI_PolylineOp::abortOperation()
{
+ restoreCursor();
+
HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
if ( aPanel )
aPanel->setOCCViewer( 0 );
void HYDROGUI_PolylineOp::commitOperation()
{
- HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
- if ( aPanel )
- aPanel->setOCCViewer( 0 );
+ if ( isApplyAndClose() )
+ {
+ restoreCursor();
+
+ HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+ if ( aPanel )
+ aPanel->setOCCViewer( 0 );
+ }
+
erasePreview();
HYDROGUI_Operation::commitOperation();