X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=e3bc69f8a29671b7bbd81446ea3d818a4f7cfa39;hb=1e9be94cc5ff4ad886099c507462d5b70f6d71f9;hp=08a78d8656d62e505d492d9245ae7bc4084a3935;hpb=1adadcc0f42b3e4345d6c231a20f9e251a50a45a;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index 08a78d86..e3bc69f8 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 @@ -36,7 +37,6 @@ #include #include #include "OCCViewer_Utilities.h" -#include "OCCViewer_ViewWidget.h" #include #include @@ -83,7 +83,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, Qt::WindowFlags fl) : QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ), - myOCCViewer( 0 ), myOCCViewWidget( 0 ) + myOCCViewer( 0 ) { myNewSectionEditor = new CurveCreator_NewSectionDlg( this ); myNewSectionEditor->hide(); @@ -270,52 +270,6 @@ OCCViewer_Viewer* CurveCreator_Widget::getOCCViewer() return myOCCViewer; } -/** - * Set an OCC viewer - */ -void CurveCreator_Widget::setOCCViewWidget( OCCViewer_ViewWidget* theViewWidget ) -{ - if ( myOCCViewWidget == theViewWidget ) - return; - - if ( myOCCViewWidget ) { - disconnect( myOCCViewWidget, SIGNAL( mousePressed( QMouseEvent* ) ), - this, SLOT( onMousePress( QMouseEvent* ) ) ); - disconnect( myOCCViewWidget, SIGNAL( mouseReleased( QMouseEvent* ) ), - this, SLOT( onMouseRelease( QMouseEvent* ) ) ); - disconnect( myOCCViewWidget, SIGNAL( mouseMoving( QMouseEvent* ) ), - this, SLOT( onMouseMove( QMouseEvent* ) ) ); - //disconnect( myOCCViewWidget, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), - // this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); - - // restore normal mode in the viewer - OCCViewer_Utilities::setViewWidget2DMode( myOCCViewWidget, OCCViewer_ViewWidget::No2dMode ); - // all local contexts should be closed if the viewer is not more used - setLocalPointContext( false, true ); - } - - myOCCViewWidget = theViewWidget; - if ( myOCCViewWidget ) { - connect( myOCCViewWidget, SIGNAL( mousePressed( QMouseEvent* ) ), - this, SLOT( onMousePress( QMouseEvent* ) ) ); - connect( myOCCViewWidget, SIGNAL( mouseReleased( QMouseEvent* ) ), - this, SLOT( onMouseRelease( QMouseEvent* ) ) ); - connect( myOCCViewWidget, SIGNAL( mouseMoving( QMouseEvent* ) ), - this, SLOT( onMouseMove( QMouseEvent* ) ) ); - //connect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), - // this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); - OCCViewer_Utilities::setViewWidget2DMode( myOCCViewWidget, OCCViewer_ViewWidget::XYPlane ); - } -} - -/** - * Returns current OCC viewer - */ -OCCViewer_ViewWidget* CurveCreator_Widget::getOCCViewWidget() -{ - return myOCCViewWidget; -} - /** * Returns OCC viewer context */ @@ -325,8 +279,6 @@ Handle(AIS_InteractiveContext) CurveCreator_Widget::getAISContext() OCCViewer_Viewer* aViewer = getOCCViewer(); if ( aViewer ) aContext = aViewer->getAISContext(); - else if ( myOCCViewWidget ) - aContext = myOCCViewWidget->getAISContext(); return aContext; } @@ -340,8 +292,6 @@ OCCViewer_ViewPort3d* CurveCreator_Widget::getViewPort() OCCViewer_Viewer* aViewer = getOCCViewer(); if ( aViewer ) aViewPort = ((OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView())->getViewPort(); - else if ( myOCCViewWidget ) - aViewPort = myOCCViewWidget->getViewPort(); return aViewPort; } @@ -373,14 +323,6 @@ void CurveCreator_Widget::setObjectsSelected(const AIS_ListOfInteractive& theLis OCCViewer_Viewer* aViewer = getOCCViewer(); if ( aViewer ) aViewer->setObjectsSelected(theList); - else if ( myOCCViewWidget ) { - Handle(AIS_InteractiveContext) aContext = myOCCViewWidget->getAISContext(); - - AIS_ListIteratorOfListOfInteractive aIt; - for (aIt.Initialize(theList); aIt.More(); aIt.Next()) - aContext->AddOrRemoveSelected(aIt.Value(), false); - aContext->UpdateCurrentViewer(); - } } //======================================================================= @@ -527,7 +469,7 @@ void CurveCreator_Widget::onAdditionMode(bool checked) return; Handle(AIS_InteractiveContext) aContext = getAISContext(); - if( !myCurve || !aContext ) + if( !myCurve || aContext.IsNull() ) return; mySection= -1; @@ -858,7 +800,7 @@ void CurveCreator_Widget::onUndo() if( !myCurve ) return; - CurveCreator_Widget::SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); myCurve->undo(); finishCurveModification(); @@ -869,7 +811,7 @@ void CurveCreator_Widget::onRedo() { if( !myCurve ) return; - CurveCreator_Widget::SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); myCurve->redo(); finishCurveModification(); @@ -984,7 +926,7 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) if ( pe->modifiers() != Qt::ControlModifier ) { Handle(AIS_InteractiveContext) ic = getAISContext(); - if ( !ic ) + if ( ic.IsNull() ) return; gp_Pnt aPnt; @@ -1057,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; @@ -1123,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(); @@ -1171,63 +1113,57 @@ 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, const int theY ) { Handle(AIS_InteractiveContext) aContext = getAISContext(); - if ( !aContext ) + + OCCViewer_ViewPort3d* aViewPort = getViewPort(); + Handle(V3d_View) aView; + if ( aViewPort ) + aView = aViewPort->getView(); + + if ( aContext.IsNull() || aView.IsNull() ) return; gp_Pnt aPoint; gp_Pnt aPoint1, aPoint2; - bool isFoundPoint = false; - - for ( aContext->InitSelected(); aContext->MoreSelected() && !isFoundPoint; - aContext->NextSelected() ) { - TopoDS_Shape aTShape = aContext->SelectedShape(); - if ( !aTShape.IsNull() && aTShape.ShapeType() == TopAbs_VERTEX ) - continue; - else { - Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); - if ( anOwner.IsNull() ) - continue; - const TopLoc_Location& aLocation = anOwner->Location(); - Handle(AIS_InteractiveObject) anAIS = Handle(AIS_InteractiveObject)::DownCast( anOwner->Selectable() ); - isFoundPoint = pointOnObject( anAIS, theX, theY, aPoint, aPoint1, aPoint2 ); - } - } + bool isFoundPoint = CurveCreator_Utils::getNeighbourPoints( aContext, aView, theX, theY, + aPoint, aPoint1, aPoint2 ); if ( !isFoundPoint ) 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; @@ -1260,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(), @@ -1273,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; @@ -1298,45 +1235,23 @@ void CurveCreator_Widget::updateLocalPointView() if ( myDragStarted ) return; Handle(AIS_InteractiveContext) aContext = getAISContext(); - if ( !aContext ) + if ( aContext.IsNull() ) return; + std::list aSelectedList = CurveCreator_Utils::getSelectedPoints( aContext ); + + std::list::const_iterator anIt = aSelectedList.begin(), aLast = aSelectedList.end(); + bool isBlocked = myLocalPointView->blockSignals(true); - gp_Pnt aPnt; myLocalPointView->setRowCount( 0 ); - for ( aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected() ) { - TopoDS_Vertex aVertex; - TopoDS_Shape aShape = aContext->SelectedShape(); - if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) - aVertex = TopoDS::Vertex( aContext->SelectedShape() ); - else { - Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); - if ( !anOwner.IsNull() ) { - Handle(AIS_InteractiveObject) anAIS = Handle(AIS_InteractiveObject)::DownCast( anOwner->Selectable() ); - if ( !anAIS.IsNull() ) { - Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast( anAIS); - if ( !aPoint.IsNull() ) - aVertex = TopoDS::Vertex( aPoint->Vertex() ); - } - if ( aVertex.IsNull() ) { - // the following happens if there are no points in the current curve, there is only a shape - /*Handle(StdSelect_BRepOwner) aBrepOwner = Handle(StdSelect_BRepOwner)::DownCast(anOwner); - if ( aBrepOwner.IsNull() ) - continue; - if ( aBrepOwner->HasShape() ) { - const TopoDS_Shape& aShape = aBrepOwner->Shape(); - if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) - { - aVertex = TopoDS::Vertex( aShape ); - } - }*/ - } - } - } - if ( aVertex.IsNull() ) - continue; - aPnt = BRep_Tool::Pnt( aVertex ); - addLocalPointToTable( aPnt.X(), aPnt.Y() ); + for ( ; anIt != aLast; anIt++ ) + { + float aX = *anIt; + anIt++; + float anY = *anIt; + anIt++; + float aZ = *anIt; + addLocalPointToTable( aX, anY ); } myLocalPointView->blockSignals(isBlocked); } @@ -1346,61 +1261,22 @@ void CurveCreator_Widget::updateLocalPointView() */ void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable ) { - Handle(AIS_InteractiveContext) ic = getAISContext(); - if ( !ic ) - return; - - if ( theOpen ) { - // Open local context if there is no one - if ( !ic->HasOpenedContext() ) { - ic->ClearCurrents( false ); - ic->OpenLocalContext( false/*use displayed objects*/, true/*allow shape decomposition*/ ); - } - AIS_ListOfInteractive aList; - ic->DisplayedObjects( aList ); - int aLSize = 0; - for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() ) - aLSize++; - - for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() ) - { - Handle(AIS_InteractiveObject) anAIS = it.Value(); - if ( !anAIS.IsNull() ) - { - if ( anAIS->IsKind( STANDARD_TYPE( AIS_Shape ) ) ) - { - ic->Load( anAIS, -1/*selection mode*/, true/*allow decomposition*/ ); - ic->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_WIRE ) ); - //ic->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX ) ); - } - else if ( anAIS->DynamicType() != STANDARD_TYPE(AIS_Trihedron) ) - { - ic->Load( anAIS, -1/*selection mode*/, false/*allow decomposition*/ ); - ic->Activate( anAIS, TopAbs_VERTEX ); - } - } - continue; - } - } - else { - if ( ic->HasOpenedContext() ) - ic->CloseAllContexts(); - if ( isUpdateTable ) - updateLocalPointView(); - } + CurveCreator_Utils::setLocalPointContext( getAISContext(), theOpen ); + if ( !theOpen && isUpdateTable ) + updateLocalPointView(); } 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(); @@ -1415,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 ) ) @@ -1470,27 +1347,29 @@ 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 ) +void CurveCreator_Widget::setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& thePoints ) { if ( myDragStarted ) return; Handle(AIS_InteractiveContext) ic = getAISContext(); - if ( !ic || !ic->HasOpenedContext() ) + if ( ic.IsNull() || !ic->HasOpenedContext() ) return; AIS_ListOfInteractive aListToSelect; + AIS_ListOfInteractive aDisplayedList; ic->DisplayedObjects( aDisplayedList ); - 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; for( ; anIt != aLast; anIt++ ) { aSToPoint = *anIt; @@ -1510,11 +1389,12 @@ void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionTo gp_Pnt aPnt = BRep_Tool::Pnt( aVertex ); - SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints ); - SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); - SectionToPoint aPoint; + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(), + aLast = aPoints.end(); + CurveCreator_ICurve::SectionToPoint aPoint; for ( ; anIt != aLast; anIt++ ) { aPoint = *anIt; if ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second ) @@ -1522,6 +1402,14 @@ void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionTo } } } + if ( thePoints.size() > 0 && aListToSelect.First() == aListToSelect.Last() ) { + /*TopExp_Explorer aExpF(myShape,TopAbs_FACE); + for (; aExpF.More(); aExpF.Next()) + { + const TopoDS_Face& aFace = TopoDS::Face(aExpF.Current()); + }*/ + } + ic->ClearSelected( Standard_False ); setObjectsSelected( aListToSelect ); @@ -1538,7 +1426,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 ) { @@ -1554,7 +1442,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 ); @@ -1569,176 +1457,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; - } -} - -/** - * Checks whether the point belongs to the OCC object - * \param theObject a line or shape with a bspline inside - * \param theX the X coordinate in the view. - * \param theY the Y coordinate in the view. - * \param thePoint the output point to be append to the model curve - * \param thePoint1 the output point to bound the line where a new point should be inserted - * \param thePoint2 the output point to bound the line where a new point should be inserted - */ -bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject, - const int theX, const int theY, - gp_Pnt& thePoint, - gp_Pnt& thePoint1, gp_Pnt& thePoint2 ) -{ - bool isFound = false; - - Handle(AIS_InteractiveContext) aContext = getAISContext(); - if ( theObject.IsNull() || !aContext ) - return isFound; - - gp_Pnt aPoint; - Standard_Real aParameter; - gp_Pnt aPnt1, aPnt2; - Handle(AIS_Line) aLine = Handle(AIS_Line)::DownCast( theObject ); - if ( !aLine.IsNull() ) { - const Handle(Geom_Line) aGLine = aLine->Line(); - isFound = hasProjectPointOnCurve( theX, theY, aGLine, aParameter ); - if ( isFound ) { - aPoint = aGLine->Value( aParameter ); - - Handle(Geom_Point) aPStart; - Handle(Geom_Point) aPEnd; - aLine->Points( aPStart, aPEnd ); - aPnt1 = aPStart->Pnt(); - aPnt2 = aPEnd->Pnt(); - - // in case of Geom line a projection is performed to the infinite line, - // so it is necessary to bound it by the line size - Bnd_Box aLineBox; - aLineBox.Set( aPnt1, gp_Vec( aPnt1, aPnt2 ) ); - isFound = !aLineBox.IsOut( aPoint ); - } - } - else { - Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast( theObject ); - if ( !aShape.IsNull() ) { - const TopoDS_Wire& aWire = TopoDS::Wire( aShape->Shape() ); - if ( !aWire.IsNull() ) { - TopExp_Explorer anExp( aWire, TopAbs_EDGE ); - for ( ; anExp.More(); anExp.Next()) - { - const TopoDS_Edge& anEdge = TopoDS::Edge(anExp.Current()); - if ( !anEdge.IsNull() ) { - Standard_Real aFirst, aLast; - Handle(Geom_Curve) aCurve = BRep_Tool::Curve( anEdge, aFirst, aLast ); - - if ( aCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) ) { - Handle(Geom_BSplineCurve) aBSplineCurve = Handle(Geom_BSplineCurve)::DownCast( aCurve ); - if ( !aBSplineCurve.IsNull() ) { - isFound = hasProjectPointOnCurve( theX, theY, aCurve, aParameter ); - if ( isFound ) { - aPoint = aBSplineCurve->Value( aParameter ); - Standard_Integer anI1, anI2; - aBSplineCurve->LocateU( aParameter, LOCAL_SELECTION_TOLERANCE, anI1, anI2 ); - - aPnt1 = aBSplineCurve->Value( aBSplineCurve->Knot( anI1 ) ); - aPnt2 = aBSplineCurve->Value( aBSplineCurve->Knot( anI2 ) ); - } - } - } - } - } - } - } - } - if ( isFound ) { - thePoint = aPoint; - thePoint1 = aPnt1; - thePoint2 = aPnt2; - } - return isFound; -} - -/** - * Returns whether the clicked point belong to the curve or has a very near projection - * \param theX the X coordinate of a point clicked in the OCC viewer - * \param theY the Y coordinate of a point clicked in the OCC viewer - * \param theCurve a geometry curve - * \param theOutPoint a found projected point on the curve - */ -bool CurveCreator_Widget::hasProjectPointOnCurve( const int theX, const int theY, - const Handle(Geom_Curve)& theCurve, - Standard_Real& theParameter ) -{ - bool isFound = false; - OCCViewer_ViewPort3d* aViewPort = getViewPort(); - if ( !aViewPort ) - return isFound; - - Handle(V3d_View) aView = aViewPort->getView(); - gp_Pnt aPoint = CurveCreator_Utils::ConvertClickToPoint( theX, theY, aView ); - - GeomAPI_ProjectPointOnCurve aProj( aPoint, theCurve ); - Standard_Integer aNbPoint = aProj.NbPoints(); - if (aNbPoint > 0) { - for (Standard_Integer j = 1; j <= aNbPoint && !isFound; j++) { - gp_Pnt aNewPoint = aProj.Point( j ); - theParameter = aProj.Parameter( j ); - - int aX, anY; - CurveCreator_Utils::ConvertPointToClick( aNewPoint, aView, aX, anY ); - - int aXDelta = abs( aX - theX ); - int anYDelta = abs( anY - theY ); - isFound = aXDelta < SCENE_PIXEL_TOLERANCE && anYDelta < SCENE_PIXEL_TOLERANCE; - } - } - return isFound; + return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints ); } /** @@ -1764,14 +1495,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 ); }