X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=96a838c6d9352e69580ca41ce4e9cdbeb61711d9;hb=8edd427af3997521bda72ca3c416cc1d490565d5;hp=fa6217e9d89496c13ace7edaf80c27459c07e65e;hpb=57c75fe61de1cf26cd56083955714b1b57b1d30e;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index fa6217e9..96a838c6 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -25,6 +25,8 @@ //#include "CurveCreator_NewPointDlg.h" #include "CurveCreator_NewSectionDlg.h" #include "CurveCreator_Utils.h" +#include "CurveCreator_UtilsICurve.hxx" +#include "CurveCreator_TableView.h" #include #include @@ -34,6 +36,7 @@ #include #include #include +#include "OCCViewer_Utilities.h" #include #include @@ -70,14 +73,16 @@ #include const double LOCAL_SELECTION_TOLERANCE = 0.0001; -const int POINT_INDEX_COLUMN_WIDTH = 50; +const int SECTION_NAME_COLUMN_WIDTH = 75; +const int POINT_INDEX_COLUMN_WIDTH = 40; const int SCENE_PIXEL_TOLERANCE = 10; CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, CurveCreator_ICurve *theCurve, Qt::WindowFlags fl) -: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), myDragStarted( false ), +: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), + myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ), myOCCViewer( 0 ) { myNewSectionEditor = new CurveCreator_NewSectionDlg( this ); @@ -94,15 +99,17 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, connect( mySectionView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onContextMenu(QPoint)) ); myLocalPointView = new QTableWidget(); + myLocalPointView->setItemDelegate( new CurveCreator_TableItemDelegate( myLocalPointView ) ); myLocalPointView->setVisible( false ); - myLocalPointView->setColumnCount( 3 ); - myLocalPointView->setColumnWidth( 0, POINT_INDEX_COLUMN_WIDTH ); + myLocalPointView->setColumnCount( 4 ); + myLocalPointView->setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH ); + myLocalPointView->setColumnWidth( 1, POINT_INDEX_COLUMN_WIDTH ); QStringList aLabels; - //aLabels << tr( "IDENTIFIER_LABEL" ) << tr( "X_POSITION_LBL" ) << tr( "Y_POSITION_LBL" ); - aLabels << tr( "id" ) << tr( "X" ) << tr( "Y" ); + //aLabels << tr( "SECTION_LABEL" ) << tr( "IDENTIFIER_LABEL" ) << tr( "X_POSITION_LBL" ) << tr( "Y_POSITION_LBL" ); + aLabels << tr( "Section" ) << "Index" << tr( "X" ) << tr( "Y" ); myLocalPointView->setHorizontalHeaderLabels( aLabels ); connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ), - this, SLOT( onLocalPointChanged( int, int ) ) ); + this, SLOT( onCellChanged( int, int ) ) ); QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup); // QToolButton* anUndoBtn = new QToolButton(aTB); @@ -181,21 +188,22 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) ); connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) ); aTB->addAction(anAct); - aTB->addSeparator(); + // TODO join + //aTB->addSeparator(); - anAct = createAction( JOIN_ID, tr("JOIN"), aJoinPixmap, tr("JOIN_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_Plus ) ); - connect( anAct, SIGNAL(triggered()), this, SLOT(onJoin()) ); - aTB->addAction(anAct); - aTB->addSeparator(); + //anAct = createAction( JOIN_ID, tr("JOIN"), aJoinPixmap, tr("JOIN_TLT"), + // QKeySequence(Qt::ControlModifier|Qt::Key_Plus ) ); + //connect( anAct, SIGNAL(triggered()), this, SLOT(onJoin()) ); + //aTB->addAction(anAct); anAct = createAction( CLEAR_ALL_ID, tr("CLEAR_ALL"), QPixmap(), tr("CLEAR_ALL_TLT"), QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Delete ) ); connect( anAct, SIGNAL(triggered()), this, SLOT( onClearAll()) ); - anAct = createAction( JOIN_ALL_ID, tr("JOIN_ALL"), QPixmap(), tr("JOIN_ALL_TLT"), - QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Plus ) ); - connect( anAct, SIGNAL(triggered()), this, SLOT(onJoinAll()) ); + // TODO join + //anAct = createAction( JOIN_ALL_ID, tr("JOIN_ALL"), QPixmap(), tr("JOIN_ALL_TLT"), + // QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Plus ) ); + //connect( anAct, SIGNAL(triggered()), this, SLOT(onJoinAll()) ); QVBoxLayout* aSectLayout = new QVBoxLayout(); aSectLayout->setMargin( 5 ); @@ -230,15 +238,16 @@ void CurveCreator_Widget::setOCCViewer( OCCViewer_Viewer* theViewer ) this, SLOT( onMouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ) ); disconnect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ), this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) ); + disconnect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), + this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); + // restore normal mode in the viewer + OCCViewer_Utilities::setViewer2DMode( myOCCViewer, OCCViewer_ViewWindow::No2dMode ); // all local contexts should be closed if the viewer is not more used setLocalPointContext( false, true ); } myOCCViewer = theViewer; if ( myOCCViewer ) { - //OCCViewer_ViewWindow* aWnd = dynamic_cast(myOCCViewer->getViewManager()->getActiveView()); - //if ( aWnd ) - // aWnd->installEventFilter( this ); OCCViewer_ViewManager* aViewManager = dynamic_cast ( myOCCViewer->getViewManager() ); connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), @@ -247,6 +256,9 @@ void CurveCreator_Widget::setOCCViewer( OCCViewer_Viewer* theViewer ) this, SLOT( onMouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ) ); connect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ), this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) ); + connect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), + this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); + OCCViewer_Utilities::setViewer2DMode( myOCCViewer, OCCViewer_ViewWindow::XYPlane ); } } @@ -258,26 +270,68 @@ OCCViewer_Viewer* CurveCreator_Widget::getOCCViewer() return myOCCViewer; } -/*! - \brief Customize event handling - \param watched event receiver object - \param e event - \return \c true if the event processing should be stopped -*/ -/*bool CurveCreator_Widget::eventFilter( QObject* theWatched, QEvent* theEvent ) +/** + * Returns OCC viewer context + */ +Handle(AIS_InteractiveContext) CurveCreator_Widget::getAISContext() +{ + Handle(AIS_InteractiveContext) aContext; + OCCViewer_Viewer* aViewer = getOCCViewer(); + if ( aViewer ) + aContext = aViewer->getAISContext(); + + return aContext; +} + +/** + * Returns OCC viewer view port + */ +OCCViewer_ViewPort3d* CurveCreator_Widget::getViewPort() +{ + OCCViewer_ViewPort3d* aViewPort = 0; + OCCViewer_Viewer* aViewer = getOCCViewer(); + if ( aViewer ) + aViewPort = ((OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView())->getViewPort(); + + return aViewPort; +} + +/** + * Set interaction style in the OCC viewer + * \param theStyle a new style + * \return the previous style + */ +int CurveCreator_Widget::changeInteractionStyle( int theStyle ) { OCCViewer_Viewer* aViewer = getOCCViewer(); if ( !aViewer ) - return; - Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); - bool isLocalContext = aContext->HasOpenedContext(); - if ( !isLocalContext ) - return QWidget::eventFilter( theWatched, theEvent ); + return -1; - bool isProcessed = true; + int aPrevStyle = aViewer->interactionStyle(); + aViewer->setInteractionStyle( theStyle ); - return isProcessed; -}*/ + 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 +//======================================================================= +void CurveCreator_Widget::reset() +{ +} //======================================================================= // function: getUniqSectionName @@ -312,7 +366,9 @@ void CurveCreator_Widget::onSelectionChanged() { QList anEnabledAct; if( myCurve ){ - anEnabledAct << NEW_SECTION_ID; + anEnabledAct << NEW_SECTION_ID << MODIFICATION_MODE_ID; + if ( removeEnabled() ) + anEnabledAct << REMOVE_ID; QList aSelSections = mySectionView->getSelectedSections(); QList< QPair< int, int > > aSelPoints = mySectionView->getSelectedPoints(); CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType(); @@ -325,8 +381,7 @@ void CurveCreator_Widget::onSelectionChanged() anEnabledAct << UP_ID; }*/ if( aSelSections.size() == 1 ){ - anEnabledAct << ADDITION_MODE_ID << MODIFICATION_MODE_ID << DETECTION_MODE_ID; - anEnabledAct << REMOVE_ID; + anEnabledAct << ADDITION_MODE_ID << DETECTION_MODE_ID; } switch ( getActionMode() ) { case AdditionMode: { @@ -344,11 +399,12 @@ void CurveCreator_Widget::onSelectionChanged() int aSectCnt = myCurve->getNbSections(); if( aSectCnt > 0 ) anEnabledAct << CLEAR_ALL_ID; - if( aSectCnt > 1 ) - anEnabledAct << JOIN_ALL_ID; - if( aSelSections.size() > 1 ){ - anEnabledAct << JOIN_ID; - } + // TODO + //if( aSectCnt > 1 ) + // anEnabledAct << JOIN_ALL_ID; + //if( aSelSections.size() > 1 ){ + // anEnabledAct << JOIN_ID; + //} } break; case DetectionMode: { @@ -387,9 +443,10 @@ void CurveCreator_Widget::onSelectionChanged() if( (myCurve->getNbSections() + myCurve->getNbPoints()) > 0 ){ anEnabledAct << REMOVE_ALL_ID; }*/ - if( myCurve->getNbSections() > 1 ){ - anEnabledAct << JOIN_ALL_ID; - } + // TODO + //if( myCurve->getNbSections() > 1 ){ + // anEnabledAct << JOIN_ALL_ID; + //} } QList anIds = myActionMap.keys(); for( int i = 0 ; i < anIds.size() ; i++ ){ @@ -408,26 +465,12 @@ void CurveCreator_Widget::onSelectionChanged() void CurveCreator_Widget::onAdditionMode(bool checked) { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if( !myCurve || !aViewer ) + if (!checked) return; - Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); - OCCViewer_ViewManager* aViewManager = dynamic_cast - (aViewer->getViewManager()); -// if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) { - if( aViewer ) { - if (checked) { -/* myGuiState = aViewWindow->saveState(); - aViewer->enableMultiselection(false); - aViewer->enableSelection(false);*/ - } else { -/* aViewer->enableMultiselection(true); - aViewer->enableSelection(true); - aViewWindow->restoreState( myGuiState );*/ - return; - } - } + Handle(AIS_InteractiveContext) aContext = getAISContext(); + if( !myCurve || aContext.IsNull() ) + return; mySection= -1; myPointNum = -1; @@ -591,9 +634,14 @@ void CurveCreator_Widget::onModifySection() bool isClosed = myNewSectionEditor->isClosed(); CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType(); // myCurve->startOperation(); - myCurve->setClosed( isClosed, mySection ); - myCurve->setSectionName( mySection , aName.toStdString() ); - myCurve->setSectionType( mySection, aSectType ); + if( myCurve->getSectionName(mySection) != aName.toStdString() ) + myCurve->setSectionName( mySection , aName.toStdString() ); + + if( myCurve->getSectionType(mySection) != aSectType ) + myCurve->setSectionType( mySection, aSectType ); + + if( myCurve->isClosed(mySection) != isClosed ) + myCurve->setClosed( mySection, isClosed ); // myCurve->finishOperation(); mySectionView->sectionChanged(mySection); updateUndoRedo(); @@ -726,7 +774,7 @@ void CurveCreator_Widget::onCloseSections() // myCurve->startOperation(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ - myCurve->setClosed(true, aSelSections[i]); + myCurve->setClosed(aSelSections[i], true); mySectionView->sectionChanged(aSelSections[i]); } // myCurve->finishOperation(); @@ -740,7 +788,7 @@ void CurveCreator_Widget::onUncloseSections() // myCurve->startOperation(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ - myCurve->setClosed(false, aSelSections[i]); + myCurve->setClosed(aSelSections[i], false); mySectionView->sectionChanged(aSelSections[i]); } // myCurve->finishOperation(); @@ -751,18 +799,23 @@ void CurveCreator_Widget::onUndo() { if( !myCurve ) return; + + CurveCreator_ICurve::SectionToPointList aPoints; + startCurveModification( aPoints, false ); myCurve->undo(); + finishCurveModification(); mySectionView->reset(); - updateUndoRedo(); } void CurveCreator_Widget::onRedo() { if( !myCurve ) return; + CurveCreator_ICurve::SectionToPointList aPoints; + startCurveModification( aPoints, false ); myCurve->redo(); + finishCurveModification(); mySectionView->reset(); - updateUndoRedo(); } void CurveCreator_Widget::updateUndoRedo() @@ -838,6 +891,30 @@ QList< QPair< int, int > > CurveCreator_Widget::getSelectedPoints() return mySectionView->getSelectedPoints(); } +/** + * According to the widget state, performs the remove action + */ +void CurveCreator_Widget::removeSelected() +{ + onRemove(); +} + +/** + * Checks whether there are some selection to be removed + */ +bool CurveCreator_Widget::removeEnabled() +{ + bool isEnabled = getActionMode() == ModificationMode; + if ( !isEnabled ) { + QList aSelSections = mySectionView->getSelectedSections(); + CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType(); + isEnabled = aSelType == CurveCreator_TreeView::ST_SECTIONS && + aSelSections.size() == 1; + } + return isEnabled; +} + + //================================================================================= // function : GeometryGUI::onGetCoordsByClick() // purpose : Manage mouse press events in Additon mode @@ -848,10 +925,9 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) return; if ( pe->modifiers() != Qt::ControlModifier ) { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) - return; - Handle(AIS_InteractiveContext) ic = aViewer->getAISContext(); + Handle(AIS_InteractiveContext) ic = getAISContext(); + if ( ic.IsNull() ) + return; gp_Pnt aPnt; @@ -871,8 +947,7 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); else*/ { - OCCViewer_ViewPort3d* vp = - ((OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView())->getViewPort(); + OCCViewer_ViewPort3d* vp = getViewPort(); aPnt = CurveCreator_Utils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); } // set the coordinates into dialog @@ -887,10 +962,11 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) } } -//================================================================================= -// function : CurveCreator_Widget::onMousePress() -// purpose : Manage mouse press events in Modification mode -//================================================================================= +/** + * Manage mouse press events + * \param theWindow an owner of the signal + * \param theEvent a mouse event + */ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent ) { if ( theEvent->button() != Qt::LeftButton ) @@ -911,17 +987,27 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent } } -//================================================================================= -// function : HYDROGUI_PolylineOp::onMouseRelease() -// purpose : Manage mouse press events in Modification mode -//================================================================================= +/** + * Manage mouse release events in Modification mode + * \param theWindow an owner of the signal + * \param theEvent a mouse event + */ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEvent ) { if ( getActionMode() != ModificationMode ) return; - if ( myDragStarted ) + if ( myDragStarted ) { + bool isDragged = myDragged; + CurveCreator_ICurve::SectionToPointList aDraggedPoints; + if ( myDragged ) + aDraggedPoints = myDragPoints; + setDragStarted( false ); + // if the drag of some points has happened, restore the drag selection + if ( aDraggedPoints.size() > 0 ) + setSelectedPonts( aDraggedPoints ); + } else // check whether the segment is clicked an a new point should be added to the segment insertPointToSelectedSegment( theEvent->pos().x(), theEvent->pos().y() ); @@ -929,10 +1015,11 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEven updateLocalPointView(); } -//================================================================================= -// function : GeometryGUI::onMouseMove() -// purpose : Manage mouse move events in Modification mode -//================================================================================= +/** + * Manage mouse move events in Modification mode + * \param theWindow an owner of the signal + * \param theEvent a mouse event + */ void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent ) { if ( getActionMode() != ModificationMode || !myDragStarted ) @@ -946,37 +1033,48 @@ void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent ) myDragStartPosition = aPos; } -void CurveCreator_Widget::onLocalPointChanged( int theRow, int theColumn ) +/** + * Set zero viewer by the last view closed in + * \param theManager a viewer manager + */ +void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* theManager ) { - QList aSelSections = mySectionView->getSelectedSections(); - if ( aSelSections.size() < 0 ) - return; + myOCCViewer = 0; +} + +void CurveCreator_Widget::onMousePress( QMouseEvent* theEvent ) +{ + onMousePress( 0, theEvent ); +} + +void CurveCreator_Widget::onMouseRelease( QMouseEvent* theEvent ) +{ + onMouseRelease( 0, theEvent ); +} + +void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent ) +{ + onMouseMove( 0, theEvent ); +} - int aSection = aSelSections[0]; +void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) +{ + int aCurrSect = getSectionId( theRow ); + int aPntIndex = getPointId( theRow ); + + if ( aPntIndex < 0 ) + return; - QList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints ); - int aPntIndex = -1; - int aCurrSect=-1; + double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble(); + double anY = myLocalPointView->item( theRow, 3 )->data( Qt::UserRole ).toDouble(); std::deque aChangedPos; - float aPrevX, aPrevY, aX, anY; - //for( int i = 0 ; i < aSelSections.size() ; i++ ){ - aCurrSect = aSection;//aSelSections[i]; - - aPrevX = myLocalPointView->item( theRow, 1 )->data( Qt::UserRole ).toDouble(); - aPrevY = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble(); - - aPntIndex = findLocalPointIndex( aCurrSect, aPrevX, aPrevY ); - if ( aPntIndex >= 0 ) { - aX = myLocalPointView->item( theRow, 1 )->text().toDouble(); - anY = myLocalPointView->item( theRow, 2 )->text().toDouble(); - aChangedPos.clear(); - aChangedPos.push_back( aX ); - aChangedPos.push_back( anY ); - myCurve->setPoint( aCurrSect, aPntIndex, aChangedPos ); - } - //} + aChangedPos.push_back( aX ); + aChangedPos.push_back( anY ); + myCurve->setPoint( aCurrSect, aPntIndex, aChangedPos ); + finishCurveModification( aSelPoints ); } @@ -1015,158 +1113,145 @@ void CurveCreator_Widget::removeSection() */ void CurveCreator_Widget::removePoint() { - int aSectionId = 0; - QList aPoints; - qSort( aPoints ); - getSelectedPonts( aSectionId, aPoints ); - + CurveCreator_ICurve::SectionToPointList aPoints; + getSelectedPonts( aPoints ); if ( aPoints.size() == 0 ) return; - QList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints, false ); - for( int i = aPoints.size()-1; i >= 0; i-- ){ - int aPntIndx = aPoints[i]; - myCurve->removePoint( aSectionId, aPntIndx ); - mySectionView->pointsRemoved( aSectionId, aPntIndx ); - } - finishCurveModification( QList() ); + myCurve->removeSeveralPoints( aPoints ); + finishCurveModification( CurveCreator_ICurve::SectionToPointList() ); } void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, const int theY ) { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) - return; + Handle(AIS_InteractiveContext) aContext = getAISContext(); - int aPoint1 = -1, aPoint2 = -1; + OCCViewer_ViewPort3d* aViewPort = getViewPort(); + Handle(V3d_View) aView; + if ( aViewPort ) + aView = aViewPort->getView(); + + if ( aContext.IsNull() || aView.IsNull() ) + return; gp_Pnt aPoint; - bool isFoundPoint = false; - Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); - 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 isDone = false; - if ( !isFoundPoint || aPoint1 < 0 || aPoint2 < 0 ) + gp_Pnt aPoint1, aPoint2; + bool isFoundPoint = CurveCreator_Utils::getNeighbourPoints( aContext, aView, theX, theY, + aPoint, aPoint1, aPoint2 ); + if ( !isFoundPoint ) return; // insert the point to the model curve - QList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints ); - int aSection = 0; CurveCreator::Coordinates aCoords; aCoords.push_back( aPoint.X() ); aCoords.push_back( aPoint.Y() ); + CurveCreator_ICurve::SectionToPointList aPoints1, aPoints2; + findSectionsToPoints( aPoint1.X(), aPoint1.Y(), aPoints1 ); + findSectionsToPoints( aPoint2.X(), aPoint2.Y(), aPoints2 ); + 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; + CurveCreator_ICurve::SectionToPointList::const_iterator anIt2 = aPoints2.begin(), + aLast2 = aPoints2.end(); + for ( ; anIt2 != aLast2 && aSectionId < 0; anIt2++ ) { + if ( anIt2->first == aSectionCur ) { + aSectionId = aSectionCur; + aPoint1Id = anIt->second; + aPoint2Id = anIt2->second; + } + } + } + int anInsertPos = -1; - int aLastPoint = myCurve->getNbPoints( 0/*SectionId*/ )-1; - if ( ( aPoint1 == aLastPoint && aPoint2 == 0 ) || - ( aPoint2 == aLastPoint && aPoint1 == 0 ) ) + int aLastPoint = myCurve->getNbPoints( aSectionId )-1; + if ( ( aPoint1Id == aLastPoint && aPoint2Id == 0 ) || + ( aPoint2Id == aLastPoint && aPoint1Id == 0 ) ) anInsertPos = -1; // if the section happens between first and last points else - anInsertPos = aPoint1 < aPoint2 ? aPoint1 + 1 : aPoint2 + 1; + anInsertPos = aPoint1Id < aPoint2Id ? aPoint1Id + 1 : aPoint2Id + 1; - myCurve->addPoints( aCoords, aSection, anInsertPos ); - mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) ); + myCurve->addPoints( aCoords, aSectionId, anInsertPos ); + mySectionView->pointsAdded( aSectionId, myCurve->getNbPoints( aSectionId ) ); finishCurveModification( aSelPoints ); - setSelectedPonts( 0 ); - updateUndoRedo(); + setSelectedPonts(); } void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, const int theYPosition ) { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) + OCCViewer_ViewPort3d* aViewPort = getViewPort(); + if ( !aViewPort ) return; - QList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); - OCCViewer_ViewWindow* aWindow = - (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView(); gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(), - myDragStartPosition.y(), - aWindow->getViewPort()->getView() ); + myDragStartPosition.y(), + aViewPort->getView() ); gp_Pnt anEndPnt = CurveCreator_Utils::ConvertClickToPoint( theXPosition, theYPosition, - aWindow->getViewPort()->getView() ); + aViewPort->getView() ); double aXDelta = aStartPnt.X() - anEndPnt.X(); double anYDelta = aStartPnt.Y() - anEndPnt.Y(); - int aSectionId = 0; - int aPointId; + CurveCreator_ICurve::SectionToPointCoordsList aCoordList; std::deque aChangedPos; - for ( int i = 0, aNb = myDragPoints.size(); i < aNb; i++ ) { - aPointId = myDragPoints[i]; + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myDragPoints.begin(), + aLast = myDragPoints.end(); + for ( ; anIt != aLast; anIt++ ) { + int aSectionId = anIt->first; + int aPointId = anIt->second; aChangedPos = myCurve->getPoint( aSectionId, aPointId ); if ( aChangedPos.size() < 2 ) continue; aChangedPos[0] = aChangedPos[0] - aXDelta; aChangedPos[1] = aChangedPos[1] - anYDelta; - myCurve->setPoint( aSectionId, aPointId, aChangedPos ); + + aCoordList.push_back( + std::make_pair(std::make_pair( aSectionId, aPointId ), + aChangedPos )); } + myCurve->setSeveralPoints( aCoordList ); + + myDragged = true; finishCurveModification( myDragPoints ); } void CurveCreator_Widget::updateLocalPointView() { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) + if ( myDragStarted ) return; - Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); + Handle(AIS_InteractiveContext) aContext = getAISContext(); + 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); } @@ -1176,79 +1261,65 @@ void CurveCreator_Widget::updateLocalPointView() */ void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable ) { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) - return; - Handle(AIS_InteractiveContext) ic = aViewer->getAISContext(); - - 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 ) ); - } - 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 ) { + CurveCreator_ICurve::SectionToPointList aPoints; + findSectionsToPoints( theX, theY, aPoints ); + + CurveCreator_ICurve::SectionToPointList aSkipList; + // table could not contain two equal value rows int aRowId = myLocalPointView->rowCount(); double aCurrentX, aCurrentY; + int aSectionId, aPointId; + CurveCreator_ICurve::SectionToPoint aPoint; for ( int i = 0; i < aRowId; i++ ) { - aCurrentX = myLocalPointView->item( i, 1 )->data( Qt::UserRole ).toDouble(); - aCurrentY = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble(); + aCurrentX = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble(); + aCurrentY = myLocalPointView->item( i, 3 )->data( Qt::UserRole ).toDouble(); if ( fabs( aCurrentX - theX ) < LOCAL_SELECTION_TOLERANCE && - fabs( aCurrentY - theY ) < LOCAL_SELECTION_TOLERANCE ) - return; + fabs( aCurrentY - theY ) < LOCAL_SELECTION_TOLERANCE ) { + aPoint = std::make_pair( getSectionId( i ), getPointId( i ) ); + if ( !contains( aSkipList, aPoint ) ) + aSkipList.push_back( aPoint ); + } } + if ( aSkipList.size() == aPoints.size() ) + return; + QTableWidgetItem* anItem; + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(), + aLast = aPoints.end(); + for ( ; anIt != aLast; anIt++ ) { + aPoint = *anIt; + if ( contains( aSkipList, aPoint ) ) + continue; - myLocalPointView->setRowCount( aRowId+1 ); + myLocalPointView->setRowCount( aRowId+1 ); + aSectionId = aPoint.first; + aPointId = aPoint.second; - int aPointSection = 0; - int aPointIndex = findLocalPointIndex( aPointSection, theX, theY ); + anItem = new QTableWidgetItem( myCurve->getSectionName( aSectionId ).c_str() ); + anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled ); + anItem->setData( Qt::UserRole, aSectionId ); + myLocalPointView->setItem( aRowId, 0, anItem ); - anItem = new QTableWidgetItem( QString::number( aPointIndex + 1 ) ); - anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled ); - myLocalPointView->setItem( aRowId, 0, anItem ); + anItem = new QTableWidgetItem( QString::number( aPointId + 1 ) ); + anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled ); + anItem->setData( Qt::UserRole, aPointId ); + myLocalPointView->setItem( aRowId, 1, anItem ); - anItem = new QTableWidgetItem( QString::number( theX ) ); - anItem->setData( Qt::UserRole, theX ); - myLocalPointView->setItem( aRowId, 1, anItem ); + anItem = new QTableWidgetItem( QString::number( theX ) ); + anItem->setData( Qt::UserRole, theX ); + myLocalPointView->setItem( aRowId, 2, anItem ); - anItem = new QTableWidgetItem( QString::number( theY ) ); - anItem->setData( Qt::UserRole, theY ); - myLocalPointView->setItem( aRowId, 2, anItem ); + anItem = new QTableWidgetItem( QString::number( theY ) ); + anItem->setData( Qt::UserRole, theY ); + myLocalPointView->setItem( aRowId, 3, anItem ); + } } /** @@ -1258,68 +1329,109 @@ void CurveCreator_Widget::addLocalPointToTable( const double theX, const double */ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint ) { - if ( !theState ) { - myDragStarted = false; - myDragPoints.clear(); - } - else { - getSelectedPonts( 0, myDragPoints ); + if ( theState ) { + getSelectedPonts( myDragPoints ); myDragStarted = myDragPoints.size(); myDragStartPosition = thePoint; + if ( myDragStarted ) { + // change a viewer interaction style in order to avoid a select rectangle build + myDragInteractionStyle = changeInteractionStyle( SUIT_ViewModel::KEY_FREE ); + } } + else { + if ( myDragStarted ) + changeInteractionStyle( myDragInteractionStyle ); + myDragStarted = false; + myDragPoints.clear(); + } + myDragged = false; } -void CurveCreator_Widget::getSelectedPonts( int theSectionId, QList& 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 ) ) ); +} + - float aPrevX, aPrevY; - int aPntIndex; - for ( int i = 0, aNb = myLocalPointView->rowCount(); i < aNb; i++ ) { - aPrevX = myLocalPointView->item( i, 1 )->data( Qt::UserRole ).toDouble(); - aPrevY = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble(); +bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex, + const CurveCreator_ICurve::SectionToPoint& theSToPoint ) +{ + bool isIntersect = false; - aPntIndex = findLocalPointIndex( theSectionId, aPrevX, aPrevY ); - if ( aPntIndex >= 0 ) - thePoints.append( aPntIndex ); + 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 int theSectionId, const QList& thePoints ) + +void CurveCreator_Widget::setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& thePoints ) { - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) + if ( myDragStarted ) + return; + Handle(AIS_InteractiveContext) ic = getAISContext(); + if ( ic.IsNull() || !ic->HasOpenedContext() ) return; AIS_ListOfInteractive aListToSelect; - Handle(AIS_InteractiveContext) ic = aViewer->getAISContext(); - if ( !ic->HasOpenedContext() ) - return; - AIS_ListOfInteractive aDisplayedList; ic->DisplayedObjects( aDisplayedList ); - for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() ) - { - Handle(AIS_InteractiveObject) anAIS = it.Value(); - if ( anAIS.IsNull() ) - continue; - Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast( anAIS ); - if ( aPoint.IsNull() ) - continue; + ic->ClearSelected( Standard_False ); - TopoDS_Vertex aVertex = TopoDS::Vertex( aPoint->Vertex() ); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), + aLast = thePoints.end(); + CurveCreator_ICurve::SectionToPoint aSToPoint; + bool isSelectedVertex = false; + for( ; anIt != aLast; anIt++ ) { + aSToPoint = *anIt; - if ( aVertex.IsNull() ) - continue; - - gp_Pnt aPnt = BRep_Tool::Pnt( aVertex ); - int aPointIndex = findLocalPointIndex( theSectionId, aPnt.X(), aPnt.Y() ); - if ( thePoints.contains( aPointIndex ) ) - aListToSelect.Append( anAIS ); + for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() ) + { + Handle(AIS_InteractiveObject) anAIS = it.Value(); + if ( anAIS.IsNull() ) + continue; + Handle(AIS_Point) anAISPoint = Handle(AIS_Point)::DownCast( anAIS ); + 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; + } + } + } + } } - - aViewer->setObjectsSelected( aListToSelect ); + ic->UpdateCurrentViewer(); + if ( !isSelectedVertex ) + setObjectsSelected( aListToSelect ); updateLocalPointView(); } @@ -1332,12 +1444,13 @@ void CurveCreator_Widget::setSelectedPonts( const int theSectionId, const QList< * \param thePoints an output list of curve selected points * \param theFillPoints a flag whether the selection list should be filled */ -void CurveCreator_Widget::startCurveModification( QList& thePoints, const bool theFillPoints ) +void CurveCreator_Widget::startCurveModification( + CurveCreator_ICurve::SectionToPointList& thePoints, + const bool theFillPoints ) { if ( theFillPoints ) { thePoints.clear(); - int aSectionId = 0; - getSelectedPonts( aSectionId, thePoints ); + getSelectedPonts( thePoints ); } setLocalPointContext( false ); } @@ -1347,11 +1460,13 @@ void CurveCreator_Widget::startCurveModification( QList& thePoints, const b * Open local context and select given points inside it. * \param thePoints a list of curve selected points */ -void CurveCreator_Widget::finishCurveModification( const QList& thePoints ) +void CurveCreator_Widget::finishCurveModification( + const CurveCreator_ICurve::SectionToPointList& thePoints ) { - setLocalPointContext( true ); - int aSectionId = 0; - setSelectedPonts( aSectionId, thePoints ); + if ( getActionMode() == ModificationMode ) + setLocalPointContext( true ); + setSelectedPonts( thePoints ); + updateUndoRedo(); } /** @@ -1361,134 +1476,46 @@ void CurveCreator_Widget::finishCurveModification( const QList& thePoints ) */ int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY ) { - int aPntIndex = -1; + return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY ); +} - 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; - } +void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY, + CurveCreator_ICurve::SectionToPointList& thePoints ) +{ + return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints ); +} - return aPntIndex; +void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints, + QMap >& theConvPoints ) +{ + return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints ); } /** - * 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 + * Returns a section index from the table + * \param theRowId a table row */ -bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject, - const int theX, const int theY, - gp_Pnt& thePoint, - int& thePoint1, int& thePoint2 ) +int CurveCreator_Widget::getSectionId( const int theRowId ) const { - bool isFound = false; - - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( theObject.IsNull() || !aViewer ) - return isFound; + return myLocalPointView->item( theRowId, 0 )->data( Qt::UserRole ).toInt(); +} - 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(); - } - } - 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 = findLocalPointIndex( 0, aPnt1.X(), aPnt1.Y() ); - thePoint2 = findLocalPointIndex( 0, aPnt2.X(), aPnt2.Y() ); - isFound = thePoint1 >= 0 && thePoint2 >= 0; - } - return isFound; +/** + * Returns a point index from the table + * \param theRowId a table row + */ +int CurveCreator_Widget::getPointId( const int theRowId ) const +{ + return myLocalPointView->item( theRowId, 1 )->data( Qt::UserRole ).toInt(); } /** - * 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 + * Returns whethe the container has the value + * \param theList a container of values + * \param theValue a value */ -bool CurveCreator_Widget::hasProjectPointOnCurve( const int theX, const int theY, - const Handle(Geom_Curve)& theCurve, - Standard_Real& theParameter ) +bool CurveCreator_Widget::contains( const CurveCreator_ICurve::SectionToPointList& theList, + const CurveCreator_ICurve::SectionToPoint& theValue ) const { - bool isFound = false; - OCCViewer_Viewer* aViewer = getOCCViewer(); - if ( !aViewer ) - return isFound; - - OCCViewer_ViewWindow* aWindow = - (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView(); - Handle(V3d_View) aView = aWindow->getViewPort()->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::contains( theList, theValue ); }