X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=4d1b80914ceb8ea2380a9d46309c9aa19de5104f;hb=65c66988575cb4fc8de7d838cde08b4731a6e54b;hp=be18c55a75869a1e6838b44747ab681106d478bc;hpb=c3f79a88a881487ffae38af1a869ea7f91f08fa5;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index be18c55a..4d1b8091 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -20,11 +20,10 @@ #include "CurveCreator_Widget.h" #include "CurveCreator_TreeView.h" #include "CurveCreator_ICurve.hxx" -//#include "CurveCreator_CurveEditor.hxx" #include "CurveCreator.hxx" -//#include "CurveCreator_NewPointDlg.h" #include "CurveCreator_NewSectionDlg.h" #include "CurveCreator_Utils.h" +#include "CurveCreator_UtilsICurve.hxx" #include "CurveCreator_TableView.h" #include @@ -37,27 +36,6 @@ #include #include "OCCViewer_Utilities.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include @@ -70,19 +48,42 @@ #include #include #include +#include + +//#define MEASURE_TIME + +#ifdef MEASURE_TIME + + #define START_MEASURE_TIME \ + QTime aTimer; \ + aTimer.start(); \ + + #define END_MEASURE_TIME( theMsg ) \ + double aTime = aTimer.elapsed() * 0.001; \ + FILE* aFile = fopen( "performance", "a" ); \ + fprintf( aFile, "%s = %.3lf sec\n", theMsg, aTime ); \ + fclose( aFile ); \ + +#else + + #define START_MEASURE_TIME + #define END_MEASURE_TIME( theMsg ) + +#endif + + + -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) + const int theActionFlags, + Qt::WindowFlags fl, + int theLocalPointRowLimit ) : QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ), - myOCCViewer( 0 ) + myOCCViewer( 0 ), myLocalPointRowLimit( theLocalPointRowLimit ) { myNewSectionEditor = new CurveCreator_NewSectionDlg( this ); myNewSectionEditor->hide(); @@ -97,16 +98,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, 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 ); + myLocalPointView = new CurveCreator_TableView( myCurve, this ); connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ), this, SLOT( onCellChanged( int, int ) ) ); @@ -138,12 +130,14 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, 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(); + if ( !(theActionFlags & DisableNewSection) ) { + aTB->addAction(anAct); + aTB->addSeparator(); + } anAct = createAction( ADDITION_MODE_ID, tr("ADDITION_MODE"), aNewPointPixmap, tr("ADDITION_MODE_TLT"), QKeySequence() ); @@ -164,8 +158,10 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, anAct->setCheckable(true); connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onDetectionMode(bool)) ); connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) ); - aTB->addAction(anAct); - + if ( !(theActionFlags & DisableDetectionMode) ) { + 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()) ); @@ -187,6 +183,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) ); connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) ); aTB->addAction(anAct); + // TODO join //aTB->addSeparator(); @@ -217,7 +214,9 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, // aLay->addLayout(aNameLayout); aLay->addWidget(aSectionGroup); setLayout(aLay); - onSelectionChanged(); + + updateActionsStates(); + updateUndoRedo(); } /** @@ -312,18 +311,6 @@ int CurveCreator_Widget::changeInteractionStyle( int theStyle ) 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 @@ -332,36 +319,23 @@ void CurveCreator_Widget::reset() { } -//======================================================================= -// function: getUniqSectionName -// purpose: return unique section name -//======================================================================= -std::string CurveCreator_Widget::getUniqSectionName( CurveCreator_ICurve* theCurve ) const -{ - for( int i = 0 ; i < 1000000 ; i++ ){ - char aBuffer[255]; - sprintf( aBuffer, "Section_%d", i+1 ); - std::string aName(aBuffer); - int j; - for( j = 0 ; j < theCurve->getNbSections() ; j++ ){ - if( theCurve->getSectionName(j) == aName ) - break; - } - if( j == theCurve->getNbSections() ) - return aName; - } - return ""; -} - void CurveCreator_Widget::setCurve( CurveCreator_ICurve* theCurve ) { myCurve = theCurve; - mySectionView->setCurve(myCurve); - onSelectionChanged(); + mySectionView->setCurve( myCurve ); + myLocalPointView->setCurve( myCurve ); + updateActionsStates(); updateUndoRedo(); } void CurveCreator_Widget::onSelectionChanged() +{ + updateActionsStates(); + updateUndoRedo(); + emit selectionChanged(); +} + +void CurveCreator_Widget::updateActionsStates() { QList anEnabledAct; if( myCurve ){ @@ -458,8 +432,6 @@ void CurveCreator_Widget::onSelectionChanged() } } } - updateUndoRedo(); - emit selectionChanged(); } void CurveCreator_Widget::onAdditionMode(bool checked) @@ -525,26 +497,9 @@ void CurveCreator_Widget::onModeChanged(bool checked) break; } } - 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++; - 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(); + updateActionsStates(); updateUndoRedo(); + setLocalPointContext( aMode == ModificationMode, true ); } void CurveCreator_Widget::onNewSection() @@ -553,7 +508,7 @@ void CurveCreator_Widget::onNewSection() return; myNewSectionEditor->clear(); myNewSectionEditor->setEditMode(false); - QString aSectName = QString( getUniqSectionName(myCurve).c_str() ); + QString aSectName = QString( CurveCreator_UtilsICurve::getUniqSectionName( myCurve ).c_str() ); myNewSectionEditor->setSectionParameters(aSectName, true, CurveCreator::Polyline ); emit subOperationStarted( myNewSectionEditor ); } @@ -562,12 +517,13 @@ void CurveCreator_Widget::onAddNewSection() { if( !myCurve ) return; - myCurve->addSection( myNewSectionEditor->getName().toStdString(), myNewSectionEditor->getSectionType(), - myNewSectionEditor->isClosed() ); + myCurve->addSection( myNewSectionEditor->getName().toStdString(), + myNewSectionEditor->getSectionType(), + myNewSectionEditor->isClosed() ); mySectionView->sectionAdded( -1 ); // add a new section to the end of list - QString aNewName = QString(getUniqSectionName(myCurve).c_str()); + QString aNewName = QString( CurveCreator_UtilsICurve::getUniqSectionName( myCurve ).c_str() ); myNewSectionEditor->setSectionName(aNewName); - onSelectionChanged(); + updateActionsStates(); updateUndoRedo(); onCancelSection(); } @@ -647,32 +603,6 @@ void CurveCreator_Widget::onModifySection() onCancelSection(); } -/*void CurveCreator_Widget::onEditPoint( int theSection, int thePoint ) -{ - if( !myNewPointEditor || !myEdit ) - return; - mySection = theSection; - myPointNum = thePoint; - QString aSectName = QString::fromStdString( myCurve->getSectionName(theSection)); - myNewPointEditor->setEditMode(true); - myNewPointEditor->setSectionName(aSectName); - myNewPointEditor->setDimension( myCurve->getDimension() ); - CurveCreator::Coordinates aCoords = myCurve->getCoordinates(theSection,thePoint); - myNewPointEditor->setCoordinates(aCoords); - emit subOperationStarted( myNewPointEditor ); -} - -void CurveCreator_Widget::onModifyPoint() -{ - if( !myEdit ) - return; - CurveCreator::Coordinates aCoords = myNewPointEditor->getCoordinates(); - myEdit->setCoordinates( aCoords, mySection, myPointNum ); - mySectionView->pointDataChanged( mySection, myPointNum ); - updateUndoRedo(); - onCancelPoint(); -}*/ - void CurveCreator_Widget::onJoin() { if( !myCurve ) @@ -719,7 +649,7 @@ void CurveCreator_Widget::onClearAll() return; myCurve->clear(); mySectionView->reset(); - onSelectionChanged(); + updateActionsStates(); updateUndoRedo(); } @@ -729,7 +659,7 @@ void CurveCreator_Widget::onJoinAll() return; myCurve->join(); mySectionView->reset(); - onSelectionChanged(); + updateActionsStates(); updateUndoRedo(); } @@ -799,7 +729,7 @@ void CurveCreator_Widget::onUndo() if( !myCurve ) return; - CurveCreator_Widget::SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); myCurve->undo(); finishCurveModification(); @@ -810,7 +740,7 @@ void CurveCreator_Widget::onRedo() { if( !myCurve ) return; - CurveCreator_Widget::SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); myCurve->redo(); finishCurveModification(); @@ -915,10 +845,10 @@ bool CurveCreator_Widget::removeEnabled() //================================================================================= -// function : GeometryGUI::onGetCoordsByClick() +// function : GeometryGUI::addCoordsByClick() // purpose : Manage mouse press events in Additon mode //================================================================================= -void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) +void CurveCreator_Widget::addCoordsByClick( QMouseEvent* pe ) { if (pe->button() != Qt::LeftButton) return; @@ -936,15 +866,6 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) else ic->Select(); // New selection - /*TopoDS_Shape aShape; - - ic->InitSelected(); - if ( ic->MoreSelected() ) - aShape = ic->SelectedShape(); - - if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) - aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); - else*/ { OCCViewer_ViewPort3d* vp = getViewPort(); aPnt = CurveCreator_Utils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); @@ -956,8 +877,7 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) if ( myCurve->getDimension() == 3 ) { aCoords.push_back( aPnt.Z() ); } - onAddNewPoint(aCoords); -// myNewPointEditor->setCoordinates( aCoords ); + addNewPoint(aCoords); } } @@ -978,7 +898,7 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent break; } case AdditionMode: { - onGetCoordsByClick( theEvent ); + addCoordsByClick( theEvent ); break; } default: @@ -998,14 +918,18 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEven if ( myDragStarted ) { bool isDragged = myDragged; - CurveCreator_Widget::SectionToPointList aDraggedPoints; + CurveCreator_ICurve::SectionToPointList aDraggedPoints; if ( myDragged ) aDraggedPoints = myDragPoints; setDragStarted( false ); // if the drag of some points has happened, restore the drag selection if ( aDraggedPoints.size() > 0 ) - setSelectedPonts( aDraggedPoints ); + { + START_MEASURE_TIME; + setSelectedPoints( aDraggedPoints ); + END_MEASURE_TIME( "drop" ); + } } else // check whether the segment is clicked an a new point should be added to the segment insertPointToSelectedSegment( theEvent->pos().x(), theEvent->pos().y() ); @@ -1028,8 +952,12 @@ void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent ) if ( (aPos - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() ) return; + START_MEASURE_TIME; + moveSelectedPoints( aPos.x(), aPos.y() ); myDragStartPosition = aPos; + + END_MEASURE_TIME( "drag" ); } /** @@ -1058,13 +986,13 @@ void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent ) void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) { - int aCurrSect = getSectionId( theRow ); - int aPntIndex = getPointId( theRow ); + int aCurrSect = myLocalPointView->getSectionId( theRow ); + int aPntIndex = myLocalPointView->getPointId( theRow ); if ( aPntIndex < 0 ) return; - SectionToPointList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints ); double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble(); @@ -1112,16 +1040,31 @@ void CurveCreator_Widget::removeSection() */ void CurveCreator_Widget::removePoint() { - SectionToPointList aPoints; - getSelectedPonts( aPoints ); + CurveCreator_ICurve::SectionToPointList aPoints; + getSelectedPoints( aPoints ); if ( aPoints.size() == 0 ) return; - SectionToPointList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints, false ); myCurve->removeSeveralPoints( aPoints ); - finishCurveModification( SectionToPointList() ); + finishCurveModification( CurveCreator_ICurve::SectionToPointList() ); +} + +void CurveCreator_Widget::addNewPoint(const CurveCreator::Coordinates& theCoords) +{ + if( !myCurve ) + return; + 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 ) ); + updateActionsStates(); + updateUndoRedo(); } void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, @@ -1138,29 +1081,32 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, return; gp_Pnt aPoint; gp_Pnt aPoint1, aPoint2; - bool isFoundPoint = CurveCreator_Utils::getNeighbourPoints( aContext, aView, theX, theY, - aPoint, aPoint1, aPoint2 ); + Handle(AIS_InteractiveObject) anAISObject = myCurve->getAISObject(); + bool isFoundPoint = CurveCreator_Utils::pointOnObject( aView, anAISObject, theX, theY, + aPoint, aPoint1, aPoint2 ); if ( !isFoundPoint ) return; // insert the point to the model curve - SectionToPointList aSelPoints; + CurveCreator_ICurve::SectionToPointList aSelPoints; startCurveModification( aSelPoints ); CurveCreator::Coordinates aCoords; aCoords.push_back( aPoint.X() ); aCoords.push_back( aPoint.Y() ); - SectionToPointList aPoints1, aPoints2; + CurveCreator_ICurve::SectionToPointList aPoints1, aPoints2; findSectionsToPoints( aPoint1.X(), aPoint1.Y(), aPoints1 ); findSectionsToPoints( aPoint2.X(), aPoint2.Y(), aPoints2 ); - SectionToPointList::const_iterator anIt = aPoints1.begin(), aLast = aPoints1.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints1.begin(), + aLast = aPoints1.end(); int aSectionId = -1; // there can be a case when a new point is added into two sections int aPoint1Id = -1, aPoint2Id = -1; for ( ; anIt != aLast && aSectionId < 0; anIt++ ) { int aSectionCur = anIt->first; - SectionToPointList::const_iterator anIt2 = aPoints2.begin(), aLast2 = aPoints2.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt2 = aPoints2.begin(), + aLast2 = aPoints2.end(); for ( ; anIt2 != aLast2 && aSectionId < 0; anIt2++ ) { if ( anIt2->first == aSectionCur ) { aSectionId = aSectionCur; @@ -1183,7 +1129,7 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, finishCurveModification( aSelPoints ); - setSelectedPonts(); + setSelectedPoints(); } void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, @@ -1193,7 +1139,7 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, if ( !aViewPort ) return; - SectionToPointList aPoints; + CurveCreator_ICurve::SectionToPointList aPoints; startCurveModification( aPoints, false ); gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(), @@ -1206,7 +1152,8 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, CurveCreator_ICurve::SectionToPointCoordsList aCoordList; std::deque aChangedPos; - SectionToPointList::const_iterator anIt = myDragPoints.begin(), aLast = myDragPoints.end(); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myDragPoints.begin(), + aLast = myDragPoints.end(); for ( ; anIt != aLast; anIt++ ) { int aSectionId = anIt->first; int aPointId = anIt->second; @@ -1234,44 +1181,21 @@ void CurveCreator_Widget::updateLocalPointView() if ( aContext.IsNull() ) return; - 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() ); + CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints ); + int aNbPoints = myLocalPoints.size(); + bool isRowLimit = aNbPoints > myLocalPointRowLimit; + myLocalPointView->setVisible( getActionMode() == ModificationMode && !isRowLimit ); + + if ( !isRowLimit ) { + bool isBlocked = myLocalPointView->blockSignals(true); + myLocalPointView->setRowCount( 0 ); + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myLocalPoints.begin(), + aLast = myLocalPoints.end(); + for ( ; anIt != aLast; anIt++ ) + myLocalPointView->addLocalPointToTable( *anIt ); + + myLocalPointView->blockSignals( isBlocked ); } - myLocalPointView->blockSignals(isBlocked); } /** @@ -1279,66 +1203,11 @@ void CurveCreator_Widget::updateLocalPointView() */ void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable ) { - CurveCreator_Utils::setLocalPointContext( getAISContext(), theOpen ); + CurveCreator_Utils::setLocalPointContext( myCurve, getAISContext(), theOpen ); if ( !theOpen && isUpdateTable ) updateLocalPointView(); } -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, 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 ) { - aPoint = std::make_pair( getSectionId( i ), getPointId( i ) ); - if ( !contains( aSkipList, aPoint ) ) - aSkipList.push_back( 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 ( 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 ); - - 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 ); - } -} - /** * Set drag operation started. Save the position and a list of dragged points * \param theState the drag operation state: started/finished @@ -1347,7 +1216,7 @@ void CurveCreator_Widget::addLocalPointToTable( const double theX, const double void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint ) { if ( theState ) { - getSelectedPonts( myDragPoints ); + getSelectedPoints( myDragPoints ); myDragStarted = myDragPoints.size(); myDragStartPosition = thePoint; if ( myDragStarted ) { @@ -1364,61 +1233,22 @@ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& the myDragged = false; } -void CurveCreator_Widget::getSelectedPonts( CurveCreator_Widget::SectionToPointList& thePoints ) +void CurveCreator_Widget::getSelectedPoints( 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 ) ) ); + thePoints = myLocalPoints; } -void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionToPointList& thePoints ) +void CurveCreator_Widget::setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& thePoints ) { if ( myDragStarted ) return; - Handle(AIS_InteractiveContext) ic = getAISContext(); - if ( ic.IsNull() || !ic->HasOpenedContext() ) + Handle(AIS_InteractiveContext) aContext = getAISContext(); + if ( aContext.IsNull() || !aContext->HasOpenedContext() ) return; - AIS_ListOfInteractive aListToSelect; - AIS_ListOfInteractive aDisplayedList; - ic->DisplayedObjects( aDisplayedList ); - - SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end(); - SectionToPoint aSToPoint; - for( ; anIt != aLast; anIt++ ) { - aSToPoint = *anIt; - - 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() ) - continue; - - TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() ); + CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints ); - if ( aVertex.IsNull() ) - continue; - - gp_Pnt aPnt = BRep_Tool::Pnt( aVertex ); - - SectionToPointList aPoints; - findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints ); - - SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); - SectionToPoint aPoint; - for ( ; anIt != aLast; anIt++ ) { - aPoint = *anIt; - if ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second ) - aListToSelect.Append( anAIS ); - } - } - } - - ic->ClearSelected( Standard_False ); - setObjectsSelected( aListToSelect ); updateLocalPointView(); } @@ -1432,12 +1262,12 @@ void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionTo * \param theFillPoints a flag whether the selection list should be filled */ void CurveCreator_Widget::startCurveModification( - CurveCreator_Widget::SectionToPointList& thePoints, + CurveCreator_ICurve::SectionToPointList& thePoints, const bool theFillPoints ) { if ( theFillPoints ) { thePoints.clear(); - getSelectedPonts( thePoints ); + getSelectedPoints( thePoints ); } setLocalPointContext( false ); } @@ -1448,11 +1278,11 @@ void CurveCreator_Widget::startCurveModification( * \param thePoints a list of curve selected points */ void CurveCreator_Widget::finishCurveModification( - const CurveCreator_Widget::SectionToPointList& thePoints ) + const CurveCreator_ICurve::SectionToPointList& thePoints ) { if ( getActionMode() == ModificationMode ) setLocalPointContext( true ); - setSelectedPonts( thePoints ); + setSelectedPoints( thePoints ); updateUndoRedo(); } @@ -1463,74 +1293,19 @@ void CurveCreator_Widget::finishCurveModification( */ int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY ) { - int aPntIndex = -1; - - CurveCreator::Coordinates aCoords; - for ( int i = 0, aNb = myCurve->getNbPoints( theSectionId ); i < aNb && aPntIndex < 0; i++ ) { - aCoords = myCurve->getPoint( theSectionId, i ); - if ( aCoords.size() < 2 ) - continue; - if ( fabs( aCoords[0] - theX ) < LOCAL_SELECTION_TOLERANCE && - fabs( aCoords[1] - theY ) < LOCAL_SELECTION_TOLERANCE ) - aPntIndex = i; - } - - return aPntIndex; + return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY ); } void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY, - CurveCreator_Widget::SectionToPointList& thePoints ) + CurveCreator_ICurve::SectionToPointList& thePoints ) { - thePoints.clear(); - - int aPointId = -1; - for ( int i = 0, aNb = myCurve->getNbSections(); i < aNb; i++ ) { - aPointId = findLocalPointIndex( i, theX, theY ); - if ( aPointId < 0 ) - continue; - SectionToPoint aPoint = std::make_pair( i, aPointId ); - if ( !contains( thePoints, aPoint ) ) - thePoints.push_back( aPoint ); - } + return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints ); } -void CurveCreator_Widget::convert( const SectionToPointList& thePoints, +void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints, QMap >& theConvPoints ) { - theConvPoints.clear(); - - SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end(); - QList aPoints; - int aSectionId, aPointId; - for ( ; anIt != aLast; anIt++ ) { - aSectionId = anIt->first; - aPointId = anIt->second; - aPoints.clear(); - if ( theConvPoints.contains( aSectionId ) ) - aPoints = theConvPoints[aSectionId]; - if ( aPoints.contains( aPointId ) ) - continue; - aPoints.append( aPointId ); - theConvPoints[aSectionId] = aPoints; - } -} - -/** - * 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(); + return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints ); } /** @@ -1538,14 +1313,8 @@ int CurveCreator_Widget::getPointId( const int theRowId ) const * \param theList a container of values * \param theValue a value */ -bool CurveCreator_Widget::contains( const CurveCreator_Widget::SectionToPointList& theList, - const CurveCreator_Widget::SectionToPoint& theValue ) const +bool CurveCreator_Widget::contains( const CurveCreator_ICurve::SectionToPointList& theList, + const CurveCreator_ICurve::SectionToPoint& theValue ) const { - bool isFound = false; - - SectionToPointList::const_iterator anIt = theList.begin(), aLast = theList.end(); - for ( ; anIt != aLast && !isFound; anIt++ ) - isFound = anIt->first == theValue.first && anIt->second == theValue.second; - - return isFound; + return CurveCreator_UtilsICurve::contains( theList, theValue ); }