X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=96a838c6d9352e69580ca41ce4e9cdbeb61711d9;hb=8edd427af3997521bda72ca3c416cc1d490565d5;hp=3d65fc5863ec74facd66aba15df8558d9b12ec40;hpb=5c2d86b38d1f9857c204c3a0df6f41459aa74c1c;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index 3d65fc58..96a838c6 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -25,6 +25,7 @@ //#include "CurveCreator_NewPointDlg.h" #include "CurveCreator_NewSectionDlg.h" #include "CurveCreator_Utils.h" +#include "CurveCreator_UtilsICurve.hxx" #include "CurveCreator_TableView.h" #include @@ -799,7 +800,7 @@ void CurveCreator_Widget::onUndo() if( !myCurve ) return; - CurveCreator_Widget::SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); myCurve->undo(); finishCurveModification(); @@ -810,7 +811,7 @@ void CurveCreator_Widget::onRedo() { if( !myCurve ) return; - CurveCreator_Widget::SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); myCurve->redo(); finishCurveModification(); @@ -998,7 +999,7 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEven if ( myDragStarted ) { bool isDragged = myDragged; - CurveCreator_Widget::SectionToPointList aDraggedPoints; + CurveCreator_ICurve::SectionToPointList aDraggedPoints; if ( myDragged ) aDraggedPoints = myDragPoints; @@ -1064,7 +1065,7 @@ void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) if ( aPntIndex < 0 ) return; - SectionToPointList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints ); double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble(); @@ -1112,16 +1113,16 @@ void CurveCreator_Widget::removeSection() */ void CurveCreator_Widget::removePoint() { - SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; getSelectedPonts( aPoints ); if ( aPoints.size() == 0 ) return; - SectionToPointList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints, false ); myCurve->removeSeveralPoints( aPoints ); - finishCurveModification( SectionToPointList() ); + finishCurveModification( CurveCreator_ICurve::SectionToPointList() ); } void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, @@ -1144,23 +1145,25 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, return; // insert the point to the model curve - SectionToPointList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints ); CurveCreator::Coordinates aCoords; aCoords.push_back( aPoint.X() ); aCoords.push_back( aPoint.Y() ); - SectionToPointList aPoints1, aPoints2; + CurveCreator_ICurve::SectionToPointList aPoints1, aPoints2; findSectionsToPoints( aPoint1.X(), aPoint1.Y(), aPoints1 ); findSectionsToPoints( aPoint2.X(), aPoint2.Y(), aPoints2 ); - SectionToPointList::const_iterator anIt = aPoints1.begin(), aLast = aPoints1.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints1.begin(), + aLast = aPoints1.end(); int aSectionId = -1; // there can be a case when a new point is added into two sections int aPoint1Id = -1, aPoint2Id = -1; for ( ; anIt != aLast && aSectionId < 0; anIt++ ) { int aSectionCur = anIt->first; - SectionToPointList::const_iterator anIt2 = aPoints2.begin(), aLast2 = aPoints2.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt2 = aPoints2.begin(), + aLast2 = aPoints2.end(); for ( ; anIt2 != aLast2 && aSectionId < 0; anIt2++ ) { if ( anIt2->first == aSectionCur ) { aSectionId = aSectionCur; @@ -1193,7 +1196,7 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, if ( !aViewPort ) return; - SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(), @@ -1206,7 +1209,8 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, CurveCreator_ICurve::SectionToPointCoordsList aCoordList; std::deque aChangedPos; - SectionToPointList::const_iterator anIt = myDragPoints.begin(), aLast = myDragPoints.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myDragPoints.begin(), + aLast = myDragPoints.end(); for ( ; anIt != aLast; anIt++ ) { int aSectionId = anIt->first; int aPointId = anIt->second; @@ -1264,15 +1268,15 @@ void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool i void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY ) { - SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; findSectionsToPoints( theX, theY, aPoints ); - SectionToPointList aSkipList; + CurveCreator_ICurve::SectionToPointList aSkipList; // table could not contain two equal value rows int aRowId = myLocalPointView->rowCount(); double aCurrentX, aCurrentY; int aSectionId, aPointId; - SectionToPoint aPoint; + CurveCreator_ICurve::SectionToPoint aPoint; for ( int i = 0; i < aRowId; i++ ) { aCurrentX = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble(); aCurrentY = myLocalPointView->item( i, 3 )->data( Qt::UserRole ).toDouble(); @@ -1287,7 +1291,8 @@ void CurveCreator_Widget::addLocalPointToTable( const double theX, const double return; QTableWidgetItem* anItem; - SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(), + aLast = aPoints.end(); for ( ; anIt != aLast; anIt++ ) { aPoint = *anIt; if ( contains( aSkipList, aPoint ) ) @@ -1342,14 +1347,40 @@ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& the myDragged = false; } -void CurveCreator_Widget::getSelectedPonts( CurveCreator_Widget::SectionToPointList& thePoints ) +void CurveCreator_Widget::getSelectedPonts( CurveCreator_ICurve::SectionToPointList& thePoints ) { thePoints.clear(); for ( int i = 0, aNb = myLocalPointView->rowCount(); i < aNb; i++ ) thePoints.push_back( std::make_pair( getSectionId( i ), getPointId( i ) ) ); } -void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionToPointList& thePoints ) + +bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex, + const CurveCreator_ICurve::SectionToPoint& theSToPoint ) +{ + bool isIntersect = false; + + if ( theVertex.IsNull() ) + return isIntersect; + + gp_Pnt aPnt = BRep_Tool::Pnt( theVertex ); + + CurveCreator_ICurve::SectionToPointList aPoints; + findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints ); + + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(), + aLast = aPoints.end(); + CurveCreator_ICurve::SectionToPoint aPoint; + for ( ; anIt != aLast && !isIntersect; anIt++ ) { + aPoint = *anIt; + isIntersect = aPoint.first == theSToPoint.first && aPoint.second == theSToPoint.second; + } + + return isIntersect; +} + + +void CurveCreator_Widget::setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& thePoints ) { if ( myDragStarted ) return; @@ -1358,11 +1389,15 @@ void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionTo return; AIS_ListOfInteractive aListToSelect; + AIS_ListOfInteractive aDisplayedList; ic->DisplayedObjects( aDisplayedList ); + ic->ClearSelected( Standard_False ); - SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end(); - SectionToPoint aSToPoint; + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), + aLast = thePoints.end(); + CurveCreator_ICurve::SectionToPoint aSToPoint; + bool isSelectedVertex = false; for( ; anIt != aLast; anIt++ ) { aSToPoint = *anIt; @@ -1372,31 +1407,31 @@ void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionTo if ( anAIS.IsNull() ) continue; Handle(AIS_Point) anAISPoint = Handle(AIS_Point)::DownCast( anAIS ); - if ( anAISPoint.IsNull() ) - continue; - - TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() ); - - if ( aVertex.IsNull() ) - continue; - - gp_Pnt aPnt = BRep_Tool::Pnt( aVertex ); - - SectionToPointList aPoints; - findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints ); - - SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); - SectionToPoint aPoint; - for ( ; anIt != aLast; anIt++ ) { - aPoint = *anIt; - if ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second ) + if ( !anAISPoint.IsNull() ) { + TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() ); + if ( isIntersectVertexToPoint( aVertex, aSToPoint ) ) aListToSelect.Append( anAIS ); } + else { + Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( anAIS ); + if ( anAISShape.IsNull() ) + continue; + 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() ); + if ( isIntersectVertexToPoint( aVertex, aSToPoint ) ) { + ic->AddOrRemoveSelected( aVertex, Standard_False ); + isSelectedVertex = true; + } + } + } } } - - ic->ClearSelected( Standard_False ); - setObjectsSelected( aListToSelect ); + ic->UpdateCurrentViewer(); + if ( !isSelectedVertex ) + setObjectsSelected( aListToSelect ); updateLocalPointView(); } @@ -1410,7 +1445,7 @@ void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionTo * \param theFillPoints a flag whether the selection list should be filled */ void CurveCreator_Widget::startCurveModification( - CurveCreator_Widget::SectionToPointList& thePoints, + CurveCreator_ICurve::SectionToPointList& thePoints, const bool theFillPoints ) { if ( theFillPoints ) { @@ -1426,7 +1461,7 @@ void CurveCreator_Widget::startCurveModification( * \param thePoints a list of curve selected points */ void CurveCreator_Widget::finishCurveModification( - const CurveCreator_Widget::SectionToPointList& thePoints ) + const CurveCreator_ICurve::SectionToPointList& thePoints ) { if ( getActionMode() == ModificationMode ) setLocalPointContext( true ); @@ -1441,56 +1476,19 @@ void CurveCreator_Widget::finishCurveModification( */ int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY ) { - int aPntIndex = -1; - - CurveCreator::Coordinates aCoords; - for ( int i = 0, aNb = myCurve->getNbPoints( theSectionId ); i < aNb && aPntIndex < 0; i++ ) { - aCoords = myCurve->getPoint( theSectionId, i ); - if ( aCoords.size() < 2 ) - continue; - if ( fabs( aCoords[0] - theX ) < LOCAL_SELECTION_TOLERANCE && - fabs( aCoords[1] - theY ) < LOCAL_SELECTION_TOLERANCE ) - aPntIndex = i; - } - - return aPntIndex; + return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY ); } void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY, - CurveCreator_Widget::SectionToPointList& thePoints ) + CurveCreator_ICurve::SectionToPointList& thePoints ) { - thePoints.clear(); - - int aPointId = -1; - for ( int i = 0, aNb = myCurve->getNbSections(); i < aNb; i++ ) { - aPointId = findLocalPointIndex( i, theX, theY ); - if ( aPointId < 0 ) - continue; - SectionToPoint aPoint = std::make_pair( i, aPointId ); - if ( !contains( thePoints, aPoint ) ) - thePoints.push_back( aPoint ); - } + return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints ); } -void CurveCreator_Widget::convert( const SectionToPointList& thePoints, +void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints, QMap >& theConvPoints ) { - theConvPoints.clear(); - - SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end(); - QList aPoints; - int aSectionId, aPointId; - for ( ; anIt != aLast; anIt++ ) { - aSectionId = anIt->first; - aPointId = anIt->second; - aPoints.clear(); - if ( theConvPoints.contains( aSectionId ) ) - aPoints = theConvPoints[aSectionId]; - if ( aPoints.contains( aPointId ) ) - continue; - aPoints.append( aPointId ); - theConvPoints[aSectionId] = aPoints; - } + return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints ); } /** @@ -1516,14 +1514,8 @@ int CurveCreator_Widget::getPointId( const int theRowId ) const * \param theList a container of values * \param theValue a value */ -bool CurveCreator_Widget::contains( const CurveCreator_Widget::SectionToPointList& theList, - const CurveCreator_Widget::SectionToPoint& theValue ) const +bool CurveCreator_Widget::contains( const CurveCreator_ICurve::SectionToPointList& theList, + const CurveCreator_ICurve::SectionToPoint& theValue ) const { - bool isFound = false; - - SectionToPointList::const_iterator anIt = theList.begin(), aLast = theList.end(); - for ( ; anIt != aLast && !isFound; anIt++ ) - isFound = anIt->first == theValue.first && anIt->second == theValue.second; - - return isFound; + return CurveCreator_UtilsICurve::contains( theList, theValue ); }