X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=dc0d2d6b12f85d497a8e9b55ff765a7cb358faf8;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=b9fd474b75c12ff53cc7a5804a6e28b0e4225b40;hpb=a030863ebde99ebd9aa65d163315855b83c35ec6;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx index b9fd474b..dc0d2d6b 100755 --- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx +++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx @@ -44,6 +44,9 @@ #include +#include +#include + //static int ZValueIncrement = 0; HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit ) @@ -80,6 +83,21 @@ bool HYDROGUI_PolylineOp::deleteEnabled() void HYDROGUI_PolylineOp::startOperation() { + if( myIsEdit ) + { + 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 + // polyline or spline and exist only as shape presentation + SUIT_MessageBox::critical( module()->getApp()->desktop(), + tr( "POLYLINE_IS_UNEDITABLE_TLT" ), + tr( "POLYLINE_IS_UNEDITABLE_MSG" ) ); + abort(); + return; + } + } + if( myCurve ) delete myCurve; @@ -95,9 +113,6 @@ void HYDROGUI_PolylineOp::startOperation() dynamic_cast( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) ); aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 ); - if( myIsEdit ) - myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); - QString aPolylineName; if( !myEditedObject.IsNull() ) { @@ -250,8 +265,14 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, } } + if ( !myIsEdit ) + { + aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() ); + } + // Update the wire of polyline aPolylineObj->Update(); + module()->setIsToUpdate( aPolylineObj ); // the viewer should be release from the widget before the module update it // because it has an opened local context and updated presentation should not be displayed in it @@ -263,6 +284,7 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, // the polyline should be rebuild in all viewers, where it is displayed theUpdateFlags |= UF_Viewer | UF_GV_Forced; theUpdateFlags |= UF_OCCViewer | UF_OCC_Forced; + theUpdateFlags |= UF_VTKViewer; size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); if ( anActiveViewId == 0 )