X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportBathymetryOp.cxx;h=fb8e663a1bf1d02ec1cdaf8eb85a6b3ad94adc63;hb=ea24c0c5ef94a08fff17e9d2cde931250bc0677e;hp=c6f188a27a3092af092107a0097d1a12a7749fef;hpb=cacc27879eb1dc0b3aec9ac958e432451378e68f;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx index c6f188a2..fb8e663a 100644 --- a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx @@ -1,12 +1,8 @@ -// 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 @@ -63,7 +59,8 @@ void HYDROGUI_ImportBathymetryOp::startOperation() if( myIsEdit ) { - myEditedObject = Handle(HYDROData_Bathymetry)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + if ( isApplyAndClose() ) + myEditedObject = Handle(HYDROData_Bathymetry)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); if( !myEditedObject.IsNull() ) { QString aName = myEditedObject->GetName(); @@ -199,7 +196,8 @@ bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags, module()->setObjectVisible( (size_t)aVTKMgr->getViewModel(), aBathymetryObj, true ); }*/ - theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer; + theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | + UF_VTKViewer | UF_VTK_Forced; if( !myIsEdit ) {