X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=ea0b5098a0cdff39cf4e25d4d25090589c7a3449;hb=f8d32cb2595584ebe43d5a664a457500e17e454d;hp=37a4c78279bf0a7c9d205c4b9f37038c2c1ef90b;hpb=af38df5f512628d93c9850d284e03d037ca98b48;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index 37a4c782..ea0b5098 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -52,15 +52,10 @@ #include #include #include -#include -#include #include #include #include #include -#include -#include -#include #include #include @@ -102,8 +97,6 @@ -const double LOCAL_SELECTION_TOLERANCE = 0.0001; - CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, CurveCreator_ICurve *theCurve, Qt::WindowFlags fl, @@ -333,18 +326,6 @@ int CurveCreator_Widget::changeInteractionStyle( int theStyle ) return aPrevStyle; } -/** - * Set interaction style in the OCC viewer - * \param theStyle a new style - * \return the previous style - */ -void CurveCreator_Widget::setObjectsSelected(const AIS_ListOfInteractive& theList) -{ - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( aViewer ) - aViewer->setObjectsSelected(theList); -} - //======================================================================= // function: reset // purpose: reset the widget viewer, close local context, clear selection @@ -1015,7 +996,7 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEven if ( aDraggedPoints.size() > 0 ) { START_MEASURE_TIME; - setSelectedPonts( aDraggedPoints ); + setSelectedPoints( aDraggedPoints ); END_MEASURE_TIME( "drop" ); } } @@ -1129,7 +1110,7 @@ void CurveCreator_Widget::removeSection() void CurveCreator_Widget::removePoint() { CurveCreator_ICurve::SectionToPointList aPoints; - getSelectedPonts( aPoints ); + getSelectedPoints( aPoints ); if ( aPoints.size() == 0 ) return; @@ -1201,7 +1182,7 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, finishCurveModification( aSelPoints ); - setSelectedPonts(); + setSelectedPoints(); } void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, @@ -1253,27 +1234,21 @@ void CurveCreator_Widget::updateLocalPointView() if ( aContext.IsNull() ) return; - std::list aSelectedList = CurveCreator_Utils::getSelectedPoints( aContext ); - int aNbPoints = aSelectedList.size()/3; + CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints ); + int aNbPoints = myLocalPoints.size(); bool isRowLimit = aNbPoints > myLocalPointRowLimit; myLocalPointView->setVisible( !isRowLimit ); - if ( isRowLimit ) - return; - std::list::const_iterator anIt = aSelectedList.begin(), aLast = aSelectedList.end(); - - bool isBlocked = myLocalPointView->blockSignals(true); - myLocalPointView->setRowCount( 0 ); - for ( ; anIt != aLast; anIt++ ) - { - float aX = *anIt; - anIt++; - float anY = *anIt; - anIt++; - float aZ = *anIt; - myLocalPointView->addLocalPointToTable( aX, anY ); + if ( !isRowLimit ) { + bool isBlocked = myLocalPointView->blockSignals(true); + myLocalPointView->setRowCount( 0 ); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myLocalPoints.begin(), + aLast = myLocalPoints.end(); + for ( ; anIt != aLast; anIt++ ) + myLocalPointView->addLocalPointToTable( *anIt ); + + myLocalPointView->blockSignals( isBlocked ); } - myLocalPointView->blockSignals(isBlocked); } /** @@ -1294,7 +1269,7 @@ void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool i void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint ) { if ( theState ) { - getSelectedPonts( myDragPoints ); + getSelectedPoints( myDragPoints ); myDragStarted = myDragPoints.size(); myDragStartPosition = thePoint; if ( myDragStarted ) { @@ -1311,141 +1286,22 @@ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& the myDragged = false; } -void CurveCreator_Widget::getSelectedPonts( CurveCreator_ICurve::SectionToPointList& thePoints ) +void CurveCreator_Widget::getSelectedPoints( CurveCreator_ICurve::SectionToPointList& thePoints ) { thePoints.clear(); - for ( int i = 0, aNb = myLocalPointView->rowCount(); i < aNb; i++ ) - thePoints.push_back( std::make_pair( myLocalPointView->getSectionId( i ), - myLocalPointView->getPointId( i ) ) ); + thePoints = myLocalPoints; } - -bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex, - const CurveCreator_ICurve::SectionToPoint& theSToPoint ) -{ - bool isIntersect = false; - if ( theVertex.IsNull() ) - return isIntersect; - - gp_Pnt aSPoint; - CurveCreator_UtilsICurve::getPoint( myCurve, theSToPoint.first, theSToPoint.second, - aSPoint ); - gp_Pnt aVertexPoint = BRep_Tool::Pnt( theVertex ); - isIntersect = fabs( aVertexPoint.X() - aSPoint.X() ) < LOCAL_SELECTION_TOLERANCE && - fabs( aVertexPoint.Y() - aSPoint.Y() ) < LOCAL_SELECTION_TOLERANCE; - - return isIntersect; -} - - -void CurveCreator_Widget::setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& thePoints ) +void CurveCreator_Widget::setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& thePoints ) { if ( myDragStarted ) return; - - Handle(AIS_InteractiveContext) ic = getAISContext(); - if ( ic.IsNull() || !ic->HasOpenedContext() ) + Handle(AIS_InteractiveContext) aContext = getAISContext(); + if ( aContext.IsNull() || !aContext->HasOpenedContext() ) return; - AIS_ListOfInteractive aListToSelect; - AIS_ListOfInteractive aDisplayedList; - ic->DisplayedObjects( aDisplayedList ); - ic->ClearSelected( Standard_False ); - - bool isSelectedVertex = false; - - //ASL: std::vector aVetexVec; - for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() ) - { - Handle(AIS_InteractiveObject) anAIS = it.Value(); - if ( anAIS.IsNull() ) - continue; - Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( anAIS ); - if ( anAISShape.IsNull() ) - continue; - - - /*ASL: const TopoDS_Shape& aShape = anAISShape->Shape(); - TopExp_Explorer aExpV( aShape, TopAbs_VERTEX); - for ( ; aExpV.More(); aExpV.Next() ) - { - const TopoDS_Vertex& aVertex = TopoDS::Vertex( aExpV.Current() ); - aVetexVec.push_back( aVertex ); - }*/ - - - //ASL: we convert list of point indices to list of points coordinates - int aSize = thePoints.size(); - std::vector aPntsToSelect( aSize ); - - CurveCreator_ICurve::SectionToPointList::const_iterator - aPIt = thePoints.begin(), aPLast = thePoints.end(); - CurveCreator_ICurve::SectionToPoint aSToPoint; - for( int i=0; aPIt != aPLast; aPIt++, i++ ) - { - gp_Pnt aPntToSelect; - CurveCreator_UtilsICurve::getPoint( myCurve, aPIt->first, aPIt->second, aPntToSelect ); - aPntsToSelect[i] = aPntToSelect; - } - - - //ASL: we switch off automatic highlight to improve performance of selection - ic->SetAutomaticHilight( Standard_False ); - - Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); - for( aSelection->Init(); aSelection->More(); aSelection->Next() ) - { - Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive(); - Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity ); - - gp_Pnt anOwnerPnt = aSenPnt->Point(); - Handle_SelectMgr_EntityOwner anOwner = Handle_SelectMgr_EntityOwner::DownCast( aSenPnt->OwnerId() ); - - - CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), - aLast = thePoints.end(); - bool isFound = false; - for( int i=0; iAddOrRemoveSelected( anOwner, Standard_False ); - break; - } - } - } - } - - /*ASL: std::vector::const_iterator aVecIt = aVetexVec.begin(), aVecLast = aVetexVec.end(); - CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), - aLast = thePoints.end(); - int aSize = aVetexVec.size(); - CurveCreator_ICurve::SectionToPoint aSToPoint; - int anAddedSize = 0; - for( ; anIt != aLast; anIt++ ) { - aSToPoint = *anIt; - - for ( aVecIt = aVetexVec.begin(); aVecIt != aVecLast; aVecIt++ ) - { - TopoDS_Vertex aVertex = TopoDS::Vertex( *aVecIt ); - if ( isIntersectVertexToPoint( aVertex, aSToPoint ) ) { - ic->AddOrRemoveSelected( aVertex, Standard_False ); - isSelectedVertex = true; - anAddedSize++; - } - } - }*/ - - //ASL: we switch on again automatic highlight (otherwise selection will not be shown) - // and call HilightPicked to draw selected owners - ic->SetAutomaticHilight( Standard_True ); - ic->LocalContext()->HilightPicked( Standard_True ); + CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints ); - //ic->UpdateCurrentViewer(); - if ( !isSelectedVertex ) - setObjectsSelected( aListToSelect ); updateLocalPointView(); } @@ -1464,7 +1320,7 @@ void CurveCreator_Widget::startCurveModification( { if ( theFillPoints ) { thePoints.clear(); - getSelectedPonts( thePoints ); + getSelectedPoints( thePoints ); } setLocalPointContext( false ); } @@ -1479,7 +1335,7 @@ void CurveCreator_Widget::finishCurveModification( { if ( getActionMode() == ModificationMode ) setLocalPointContext( true ); - setSelectedPonts( thePoints ); + setSelectedPoints( thePoints ); updateUndoRedo(); }