X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=9666cf7afc5e9c300cba9c3c5b71c7b87995d748;hb=9d44116e703eee10527cef6c81ab5f6805515111;hp=7ad2b2f6c9c746fa22d722e042fcd7bdca8342ed;hpb=512ec397c07a7f6f569c058451daf788154deb3a;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx index 7ad2b2f6..9666cf7a 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,14 +19,18 @@ #include "HYDROGUI_PolylineOp.h" #include "HYDROGUI_Module.h" +#include "HYDROGUI_DataObject.h" #include "HYDROGUI_PolylineDlg.h" #include "HYDROGUI_Tool.h" +#include "HYDROGUI_Tool2.h" #include "HYDROGUI_UpdateFlags.h" #include +#include +#include #include -#include +#include #include #include @@ -44,13 +44,19 @@ #include +#include +#include + +#include +#include + //static int ZValueIncrement = 0; +static const double HYDROGUI_MAXIMAL_DEFLECTION = 1e-2; 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 +84,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 +139,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() ) @@ -106,27 +155,90 @@ void HYDROGUI_PolylineOp::startOperation() NCollection_Sequence aSectClosures; myEditedObject->GetSections( aSectNames, aSectTypes, aSectClosures ); - for ( int i = 1, n = aSectNames.Size(); i <= n; ++i ) + if (!aSectNames.IsEmpty()) { - QString aSectName = HYDROGUI_Tool::ToQString( aSectNames.Value( i ) ); - HYDROData_PolylineXY::SectionType aSectType = aSectTypes.Value( i ); - bool aSectClosure = aSectClosures.Value( i ); - - CurveCreator::SectionType aCurveType = CurveCreator::Polyline; - if( aSectType == HYDROData_PolylineXY::SECTION_SPLINE ) - aCurveType = CurveCreator::Spline; - - CurveCreator::Coordinates aCurveCoords; - - HYDROData_PolylineXY::PointsList aSectPointsList = myEditedObject->GetPoints( i - 1 ); - for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k ) + for ( int i = 1, n = aSectNames.Size(); i <= n; ++i ) + { + QString aSectName = HYDROGUI_Tool::ToQString( aSectNames.Value( i ) ); + HYDROData_PolylineXY::SectionType aSectType = aSectTypes.Value( i ); + bool aSectClosure = aSectClosures.Value( i ); + + CurveCreator::SectionType aCurveType = CurveCreator::Polyline; + if( aSectType == HYDROData_PolylineXY::SECTION_SPLINE ) + aCurveType = CurveCreator::Spline; + + CurveCreator::Coordinates aCurveCoords; + + HYDROData_PolylineXY::PointsList aSectPointsList = + myEditedObject->GetPoints( i - 1 ); + for (int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k) + { + const HYDROData_PolylineXY::Point& aSectPoint = + aSectPointsList.Value( k ); + aCurveCoords.push_back( aSectPoint.X() ); + aCurveCoords.push_back( aSectPoint.Y() ); + } + + myCurve->addSectionInternal( aSectName.toStdString(), + aCurveType, aSectClosure, aCurveCoords ); + } + } + else + { + std::deque aPs; + std::deque isCloseds; + std::vector aWires; + HYDROData_PolylineOperator::GetWires(myEditedObject, aWires); + const int aSCount = aWires.size(); + bool isError = false; + for (int aSI = 0; aSI < aSCount; ++aSI) { - const HYDROData_PolylineXY::Point& aSectPoint = aSectPointsList.Value( k ); - aCurveCoords.push_back( aSectPoint.X() ); - aCurveCoords.push_back( aSectPoint.Y() ); + HYDROData_TopoCurve aCurve, aCurve2; + std::list aPs2; + int aMaxPieceCount; + if (!aCurve.Initialize(aWires[aSI]) || + (aMaxPieceCount = aCurve.BSplinePiecewiseCurve( + HYDROGUI_MAXIMAL_DEFLECTION * 0.1, aCurve2)) == 0) + { + isError = true; + break; + } + + double aDefl; + aMaxPieceCount *= 100; + int aPieceCount = 0; + while (aPieceCount < aMaxPieceCount && + (aDefl = HYDROData_PolylineOperator::ReduceDeflection( + HYDROGUI_MAXIMAL_DEFLECTION, aCurve2, aPieceCount)) > + HYDROGUI_MAXIMAL_DEFLECTION); + if (aDefl < 0 || !aCurve2.ValuesInKnots(aPs2)) + { + isError = true; + break; + } + + aPs.push_back(CurveCreator::Coordinates()); + CurveCreator::Coordinates& aPs3 = aPs.back(); + std::list::const_iterator aLastPIt = aPs2.end(); + std::list::const_iterator aPIt = aPs2.begin(); + for (; aPIt != aLastPIt; ++aPIt) + { + const gp_XYZ aP = *aPIt; + aPs3.push_back(aP.X()); + aPs3.push_back(aP.Y()); + } + isCloseds.push_back(aCurve.IsClosed()); } - myCurve->addSectionInternal( aSectName.toStdString(), aCurveType, aSectClosure, aCurveCoords ); + if (!isError) + { + const TCollection_AsciiString aNamePrefix = "Section_"; + for (int aSI = 0; aSI < aSCount; ++aSI) + { + myCurve->addSectionInternal((aNamePrefix + (aSI + 1)).ToCString(), + CurveCreator::Spline, isCloseds[aSI], aPs[aSI]); + } + } } aPolylineName = myEditedObject->GetName(); @@ -144,6 +256,8 @@ void HYDROGUI_PolylineOp::startOperation() void HYDROGUI_PolylineOp::abortOperation() { + restoreCursor(); + HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel(); if ( aPanel ) aPanel->setOCCViewer( 0 ); @@ -154,9 +268,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,7 +290,8 @@ HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const } bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { HYDROGUI_PolylineDlg* aPanel = ::qobject_cast( inputPanel() ); if ( !aPanel ) @@ -250,8 +371,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 +390,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 ) @@ -273,6 +401,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; @@ -291,22 +421,23 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged() //QList aSelSections = aPanel->getSelectedSections(); bool aIsHl = false; //if( aSelSections.contains(i) ){ - aDisplayer->highlight( myCurve->constructWire(), aIsHl ); + // 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 ); } } } @@ -315,15 +446,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; + } }