From 9c2092abf45b47c9c3512397341f7f114f07cc30 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 20 Nov 2013 08:30:45 +0000 Subject: [PATCH] Extending the modification mode for a lot of sections. --- src/HYDROCurveCreator/CurveCreator_Widget.cxx | 279 +++++++++++------- src/HYDROCurveCreator/CurveCreator_Widget.h | 25 +- 2 files changed, 190 insertions(+), 114 deletions(-) diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index f59fb1e8..94f41248 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -70,7 +70,8 @@ #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; @@ -96,14 +97,15 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, myLocalPointView = new QTableWidget(); 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); @@ -289,7 +291,7 @@ void CurveCreator_Widget::onSelectionChanged() { QList anEnabledAct; if( myCurve ){ - anEnabledAct << NEW_SECTION_ID; + anEnabledAct << NEW_SECTION_ID << MODIFICATION_MODE_ID; QList aSelSections = mySectionView->getSelectedSections(); QList< QPair< int, int > > aSelPoints = mySectionView->getSelectedPoints(); CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType(); @@ -302,7 +304,7 @@ 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; anEnabledAct << REMOVE_ID; } switch ( getActionMode() ) { @@ -899,7 +901,7 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEven if ( myDragStarted ) { if ( myDragged ) // if the drag of some points has happened, restore the drag selection - setSelectedPonts( 0, myDragPoints ); + setSelectedPonts( myDragPoints ); setDragStarted( false ); } else // check whether the segment is clicked an a new point should be added to the segment @@ -926,37 +928,24 @@ void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent ) myDragStartPosition = aPos; } -void CurveCreator_Widget::onLocalPointChanged( int theRow, int theColumn ) +void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) { - QList aSelSections = mySectionView->getSelectedSections(); - if ( aSelSections.size() < 0 ) - return; + int aCurrSect = getSectionId( theRow ); + int aPntIndex = getPointId( theRow ); - int aSection = aSelSections[0]; + if ( aPntIndex < 0 ) + return; - QList aSelPoints; + SectionToPointList aSelPoints; startCurveModification( aSelPoints ); - int aPntIndex = -1; - int aCurrSect=-1; + double aX = myLocalPointView->item( theRow, 2 )->text().toDouble(); + double anY = myLocalPointView->item( theRow, 3 )->text().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 ); } @@ -995,23 +984,25 @@ void CurveCreator_Widget::removeSection() */ void CurveCreator_Widget::removePoint() { - int aSectionId = 0; - QList aPoints; - getSelectedPonts( aSectionId, aPoints ); + SectionToPointList aPoints; + getSelectedPonts( aPoints ); if ( aPoints.size() == 0 ) return; - QList aSelPoints; + SectionToPointList aSelPoints; startCurveModification( aSelPoints, false ); // the points should be removed in a decreased order qSort( aPoints ); - for( int i = aPoints.size()-1; i >= 0; i-- ){ - int aPntIndx = aPoints[i]; - myCurve->removePoint( aSectionId, aPntIndx ); - mySectionView->pointsRemoved( aSectionId, aPntIndx ); + SectionToPointList::const_iterator anIt = aPoints.end(), aFirst = aPoints.begin(); + anIt--; + for ( ; anIt != aFirst; anIt-- ) { + int aSectionId = anIt->first; + int aPointId = anIt->second; + myCurve->removePoint( aSectionId, aPointId ); + mySectionView->pointsRemoved( aSectionId, aPointId ); } - finishCurveModification( QList() ); + finishCurveModification( SectionToPointList() ); } void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, @@ -1021,8 +1012,8 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, if ( !aViewer ) return; - int aPoint1 = -1, aPoint2 = -1; gp_Pnt aPoint; + gp_Pnt aPoint1, aPoint2; bool isFoundPoint = false; Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); for ( aContext->InitSelected(); aContext->MoreSelected() && !isFoundPoint; @@ -1039,33 +1030,50 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, isFoundPoint = pointOnObject( anAIS, theX, theY, aPoint, aPoint1, aPoint2 ); } } - bool isDone = false; - if ( !isFoundPoint || aPoint1 < 0 || aPoint2 < 0 ) + if ( !isFoundPoint ) return; // insert the point to the model curve - QList aSelPoints; + SectionToPointList aSelPoints; startCurveModification( aSelPoints ); - int aSection = 0; CurveCreator::Coordinates aCoords; aCoords.push_back( aPoint.X() ); aCoords.push_back( aPoint.Y() ); + SectionToPointList aPoints1, aPoints2; + findSectionsToPoints( aPoint1.X(), aPoint1.Y(), aPoints1 ); + findSectionsToPoints( aPoint2.X(), aPoint2.Y(), aPoints2 ); + SectionToPointList::const_iterator anIt = aPoints1.begin(), aLast = aPoints1.end(); + int aSectionId = -1; + // there can be a case when a new point is added into two sections + int aPoint1Id = -1, aPoint2Id = -1; + for ( ; anIt != aLast && aSectionId < 0; anIt++ ) { + int aSectionCur = anIt->first; + SectionToPointList::const_iterator anIt2 = aPoints2.begin(), aLast2 = aPoints2.end(); + 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 ); + setSelectedPonts(); updateUndoRedo(); } @@ -1076,7 +1084,7 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, if ( !aViewer ) return; - QList aPoints; + SectionToPointList aPoints; startCurveModification( aPoints, false ); OCCViewer_ViewWindow* aWindow = @@ -1089,11 +1097,13 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, double aXDelta = aStartPnt.X() - anEndPnt.X(); double anYDelta = aStartPnt.Y() - anEndPnt.Y(); - int aSectionId = 0; + int aSectionId; int aPointId; std::deque aChangedPos; - for ( int i = 0, aNb = myDragPoints.size(); i < aNb; i++ ) { - aPointId = myDragPoints[i]; + SectionToPointList::const_iterator anIt = myDragPoints.begin(), aLast = myDragPoints.end(); + for ( ; anIt != aLast; anIt++ ) { + aSectionId = anIt->first; + aPointId = anIt->second; aChangedPos = myCurve->getPoint( aSectionId, aPointId ); if ( aChangedPos.size() < 2 ) continue; @@ -1203,33 +1213,57 @@ void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool i void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY ) { + SectionToPointList aPoints; + findSectionsToPoints( theX, theY, aPoints ); + + SectionToPointList aSkipList; + // table could not contain two equal value rows int aRowId = myLocalPointView->rowCount(); double aCurrentX, aCurrentY; + int aSectionId, aPointId; + 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 = qMakePair( getSectionId( i ), getPointId( i ) ); + if ( !aSkipList.contains( aPoint ) ) + aSkipList.append( aPoint ); + } } + if ( aSkipList.size() == aPoints.size() ) + return; + QTableWidgetItem* anItem; + SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); + for ( ; anIt != aLast; anIt++ ) { + aPoint = *anIt; + if ( aSkipList.contains( 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 ); + } } /** @@ -1241,7 +1275,7 @@ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& the { OCCViewer_Viewer* aViewer = getOCCViewer(); if ( theState ) { - getSelectedPonts( 0, myDragPoints ); + getSelectedPonts( myDragPoints ); myDragStarted = myDragPoints.size(); myDragStartPosition = thePoint; if ( aViewer && myDragStarted ) { @@ -1259,23 +1293,14 @@ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& the myDragged = false; } -void CurveCreator_Widget::getSelectedPonts( int theSectionId, QList& thePoints ) +void CurveCreator_Widget::getSelectedPonts( CurveCreator_Widget::SectionToPointList& thePoints ) { thePoints.clear(); - - 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(); - - aPntIndex = findLocalPointIndex( theSectionId, aPrevX, aPrevY ); - if ( aPntIndex >= 0 ) - thePoints.append( aPntIndex ); - } + for ( int i = 0, aNb = myLocalPointView->rowCount(); i < aNb; i++ ) + thePoints.append( qMakePair( getSectionId( i ), getPointId( i ) ) ); } -void CurveCreator_Widget::setSelectedPonts( const int theSectionId, const QList& thePoints ) +void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionToPointList& thePoints ) { OCCViewer_Viewer* aViewer = getOCCViewer(); if ( !aViewer ) @@ -1294,19 +1319,27 @@ void CurveCreator_Widget::setSelectedPonts( const int theSectionId, const QList< Handle(AIS_InteractiveObject) anAIS = it.Value(); if ( anAIS.IsNull() ) continue; - Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast( anAIS ); - if ( aPoint.IsNull() ) + Handle(AIS_Point) anAISPoint = Handle(AIS_Point)::DownCast( anAIS ); + if ( anAISPoint.IsNull() ) continue; - TopoDS_Vertex aVertex = TopoDS::Vertex( aPoint->Vertex() ); + TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() ); 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 ); + + SectionToPointList aPoints; + findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints ); + + SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); + SectionToPoint aPoint; + for ( ; anIt != aLast; anIt++ ) { + aPoint = *anIt; + if ( thePoints.contains( aPoint ) ) + aListToSelect.Append( anAIS ); + } } ic->ClearSelected( Standard_False ); @@ -1323,12 +1356,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_Widget::SectionToPointList& thePoints, + const bool theFillPoints ) { if ( theFillPoints ) { thePoints.clear(); - int aSectionId = 0; - getSelectedPonts( aSectionId, thePoints ); + getSelectedPonts( thePoints ); } setLocalPointContext( false ); } @@ -1338,11 +1372,12 @@ 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_Widget::SectionToPointList& thePoints ) { setLocalPointContext( true ); int aSectionId = 0; - setSelectedPonts( aSectionId, thePoints ); + setSelectedPonts( thePoints ); } /** @@ -1367,9 +1402,20 @@ int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, floa return aPntIndex; } -void CurveCreator_Widget::findSections( int thePointId, QList& theSections ) +void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY, + CurveCreator_Widget::SectionToPointList& thePoints ) { - + thePoints.clear(); + + int aPointId = -1; + for ( int i = 0, aNb = myCurve->getNbSections(); i < aNb; i++ ) { + aPointId = findLocalPointIndex( i, theX, theY ); + if ( aPointId < 0 ) + continue; + SectionToPoint aPoint = qMakePair( i, aPointId ); + if ( !thePoints.contains( aPoint ) ) + thePoints.append( aPoint ); + } } /** @@ -1384,7 +1430,7 @@ void CurveCreator_Widget::findSections( int thePointId, QList& theSections bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject, const int theX, const int theY, gp_Pnt& thePoint, - int& thePoint1, int& thePoint2 ) + gp_Pnt& thePoint1, gp_Pnt& thePoint2 ) { bool isFound = false; @@ -1449,9 +1495,12 @@ bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject } if ( isFound ) { thePoint = aPoint; - thePoint1 = findLocalPointIndex( 0, aPnt1.X(), aPnt1.Y() ); - thePoint2 = findLocalPointIndex( 0, aPnt2.X(), aPnt2.Y() ); - isFound = thePoint1 >= 0 && thePoint2 >= 0; + + thePoint1 = aPnt1; + thePoint2 = aPnt2; + //thePoint1 = findLocalPointIndex( 0, aPnt1.X(), aPnt1.Y() ); + //thePoint2 = findLocalPointIndex( 0, aPnt2.X(), aPnt2.Y() ); + //isFound = thePoint1 >= 0 && thePoint2 >= 0; } return isFound; } @@ -1494,3 +1543,21 @@ bool CurveCreator_Widget::hasProjectPointOnCurve( const int theX, const int theY } return isFound; } + +/** + * 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(); +} diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.h b/src/HYDROCurveCreator/CurveCreator_Widget.h index f17cf3d1..93c839be 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.h +++ b/src/HYDROCurveCreator/CurveCreator_Widget.h @@ -102,7 +102,7 @@ protected slots: void onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEvent ); void onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent ); - void onLocalPointChanged( int theRow, int theColumn ); + void onCellChanged( int theRow, int theColumn ); protected: enum ActionId{ UNDO_ID, @@ -130,6 +130,9 @@ protected: DetectionMode }; + typedef QPair< int, int > SectionToPoint; + typedef QList< SectionToPoint > SectionToPointList; + private: QAction* createAction( ActionId theId, const QString& theName, const QPixmap& theImage, const QString& theToolTip, const QKeySequence& theShortcut ); @@ -149,24 +152,30 @@ private: void setDragStarted( const bool theState, const QPoint& thePoint = QPoint() ); - void getSelectedPonts( const int theSectionId, QList& thePoints ); - void setSelectedPonts( const int theSectionId, const QList& thePoints = QList() ); + void getSelectedPonts( SectionToPointList& thePoints ); + void setSelectedPonts( const SectionToPointList& = SectionToPointList() ); - void startCurveModification( QList& thePoints, const bool theFillPoints = true ); - void finishCurveModification( const QList& thePoints ); + void startCurveModification( SectionToPointList& thePoints, + const bool theFillPoints = true ); + void finishCurveModification( const SectionToPointList& thePoints ); // curve algorithm int findLocalPointIndex( int theSectionId, float theX, float theY ); - void findSections( int thePointId, QList& theSections ); + void findSectionsToPoints( const double theX, const double theY, + SectionToPointList& thePoints ); // OCC algorithm bool pointOnObject( Handle(AIS_InteractiveObject) theObject, const int theX, const int theY, - gp_Pnt& thePoint, int& thePoint1, int& thePoint2 ); + gp_Pnt& thePoint, gp_Pnt& thePoint1, gp_Pnt& thePoint2 ); bool hasProjectPointOnCurve( const int theX, const int theY, const Handle(Geom_Curve)& theCurve, Standard_Real& theParameter ); + // local point view table methods + int getSectionId( const int theRowId ) const; + int getPointId( const int theRowId ) const; + private: QMap myActionMap; CurveCreator_ICurve* myCurve; @@ -179,7 +188,7 @@ private: bool myDragStarted; QPoint myDragStartPosition; int myDragInteractionStyle; - QList myDragPoints; + SectionToPointList myDragPoints; bool myDragged; QByteArray myGuiState; }; -- 2.39.2