X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=745cf67dc6259e75a94b3978857d41d895e8e577;hb=f7598de0de5abad3f557c8b2c52d0e0163a0951c;hp=8ff209f50dfa3105db4fe141499aa21177e8c0b8;hpb=8a464e12ecf0be7b04e99307b7adb2207b470cb5;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx index 8ff209f5..745cf67d 100755 --- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx +++ b/src/HYDROGUI/HYDROGUI_PolylineOp.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_PolylineOp.h" #include "HYDROGUI_Module.h" +#include "HYDROGUI_DataObject.h" #include "HYDROGUI_PolylineDlg.h" #include "HYDROGUI_Tool.h" #include "HYDROGUI_UpdateFlags.h" @@ -30,7 +27,7 @@ #include #include -#include +#include #include #include @@ -44,13 +41,15 @@ #include +#include +#include + //static int ZValueIncrement = 0; HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit ) : HYDROGUI_Operation( theModule ), myIsEdit( theIsEdit ), - myCurve( NULL ), - myViewManager( NULL ) + myCurve( NULL ) { setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) ); } @@ -78,8 +77,50 @@ bool HYDROGUI_PolylineOp::deleteEnabled() return aPanel->deleteEnabled(); } +/** + * Set Z layer for the operation preview. + \param theLayer a layer position + */ +void HYDROGUI_PolylineOp::updatePreviewZLayer( int theLayer ) +{ + HYDROGUI_Operation::updatePreviewZLayer( theLayer ); + + int aZLayer = getPreviewZLayer(); + if ( aZLayer >= 0 ) + { + if( getPreviewManager() ) + { + if ( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() ) + { + Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); + if( !aCtx.IsNull() ) + { + Handle(AIS_InteractiveObject) anObject = myCurve->getAISObject( true ); + aCtx->SetZLayer( anObject, aZLayer ); + } + } + } + } +} + void HYDROGUI_PolylineOp::startOperation() { + if( myIsEdit ) + { + 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 + // 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; @@ -91,12 +132,13 @@ void HYDROGUI_PolylineOp::startOperation() aPanel->reset(); LightApp_Application* anApp = module()->getApp(); - myViewManager = + OCCViewer_ViewManager* aViewManager = dynamic_cast( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) ); - aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 ); + aPanel->setOCCViewer( aViewManager ? aViewManager->getOCCViewer() : 0 ); + setPreviewManager( aViewManager ); - if( myIsEdit ) - myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + if ( isApplyAndClose() ) + setCursor(); QString aPolylineName; if( !myEditedObject.IsNull() ) @@ -144,6 +186,8 @@ void HYDROGUI_PolylineOp::startOperation() void HYDROGUI_PolylineOp::abortOperation() { + restoreCursor(); + HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel(); if ( aPanel ) aPanel->setOCCViewer( 0 ); @@ -154,9 +198,15 @@ void HYDROGUI_PolylineOp::abortOperation() 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(); @@ -170,15 +220,36 @@ HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const } bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { - HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel(); + HYDROGUI_PolylineDlg* aPanel = ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return false; - int aStudyId = module()->getStudyId(); - bool aHasDoc = HYDROData_Document::HasDocument(aStudyId); - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId ); - if( aDocument.IsNull() ) + QString aPolylineName = aPanel->getPolylineName().simplified(); + if ( aPolylineName.isEmpty() ) + { + theErrorMsg = tr( "INCORRECT_OBJECT_NAME" ); return false; + } + + if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != aPolylineName ) ) + { + // check that there are no other objects with the same name in the document + Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), aPolylineName ); + if( !anObject.IsNull() ) + { + theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( aPolylineName ); + return false; + } + } + + if ( myCurve->getNbSections() <= 0 ) + { + theErrorMsg = tr( "EMPTY_POLYLINE_DATA" ); + return false; + } Handle(HYDROData_PolylineXY) aPolylineObj; if( myIsEdit ) @@ -186,18 +257,15 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, aPolylineObj = myEditedObject; aPolylineObj->RemoveSections(); } - else{ - aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) ); - - //double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised - //aPolylineObj->SetZValue( aZValue ); + else + { + aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( doc()->CreateObject( KIND_POLYLINEXY ) ); } if( aPolylineObj.IsNull() ) return false; - QString aPolylineName = aPanel->getPolylineName(); - aPolylineObj->SetName(aPolylineName); + aPolylineObj->SetName( aPolylineName ); for ( int i = 0 ; i < myCurve->getNbSections() ; i++ ) { @@ -214,6 +282,13 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, // Add the points fro section CurveCreator::Coordinates aCurveCoords = myCurve->getPoints( i ); + + if ( aCurveCoords.size() <= 2 ) + { + theErrorMsg = tr( "NUMBER_OF_SECTION_POINTS_INCORRECT" ); + return false; + } + for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ ) { HYDROData_PolylineXY::Point aSectPoint; @@ -226,8 +301,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 @@ -239,6 +320,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 ) @@ -249,6 +331,8 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, if( !myIsEdit ) { module()->setObjectVisible( anActiveViewId, aPolylineObj, true ); + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ); + theBrowseObjectsEntries.append( anEntry ); } return true; @@ -264,27 +348,26 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged() CurveCreator_Displayer* aDisplayer = myCurve->getDisplayer(); if( !aDisplayer ) return; - QList aSelSections = aPanel->getSelectedSections(); - for( int i = 0 ; i < myCurve->getNbSections() ; i++ ){ - bool aIsHl = false; - if( aSelSections.contains(i) ){ - aDisplayer->highlight( myCurve->constructSection(i), aIsHl ); - } - } + //QList aSelSections = aPanel->getSelectedSections(); + bool aIsHl = false; + //if( aSelSections.contains(i) ){ + // TODO + //aDisplayer->highlight( myCurve->getAISObject(), aIsHl ); + //} } void HYDROGUI_PolylineOp::displayPreview() { - if( myViewManager ) + if( getPreviewManager() ) { - if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() ) + if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() ) { Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if( !aCtx.IsNull() ) { - CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx ); + CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx, getPreviewZLayer() ); myCurve->setDisplayer( aDisplayer ); - aDisplayer->display( myCurve->constructWire(), true ); + aDisplayer->display( myCurve->getAISObject( true ), true ); } } } @@ -293,15 +376,22 @@ void HYDROGUI_PolylineOp::displayPreview() void HYDROGUI_PolylineOp::erasePreview() { CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0; - if( myViewManager && aDisplayer ) + if( getPreviewManager() && aDisplayer ) { - if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() ) + if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() ) { Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if( !aCtx.IsNull() ) { - aDisplayer->erase( true ); + aDisplayer->eraseAll( true ); } } } + + setPreviewManager( NULL ); + if ( myCurve ) + { + delete myCurve; + myCurve = NULL; + } }