X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=96a838c6d9352e69580ca41ce4e9cdbeb61711d9;hb=8edd427af3997521bda72ca3c416cc1d490565d5;hp=fe6d6b8848cf55a46adf683ab10d816ef845d594;hpb=4e7f0692821fc25214c394b5df638bba2e672d22;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index fe6d6b88..96a838c6 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -24,8 +24,9 @@ #include "CurveCreator.hxx" //#include "CurveCreator_NewPointDlg.h" #include "CurveCreator_NewSectionDlg.h" - -#include +#include "CurveCreator_Utils.h" +#include "CurveCreator_UtilsICurve.hxx" +#include "CurveCreator_TableView.h" #include #include @@ -35,14 +36,27 @@ #include #include #include +#include "OCCViewer_Utilities.h" #include #include +#include +#include +#include +#include +#include +#include + +#include #include #include #include #include +#include +#include +#include +#include #include #include @@ -58,192 +72,266 @@ #include #include -#define LOCAL_SELECTION_TOLERANCE 0.0001 +const double LOCAL_SELECTION_TOLERANCE = 0.0001; +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) -{ - myNewSectionEditor = new CurveCreator_NewSectionDlg( this ); - myNewSectionEditor->hide(); - connect( myNewSectionEditor, SIGNAL(addSection()), this, SLOT(onAddNewSection()) ); - connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) ); - connect( myNewSectionEditor, SIGNAL(cancelSection()), this, SLOT(onCancelSection()) ); - - QGroupBox* aSectionGroup = new QGroupBox(tr("Sections"),this); - - mySectionView = new CurveCreator_TreeView(myCurve, aSectionGroup); - connect( mySectionView, SIGNAL(selectionChanged()), this, SLOT( onSelectionChanged() ) ); - connect( mySectionView, SIGNAL(sectionEntered(int)), this, SLOT(onEditSection(int)) ); - connect( mySectionView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onContextMenu(QPoint)) ); - - myLocalPointView = new QTableWidget(); - myLocalPointView->setVisible( false ); - myLocalPointView->setColumnCount( 3 ); - QStringList aLabels; - //aLabels << tr( "IDENTIFIER_LABEL" ) << tr( "X_POSITION_LBL" ) << tr( "Y_POSITION_LBL" ); - aLabels << tr( "id" ) << tr( "X" ) << tr( "Y" ); - myLocalPointView->setHorizontalHeaderLabels( aLabels ); - connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ), - this, SLOT( onLocalPointChanged( int, int ) ) ); - - QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup); + Qt::WindowFlags fl) +: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), + myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ), + myOCCViewer( 0 ) +{ + myNewSectionEditor = new CurveCreator_NewSectionDlg( this ); + myNewSectionEditor->hide(); + connect( myNewSectionEditor, SIGNAL(addSection()), this, SLOT(onAddNewSection()) ); + connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) ); + connect( myNewSectionEditor, SIGNAL(cancelSection()), this, SLOT(onCancelSection()) ); + + QGroupBox* aSectionGroup = new QGroupBox(tr("Sections"),this); + + mySectionView = new CurveCreator_TreeView(myCurve, aSectionGroup); + connect( mySectionView, SIGNAL(selectionChanged()), this, SLOT( onSelectionChanged() ) ); + connect( mySectionView, SIGNAL(sectionEntered(int)), this, SLOT(onEditSection(int)) ); + connect( mySectionView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onContextMenu(QPoint)) ); + + myLocalPointView = new QTableWidget(); + myLocalPointView->setItemDelegate( new CurveCreator_TableItemDelegate( myLocalPointView ) ); + myLocalPointView->setVisible( false ); + myLocalPointView->setColumnCount( 4 ); + myLocalPointView->setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH ); + myLocalPointView->setColumnWidth( 1, POINT_INDEX_COLUMN_WIDTH ); + QStringList aLabels; + //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( onCellChanged( int, int ) ) ); + + QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup); // QToolButton* anUndoBtn = new QToolButton(aTB); - SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); - QPixmap anUndoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_UNDO"))); - QPixmap aRedoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_REDO"))); - QPixmap aNewSectionPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_SECTION"))); - QPixmap aNewPointPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_POINT"))); - QPixmap anEditPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS"))); - QPixmap aDetectPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS"))); - QPixmap aPolylinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_POLYLINE"))); - QPixmap aSplinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_SPLINE"))); - QPixmap aRemovePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_DELETE"))); - QPixmap aJoinPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_JOIN"))); - QPixmap aStepUpPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_UP"))); - QPixmap aStepDownPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_DOWN"))); - - QAction* anAct = createAction( UNDO_ID, tr("UNDO"), anUndoPixmap, tr("UNDO_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_Z) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onUndo()) ); - aTB->addAction(anAct); - - anAct = createAction( REDO_ID, tr("REDO"), aRedoPixmap, tr("REDO_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_Y) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onRedo()) ); - aTB->addAction(anAct); - - aTB->addSeparator(); - - anAct = createAction( NEW_SECTION_ID, tr("NEW_SECTION"), aNewSectionPixmap, tr("NEW_SECTION_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_N) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onNewSection()) ); - aTB->addAction(anAct); - aTB->addSeparator(); - - anAct = createAction( ADDITION_MODE_ID, tr("ADDITION_MODE"), aNewPointPixmap, tr("ADDITION_MODE_TLT"), - QKeySequence() ); - anAct->setCheckable(true); - connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onAdditionMode(bool)) ); - connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); - aTB->addAction(anAct); - - anAct = createAction( MODIFICATION_MODE_ID, tr("MODIFICATION_MODE"), anEditPointsPixmap, tr("MODIFICATION_MODE_TLT"), - QKeySequence() ); - anAct->setCheckable(true); - connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onModificationMode(bool)) ); - connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); - aTB->addAction(anAct); - - anAct = createAction( DETECTION_MODE_ID, tr("DETECTION_MODE"), aDetectPointsPixmap, tr("DETECTION_MODE_TLT"), - QKeySequence() ); - anAct->setCheckable(true); - connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onDetectionMode(bool)) ); - connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); - aTB->addAction(anAct); - - anAct = createAction( CLOSE_SECTIONS_ID, tr("CLOSE_SECTIONS"), QPixmap(), tr("CLOSE_SECTIONS_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_W) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onCloseSections()) ); - - anAct = createAction( UNCLOSE_SECTIONS_ID, tr("UNCLOSE_SECTIONS"), QPixmap(), - tr("UNCLOSE_SECTIONS_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_S) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) ); - - anAct = createAction( SET_SECTIONS_POLYLINE_ID, tr("SET_SECTIONS_POLYLINE"), - aPolylinePixmap, tr("SET_POLYLINE_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_E) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) ); - - anAct = createAction( SET_SECTIONS_SPLINE_ID, tr("SET_SECTIONS_SPLINE"), aSplinePixmap, - tr("SET_SPLINE_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_R) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onSetSpline()) ); - - anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"), - QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) ); - connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) ); - 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); - aTB->addSeparator(); - - 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()) ); - - QVBoxLayout* aSectLayout = new QVBoxLayout(); - aSectLayout->setMargin( 5 ); - aSectLayout->setSpacing( 5 ); - aSectLayout->addWidget(aTB); - aSectLayout->addWidget(mySectionView); - aSectLayout->addWidget( myLocalPointView ); - aSectionGroup->setLayout(aSectLayout); - QVBoxLayout* aLay = new QVBoxLayout(); - aLay->setMargin( 0 ); - aLay->setSpacing( 5 ); + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + QPixmap anUndoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_UNDO"))); + QPixmap aRedoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_REDO"))); + QPixmap aNewSectionPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_SECTION"))); + QPixmap aNewPointPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_POINT"))); + QPixmap anEditPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS"))); + QPixmap aDetectPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS"))); + QPixmap aPolylinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_POLYLINE"))); + QPixmap aSplinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_SPLINE"))); + QPixmap aRemovePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_DELETE"))); + QPixmap aJoinPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_JOIN"))); + QPixmap aStepUpPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_UP"))); + QPixmap aStepDownPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_DOWN"))); + + QAction* anAct = createAction( UNDO_ID, tr("UNDO"), anUndoPixmap, tr("UNDO_TLT"), + QKeySequence(Qt::ControlModifier|Qt::Key_Z) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onUndo()) ); + aTB->addAction(anAct); + + anAct = createAction( REDO_ID, tr("REDO"), aRedoPixmap, tr("REDO_TLT"), + QKeySequence(Qt::ControlModifier|Qt::Key_Y) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onRedo()) ); + aTB->addAction(anAct); + + aTB->addSeparator(); + + anAct = createAction( NEW_SECTION_ID, tr("NEW_SECTION"), aNewSectionPixmap, tr("NEW_SECTION_TLT"), + QKeySequence(Qt::ControlModifier|Qt::Key_N) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onNewSection()) ); + aTB->addAction(anAct); + aTB->addSeparator(); + + anAct = createAction( ADDITION_MODE_ID, tr("ADDITION_MODE"), aNewPointPixmap, tr("ADDITION_MODE_TLT"), + QKeySequence() ); + anAct->setCheckable(true); + connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onAdditionMode(bool)) ); + connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); + aTB->addAction(anAct); + + anAct = createAction( MODIFICATION_MODE_ID, tr("MODIFICATION_MODE"), anEditPointsPixmap, tr("MODIFICATION_MODE_TLT"), + QKeySequence() ); + anAct->setCheckable(true); + connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onModificationMode(bool)) ); + connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); + aTB->addAction(anAct); + + anAct = createAction( DETECTION_MODE_ID, tr("DETECTION_MODE"), aDetectPointsPixmap, tr("DETECTION_MODE_TLT"), + QKeySequence() ); + anAct->setCheckable(true); + connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onDetectionMode(bool)) ); + connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); + aTB->addAction(anAct); + + anAct = createAction( CLOSE_SECTIONS_ID, tr("CLOSE_SECTIONS"), QPixmap(), tr("CLOSE_SECTIONS_TLT"), + QKeySequence(Qt::ControlModifier|Qt::Key_W) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onCloseSections()) ); + + anAct = createAction( UNCLOSE_SECTIONS_ID, tr("UNCLOSE_SECTIONS"), QPixmap(), + tr("UNCLOSE_SECTIONS_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_S) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) ); + + anAct = createAction( SET_SECTIONS_POLYLINE_ID, tr("SET_SECTIONS_POLYLINE"), + aPolylinePixmap, tr("SET_POLYLINE_TLT"), + QKeySequence(Qt::ControlModifier|Qt::Key_E) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) ); + + anAct = createAction( SET_SECTIONS_SPLINE_ID, tr("SET_SECTIONS_SPLINE"), aSplinePixmap, + tr("SET_SPLINE_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_R) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onSetSpline()) ); + + anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"), + QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) ); + connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) ); + aTB->addAction(anAct); + // 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); + + 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()) ); + + // 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 ); + aSectLayout->setSpacing( 5 ); + aSectLayout->addWidget(aTB); + aSectLayout->addWidget(mySectionView); + aSectLayout->addWidget( myLocalPointView ); + aSectionGroup->setLayout(aSectLayout); + QVBoxLayout* aLay = new QVBoxLayout(); + aLay->setMargin( 0 ); + aLay->setSpacing( 5 ); // aLay->addLayout(aNameLayout); - aLay->addWidget(aSectionGroup); - setLayout(aLay); - onSelectionChanged(); - - /*OCCViewer_Viewer* anOCCViewer = getOCCViewer(); - if (anOCCViewer) { - OCCViewer_ViewWindow* aWnd = dynamic_cast(anOCCViewer->getViewManager()->getActiveView()); - if ( aWnd ) - aWnd->installEventFilter( this ); - }*/ + aLay->addWidget(aSectionGroup); + setLayout(aLay); + onSelectionChanged(); } -//======================================================================= -// function: getUniqSectionName -// purpose: return unique section name -//======================================================================= +/** + * Set an OCC viewer + */ +void CurveCreator_Widget::setOCCViewer( OCCViewer_Viewer* theViewer ) +{ + if ( myOCCViewer == theViewer ) + return; + + if ( myOCCViewer ) { + OCCViewer_ViewManager* aViewManager = dynamic_cast + ( myOCCViewer->getViewManager() ); + disconnect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), + this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) ); + disconnect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ), + 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_ViewManager* aViewManager = dynamic_cast + ( myOCCViewer->getViewManager() ); + connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), + this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) ); + connect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ), + 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 ); + } +} + +/** + * Returns current OCC viewer + */ OCCViewer_Viewer* CurveCreator_Widget::getOCCViewer() { - OCCViewer_Viewer* anOCCViewer = 0; + return myOCCViewer; +} - OCCViewer_ViewWindow* aViewWindow = 0; - SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy(); - if ( activeStudy ) - aViewWindow = dynamic_cast(SUIT_Session::session()->activeApplication()->desktop()->activeWindow()); - if ( aViewWindow == 0 ) - return anOCCViewer; - OCCViewer_ViewManager* aViewManager = dynamic_cast(aViewWindow->getViewManager()); - if ( aViewManager == 0 ) - return anOCCViewer; +/** + * 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; +} - anOCCViewer = aViewManager->getOCCViewer(); - return anOCCViewer; +/** + * 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; } -/*! - \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 ) +/** + * Set interaction style in the OCC viewer + * \param theStyle a new style + * \return the previous style + */ +int CurveCreator_Widget::changeInteractionStyle( int theStyle ) { - OCCViewer_Viewer* anOCCViewer = getOCCViewer(); - Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext(); - bool isLocalContext = aContext->HasOpenedContext(); - if ( !isLocalContext ) - return QWidget::eventFilter( theWatched, theEvent ); + OCCViewer_Viewer* aViewer = getOCCViewer(); + if ( !aViewer ) + 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 @@ -278,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(); @@ -291,29 +381,38 @@ void CurveCreator_Widget::onSelectionChanged() anEnabledAct << UP_ID; }*/ if( aSelSections.size() == 1 ){ - anEnabledAct << ADDITION_MODE_ID << MODIFICATION_MODE_ID << DETECTION_MODE_ID; + anEnabledAct << ADDITION_MODE_ID << DETECTION_MODE_ID; } - if (myActionMap[ADDITION_MODE_ID]->isChecked()) { - mySection = -1; - myPointNum = -1; - QList aSelSection = mySectionView->getSelectedSections(); - if( aSelSection.size() > 0 ){ - mySection = aSelSection[0]; - myPointNum = myCurve->getNbPoints(mySection); + switch ( getActionMode() ) { + case AdditionMode: { + mySection = -1; + myPointNum = -1; + QList aSelSection = mySectionView->getSelectedSections(); + if( aSelSection.size() > 0 ){ + mySection = aSelSection[0]; + myPointNum = myCurve->getNbPoints(mySection); + } + } + break; + case ModificationMode: { + anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID; + int aSectCnt = myCurve->getNbSections(); + if( aSectCnt > 0 ) + anEnabledAct << CLEAR_ALL_ID; + // TODO + //if( aSectCnt > 1 ) + // anEnabledAct << JOIN_ALL_ID; + //if( aSelSections.size() > 1 ){ + // anEnabledAct << JOIN_ID; + //} } - } else if (myActionMap[MODIFICATION_MODE_ID]->isChecked()) { - anEnabledAct << REMOVE_ID; - anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID; - 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; + break; + case DetectionMode: { } - } else if (myActionMap[DETECTION_MODE_ID]->isChecked()) { - } else { //no active mode + break; + case NoneMode: + default: + break; } /*if( aSelSections[ aSelSections.size() - 1 ] < ( myCurve->getNbSections() - 1 ) ){ anEnabledAct << DOWN_ID; @@ -344,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++ ){ @@ -359,34 +459,18 @@ void CurveCreator_Widget::onSelectionChanged() } } } + updateUndoRedo(); emit selectionChanged(); } void CurveCreator_Widget::onAdditionMode(bool checked) { - if( !myCurve ) + if (!checked) + return; + + Handle(AIS_InteractiveContext) aContext = getAISContext(); + if( !myCurve || aContext.IsNull() ) return; - OCCViewer_Viewer* anOCCViewer = getOCCViewer(); - Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext(); - OCCViewer_ViewManager* aViewManager = dynamic_cast - (anOCCViewer->getViewManager()); -// if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) { - if( anOCCViewer ) { - if (checked) { -/* myGuiState = aViewWindow->saveState(); - anOCCViewer->enableMultiselection(false); - anOCCViewer->enableSelection(false);*/ - connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), - this, SLOT( onGetCoordsByClick( SUIT_ViewWindow*, QMouseEvent* ) ) ); - } else { - disconnect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), - this, SLOT( onGetCoordsByClick( SUIT_ViewWindow*, QMouseEvent* ) ) ); -/* anOCCViewer->enableMultiselection(true); - anOCCViewer->enableSelection(true); - aViewWindow->restoreState( myGuiState );*/ - return; - } - } mySection= -1; myPointNum = -1; @@ -407,38 +491,6 @@ void CurveCreator_Widget::onAdditionMode(bool checked) void CurveCreator_Widget::onModificationMode(bool checked) { myLocalPointView->setVisible( checked ); - OCCViewer_Viewer* anOCCViewer = getOCCViewer(); - OCCViewer_ViewManager* aViewManager = dynamic_cast - (anOCCViewer->getViewManager()); -/* - SUIT_ViewWindow* aViewWindow = 0; - SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy(); - if ( activeStudy ) - aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); - if ( aViewWindow == 0 ) - return; - SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();*/ - if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) { - if (checked) { - connect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ), - this, SLOT( onPointSelect( SUIT_ViewWindow*, QMouseEvent* ) ) ); - connect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ), - this, SLOT( onPointDrag( SUIT_ViewWindow*, QMouseEvent* ) ) ); - } - else { - disconnect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ), - this, SLOT( onPointSelect( SUIT_ViewWindow*, QMouseEvent* ) ) ); - disconnect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ), - this, SLOT( onPointDrag( SUIT_ViewWindow*, QMouseEvent* ) ) ); - return; - } - } - //NDS OCCViewer_ViewWindow* anOCCWnd = dynamic_cast(aViewWindow); - //anOCCWnd->activateStartPointSelection(); - // activate selection ------> - //OCCViewer_Viewer* anOCCViewer = dynamic_cast(aViewManager->getViewModel()); - - setLocalPointContext( true ); } void CurveCreator_Widget::onDetectionMode(bool checked) @@ -447,23 +499,26 @@ void CurveCreator_Widget::onDetectionMode(bool checked) void CurveCreator_Widget::onModeChanged(bool checked) { - setLocalPointContext( false ); + ActionMode aMode = NoneMode; if (checked) { QAction* anAction = (QAction*)sender(); switch(myActionMap.key(anAction)) { case ADDITION_MODE_ID: + aMode = AdditionMode; if (myActionMap[MODIFICATION_MODE_ID]->isChecked()) myActionMap[MODIFICATION_MODE_ID]->trigger(); else if (myActionMap[DETECTION_MODE_ID]->isChecked()) myActionMap[DETECTION_MODE_ID]->trigger(); break; case MODIFICATION_MODE_ID: + aMode = ModificationMode; if (myActionMap[ADDITION_MODE_ID]->isChecked()) myActionMap[ADDITION_MODE_ID]->trigger(); else if (myActionMap[DETECTION_MODE_ID]->isChecked()) myActionMap[DETECTION_MODE_ID]->trigger(); break; case DETECTION_MODE_ID: + aMode = DetectionMode; if (myActionMap[ADDITION_MODE_ID]->isChecked()) myActionMap[ADDITION_MODE_ID]->trigger(); else if (myActionMap[MODIFICATION_MODE_ID]->isChecked()) @@ -472,15 +527,23 @@ void CurveCreator_Widget::onModeChanged(bool checked) } } onSelectionChanged(); + setLocalPointContext( aMode == ModificationMode, true ); } void CurveCreator_Widget::onAddNewPoint(const CurveCreator::Coordinates& theCoords) { if( !myCurve ) return; - myCurve->addPoints(theCoords, mySection, myPointNum ); - mySectionView->pointsAdded( mySection, myPointNum ); - myPointNum++; + //myCurve->addPoints(theCoords, mySection, myPointNum ); + //mySectionView->pointsAdded( mySection, myPointNum ); + //myPointNum++; + QList aSections = mySectionView->getSelectedSections(); + if( aSections.size() == 0 ){ + return; + } + int aSection = aSections[0]; + myCurve->addPoints(theCoords, aSection); // add to the end of section + mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) ); onSelectionChanged(); updateUndoRedo(); } @@ -535,6 +598,20 @@ QAction* CurveCreator_Widget::getAction(ActionId theId) return NULL; } +CurveCreator_Widget::ActionMode CurveCreator_Widget::getActionMode() const +{ + ActionMode aMode = NoneMode; + + if ( myActionMap[ADDITION_MODE_ID]->isChecked() ) + aMode = AdditionMode; + else if ( myActionMap[MODIFICATION_MODE_ID]->isChecked() ) + aMode = ModificationMode; + else if ( myActionMap[DETECTION_MODE_ID]->isChecked() ) + aMode = DetectionMode; + + return aMode; +} + void CurveCreator_Widget::onEditSection( int theSection ) { if( !myCurve ) @@ -557,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(); @@ -619,29 +701,17 @@ void CurveCreator_Widget::onRemove() { if( !myCurve ) return; - QList< QPair > aSelPoints = mySectionView->getSelectedPoints(); - int aCurrSect=-1; - int aRemoveCnt = 0; -// myCurve->startOperation(); - for( int i = 0 ; i < aSelPoints.size() ; i++ ){ - if( aCurrSect != aSelPoints[i].first ){ - aRemoveCnt = 0; - aCurrSect = aSelPoints[i].first; - } - int aPntIndx = aSelPoints[i].second - aRemoveCnt; - myCurve->removePoint( aCurrSect, aPntIndx ); - mySectionView->pointsRemoved( aCurrSect, aPntIndx ); - aRemoveCnt++; - } - QList aSections = mySectionView->getSelectedSections(); - for( int i = 0 ; i < aSections.size() ; i++ ){ - int aSectNum = aSections[i] - (i); - myCurve->removeSection( aSectNum ); - mySectionView->sectionsRemoved( aSectNum ); + + switch( getActionMode() ) { + case NoneMode: + removeSection(); + break; + case ModificationMode: + removePoint(); + break; + default: + break; } -// myCurve->finishOperation(); - mySectionView->clearSelection(); - updateUndoRedo(); } void CurveCreator_Widget::onClearAll() @@ -704,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(); @@ -718,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(); @@ -729,40 +799,47 @@ 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() { - QAction* anAct = myActionMap[UNDO_ID]; - if( anAct != 0 ){ - if( myCurve->getNbUndo() != 0 ){ - anAct->setEnabled(true); - } - else{ - anAct->setDisabled(true); - } + if( !myCurve ) + return; + QAction* anAct = myActionMap[UNDO_ID]; + if( anAct != 0 ){ + if( myCurve->getNbUndo() != 0 ){ + anAct->setEnabled(true); } - anAct = myActionMap[REDO_ID]; - if( anAct != 0 ){ - if( myCurve->getNbRedo() != 0 ){ - anAct->setEnabled(true); - } - else{ - anAct->setDisabled(true); - } + else{ + anAct->setDisabled(true); } + } + anAct = myActionMap[REDO_ID]; + if( anAct != 0 ){ + if( myCurve->getNbRedo() != 0 ){ + anAct->setEnabled(true); + } + else{ + anAct->setDisabled(true); + } + } } void CurveCreator_Widget::onContextMenu( QPoint thePoint ) @@ -814,20 +891,43 @@ 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 //================================================================================= -void CurveCreator_Widget::onGetCoordsByClick( SUIT_ViewWindow* theViewWindow, QMouseEvent* pe ) +void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) { if (pe->button() != Qt::LeftButton) return; - if ( theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() && - pe->modifiers() != Qt::ControlModifier ) { - OCCViewer_Viewer* anOCCViewer = - ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer(); - Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext(); + if ( pe->modifiers() != Qt::ControlModifier ) { + Handle(AIS_InteractiveContext) ic = getAISContext(); + if ( ic.IsNull() ) + return; gp_Pnt aPnt; @@ -847,8 +947,8 @@ void CurveCreator_Widget::onGetCoordsByClick( SUIT_ViewWindow* theViewWindow, QM aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); else*/ { - OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort(); - aPnt = GEOMUtils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); + OCCViewer_ViewPort3d* vp = getViewPort(); + aPnt = CurveCreator_Utils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); } // set the coordinates into dialog CurveCreator::Coordinates aCoords; @@ -862,284 +962,560 @@ void CurveCreator_Widget::onGetCoordsByClick( SUIT_ViewWindow* theViewWindow, QM } } -//================================================================================= -// function : HYDROGUI_PolylineOp::onPointSelect() -// purpose : Manage mouse press events in Modification mode -//================================================================================= -void CurveCreator_Widget::onPointSelect( SUIT_ViewWindow* theViewWindow, QMouseEvent* pe ) +/** + * Manage mouse press events + * \param theWindow an owner of the signal + * \param theEvent a mouse event + */ +void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent ) { - //store initial cursor position for Drag&Drop - if (pe->button() == Qt::LeftButton) - myDragStartPosition = pe->pos(); - - //gp_Pnt aPnt; - OCCViewer_Viewer* anOCCViewer = - ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer(); - Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext(); - - //ic->InitSelected(); - //if ( pe->modifiers() == Qt::ShiftModifier ) - // ic->ShiftSelect(); // Append selection - //else - // ic->Select(); // New selection - - /*ic->InitSelected(); - if ( ic->MoreSelected() ) { - TopoDS_Shape aShape = ic->SelectedShape(); - Standard_Boolean hasdet = ic->HasDetectedShape(); - Standard_Boolean hassel = ic->HasSelectedShape(); - Standard_Integer nbcur = ic->NbCurrents(); - Standard_Integer nbsel = ic->NbSelected(); - if(!aShape.IsNull()) - if ( aShape.ShapeType() == TopAbs_VERTEX ) - aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); + if ( theEvent->button() != Qt::LeftButton ) + return; + + switch( getActionMode() ) { + case ModificationMode: { + //store initial cursor position for Drag&Drop + setDragStarted( true, theEvent->pos() ); + break; + } + case AdditionMode: { + onGetCoordsByClick( theEvent ); + break; + } + default: + break; } - - Qt::KeyboardModifiers modifiers = pe->modifiers(); -// aSketcherDlg->OnPointSelected( modifiers, aPnt ); // "feed" the point to point construction dialog*/ +} + +/** + * 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 ) { + 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() ); + + // updates the input panel table to show the selected point coordinates updateLocalPointView(); } -//================================================================================= -// function : GeometryGUI::onPointDrag() -// purpose : Manage mouse move events in Modification mode -//================================================================================= -void CurveCreator_Widget::onPointDrag( SUIT_ViewWindow* theViewWindow, QMouseEvent* pe ) +/** + * 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 ( !(pe->buttons() & Qt::LeftButton) ) + if ( getActionMode() != ModificationMode || !myDragStarted ) return; - if ( (pe->pos() - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() ) + + QPoint aPos = theEvent->pos(); + if ( (aPos - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() ) return; -/* - QDrag *drag = new QDrag(this); - QMimeData *mimeData = new QMimeData; - - mimeData->setData(mimeType, data); - drag->setMimeData(mimeData); - - Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction); - */ + + moveSelectedPoints( aPos.x(), aPos.y() ); + 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 ) + 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 ); +} + +void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) +{ + int aCurrSect = getSectionId( theRow ); + int aPntIndex = getPointId( theRow ); + + if ( aPntIndex < 0 ) return; - int aSection = aSelSections[0]; + CurveCreator_ICurve::SectionToPointList aSelPoints; + startCurveModification( aSelPoints ); - QList aSelPoints; - getSelectedPonts( aSection, aSelPoints ); - setLocalPointContext( false ); + double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble(); + double anY = myLocalPointView->item( theRow, 3 )->data( Qt::UserRole ).toDouble(); + std::deque aChangedPos; + aChangedPos.push_back( aX ); + aChangedPos.push_back( anY ); + myCurve->setPoint( aCurrSect, aPntIndex, aChangedPos ); + + finishCurveModification( aSelPoints ); +} - int aPntIndex = -1; +/** + * Removes a selected section from the curve. Updates undo/redo status + */ +void CurveCreator_Widget::removeSection() +{ + QList< QPair > aSelPoints = mySectionView->getSelectedPoints(); int aCurrSect=-1; - 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 ); + int aRemoveCnt = 0; +// myCurve->startOperation(); + for( int i = 0 ; i < aSelPoints.size() ; i++ ){ + if( aCurrSect != aSelPoints[i].first ){ + aRemoveCnt = 0; + aCurrSect = aSelPoints[i].first; } - //} - setLocalPointContext( true ); - setSelectedPonts( aSection, aSelPoints ); + int aPntIndx = aSelPoints[i].second - aRemoveCnt; + myCurve->removePoint( aCurrSect, aPntIndx ); + mySectionView->pointsRemoved( aCurrSect, aPntIndx ); + aRemoveCnt++; + } + QList aSections = mySectionView->getSelectedSections(); + for( int i = 0 ; i < aSections.size() ; i++ ){ + int aSectNum = aSections[i] - (i); + myCurve->removeSection( aSectNum ); + mySectionView->sectionsRemoved( aSectNum ); + } +// myCurve->finishOperation(); + mySectionView->clearSelection(); + updateUndoRedo(); } -int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY ) +/** + * Removes a selected points from the curve. Updates undo/redo status + */ +void CurveCreator_Widget::removePoint() +{ + CurveCreator_ICurve::SectionToPointList aPoints; + getSelectedPonts( aPoints ); + if ( aPoints.size() == 0 ) + return; + + CurveCreator_ICurve::SectionToPointList aSelPoints; + startCurveModification( aSelPoints, false ); + + myCurve->removeSeveralPoints( aPoints ); + finishCurveModification( CurveCreator_ICurve::SectionToPointList() ); +} + +void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, + const int theY ) { - int aPntIndex = -1; + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + 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 = CurveCreator_Utils::getNeighbourPoints( aContext, aView, theX, theY, + aPoint, aPoint1, aPoint2 ); + if ( !isFoundPoint ) + return; + + // insert the point to the model curve + CurveCreator_ICurve::SectionToPointList aSelPoints; + startCurveModification( aSelPoints ); 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 ) + 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( aSectionId )-1; + if ( ( aPoint1Id == aLastPoint && aPoint2Id == 0 ) || + ( aPoint2Id == aLastPoint && aPoint1Id == 0 ) ) + anInsertPos = -1; // if the section happens between first and last points + else + anInsertPos = aPoint1Id < aPoint2Id ? aPoint1Id + 1 : aPoint2Id + 1; + + myCurve->addPoints( aCoords, aSectionId, anInsertPos ); + mySectionView->pointsAdded( aSectionId, myCurve->getNbPoints( aSectionId ) ); + + finishCurveModification( aSelPoints ); + + setSelectedPonts(); +} + +void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, + const int theYPosition ) +{ + OCCViewer_ViewPort3d* aViewPort = getViewPort(); + if ( !aViewPort ) + return; + + CurveCreator_ICurve::SectionToPointList aPoints; + startCurveModification( aPoints, false ); + + gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(), + myDragStartPosition.y(), + aViewPort->getView() ); + gp_Pnt anEndPnt = CurveCreator_Utils::ConvertClickToPoint( theXPosition, theYPosition, + aViewPort->getView() ); + double aXDelta = aStartPnt.X() - anEndPnt.X(); + double anYDelta = aStartPnt.Y() - anEndPnt.Y(); + + CurveCreator_ICurve::SectionToPointCoordsList aCoordList; + std::deque aChangedPos; + 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; - if ( fabs( aCoords[0] - theX ) < LOCAL_SELECTION_TOLERANCE && - fabs( aCoords[1] - theY ) < LOCAL_SELECTION_TOLERANCE ) - aPntIndex = i; + aChangedPos[0] = aChangedPos[0] - aXDelta; + aChangedPos[1] = aChangedPos[1] - anYDelta; + + aCoordList.push_back( + std::make_pair(std::make_pair( aSectionId, aPointId ), + aChangedPos )); } + myCurve->setSeveralPoints( aCoordList ); - return aPntIndex; + myDragged = true; + finishCurveModification( myDragPoints ); } void CurveCreator_Widget::updateLocalPointView() { - OCCViewer_Viewer* anOCCViewer = getOCCViewer(); - if ( !anOCCViewer ) + if ( myDragStarted ) + return; + Handle(AIS_InteractiveContext) aContext = getAISContext(); + if ( aContext.IsNull() ) return; - Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext(); + + 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); } -void CurveCreator_Widget::setLocalPointContext( const bool theOpen ) +/** + * + */ +void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable ) { - OCCViewer_Viewer* anOCCViewer = getOCCViewer(); - Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext(); - - if ( theOpen ) { - // Open local context if there is no one - bool allObjects = true; - if ( !ic->HasOpenedContext() ) { - ic->ClearCurrents( false ); - ic->OpenLocalContext( allObjects, true, true ); - } - AIS_ListOfInteractive aList; - ic->DisplayedObjects( aList ); - int aLSize = 0; - for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() ) - aLSize++; - - int theMode = TopAbs_VERTEX; - 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, false ); - ic->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)theMode ) ); - } - else if ( anAIS->DynamicType() != STANDARD_TYPE(AIS_Trihedron) ) - { - ic->Load( anAIS, -1, false ); - ic->Activate( anAIS, theMode ); - } - } - continue; - } - } - else { - ic->CloseAllContexts(); - } + 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 ); + aSectionId = aPoint.first; + aPointId = aPoint.second; + + anItem = new QTableWidgetItem( myCurve->getSectionName( aSectionId ).c_str() ); + anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled ); + anItem->setData( Qt::UserRole, aSectionId ); + myLocalPointView->setItem( aRowId, 0, anItem ); - myLocalPointView->setRowCount( aRowId+1 ); - anItem = new QTableWidgetItem( QString::number( aRowId + 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, 2, anItem ); + + anItem = new QTableWidgetItem( QString::number( theY ) ); + anItem->setData( Qt::UserRole, theY ); + myLocalPointView->setItem( aRowId, 3, anItem ); + } +} - anItem = new QTableWidgetItem( QString::number( theX ) ); - anItem->setData( Qt::UserRole, theX ); - myLocalPointView->setItem( aRowId, 1, anItem ); +/** + * Set drag operation started. Save the position and a list of dragged points + * \param theState the drag operation state: started/finished + * \param thePoint the start drag position + */ +void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint ) +{ + 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; +} - anItem = new QTableWidgetItem( QString::number( theY ) ); - anItem->setData( Qt::UserRole, theY ); - myLocalPointView->setItem( aRowId, 2, anItem ); +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::getSelectedPonts( int theSectionId, QList& thePoints ) + +bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex, + const CurveCreator_ICurve::SectionToPoint& theSToPoint ) { - 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 isIntersect = false; + + if ( theVertex.IsNull() ) + return isIntersect; + + gp_Pnt aPnt = BRep_Tool::Pnt( theVertex ); - aPntIndex = findLocalPointIndex( theSectionId, aPrevX, aPrevY ); - if ( aPntIndex >= 0 ) - thePoints.append( aPntIndex ); + 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* anOCCViewer = getOCCViewer(); - if ( !anOCCViewer ) + if ( myDragStarted ) + return; + Handle(AIS_InteractiveContext) ic = getAISContext(); + if ( ic.IsNull() || !ic->HasOpenedContext() ) return; AIS_ListOfInteractive aListToSelect; - Handle(AIS_InteractiveContext) ic = anOCCViewer->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; + 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; + } + } + } + } + } + ic->UpdateCurrentViewer(); + if ( !isSelectedVertex ) + setObjectsSelected( aListToSelect ); + updateLocalPointView(); +} - gp_Pnt aPnt = BRep_Tool::Pnt( aVertex ); - int aPointIndex = findLocalPointIndex( theSectionId, aPnt.X(), aPnt.Y() ); - if ( thePoints.contains( aPointIndex ) ) - aListToSelect.Append( anAIS ); +/** + * Get viewer information before perform the curve modification. + * Take a list of selected cuve points an close local context. + * The context should be closed because the curve presentation is + * redisplayed and if it is not closed, when we close the local context + * later, the presentation shown in the local context is disappeared. + * \param thePoints an output list of curve selected points + * \param theFillPoints a flag whether the selection list should be filled + */ +void CurveCreator_Widget::startCurveModification( + CurveCreator_ICurve::SectionToPointList& thePoints, + const bool theFillPoints ) +{ + if ( theFillPoints ) { + thePoints.clear(); + getSelectedPonts( thePoints ); } + setLocalPointContext( false ); +} - anOCCViewer->setObjectsSelected( aListToSelect ); - updateLocalPointView(); +/** + * Restore the viewer state after the curve modification is done. + * Open local context and select given points inside it. + * \param thePoints a list of curve selected points + */ +void CurveCreator_Widget::finishCurveModification( + const CurveCreator_ICurve::SectionToPointList& thePoints ) +{ + if ( getActionMode() == ModificationMode ) + setLocalPointContext( true ); + setSelectedPonts( thePoints ); + updateUndoRedo(); +} + +/** + * Returns a point index in the model curve by the point coordinates in the viewer + * \param theX the X coordinate of the point + * \param theY the Y coordinate of the point + */ +int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY ) +{ + return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY ); +} + +void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY, + CurveCreator_ICurve::SectionToPointList& thePoints ) +{ + return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints ); +} + +void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints, + QMap >& theConvPoints ) +{ + return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints ); +} + +/** + * Returns a section index from the table + * \param theRowId a table row + */ +int CurveCreator_Widget::getSectionId( const int theRowId ) const +{ + return myLocalPointView->item( theRowId, 0 )->data( Qt::UserRole ).toInt(); +} + +/** + * 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 whethe the container has the value + * \param theList a container of values + * \param theValue a value + */ +bool CurveCreator_Widget::contains( const CurveCreator_ICurve::SectionToPointList& theList, + const CurveCreator_ICurve::SectionToPoint& theValue ) const +{ + return CurveCreator_UtilsICurve::contains( theList, theValue ); }