X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Poly3DOp.cxx;h=0c1f2b2f64584e7cdae874becea06c52a625a2b5;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=6235cda26341ce2edc0f00d1d8676c2ca512e205;hpb=8543e637cbb4ae48998c596241fce567a729eb67;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx b/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx index 6235cda2..0c1f2b2f 100644 --- a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx +++ b/src/HYDROGUI/HYDROGUI_Poly3DOp.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 @@ -23,6 +19,7 @@ #include "HYDROGUI_Poly3DOp.h" #include "HYDROGUI_Module.h" +#include #include "HYDROGUI_Tool.h" #include "HYDROGUI_Poly3DDlg.h" #include "HYDROGUI_UpdateFlags.h" @@ -64,7 +61,8 @@ void HYDROGUI_Poly3DOp::startOperation() QString aPoly3DName; if( myIsEdit ) { - myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + if ( isApplyAndClose() ) + myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); if( !myEditedObject.IsNull() ) aPoly3DName = myEditedObject->GetName(); } @@ -108,7 +106,8 @@ void HYDROGUI_Poly3DOp::startOperation() } bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { HYDROGUI_Poly3DDlg* aPanel = dynamic_cast( inputPanel() ); @@ -149,6 +148,8 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags, else { aResult = Handle(HYDROData_Polyline3D)::DownCast( doc()->CreateObject( KIND_POLYLINE ) ); + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult ); + theBrowseObjectsEntries.append( anEntry ); } if( aResult.IsNull() ) @@ -184,7 +185,8 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags, module()->setObjectVisible( aViewId, aProfile, false ); module()->setObjectVisible( aViewId, aResult, true ); } + module()->setIsToUpdate( aResult ); - theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced; + theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer; return true; }