X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=b595c2217d16d73f6481aae0e861c8dc92027260;hb=4e1b53167581be7e084a3d71c075507bc6699c06;hp=a1133ba48380eaa750ec14c9d621310a324e0d09;hpb=ab0fa2ad7637d748339ba77b7ba151ef4f51fe9e;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index a1133ba4..b595c221 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx @@ -20,9 +20,7 @@ #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" @@ -38,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 @@ -71,21 +48,46 @@ #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, + const QStringList& theCoordTitles, + 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 ); + bool isToEnableClosed = !( theActionFlags & DisableClosedSection ); + myNewSectionEditor = new CurveCreator_NewSectionDlg( this, isToEnableClosed ); myNewSectionEditor->hide(); connect( myNewSectionEditor, SIGNAL(addSection()), this, SLOT(onAddNewSection()) ); connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) ); @@ -94,20 +96,12 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, QGroupBox* aSectionGroup = new QGroupBox(tr("Sections"),this); mySectionView = new CurveCreator_TreeView(myCurve, aSectionGroup); + mySectionView->setSelectionMode( QTreeView::ExtendedSelection ); 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 ); + myLocalPointView = new CurveCreator_TableView( myCurve, this, theCoordTitles ); connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ), this, SLOT( onCellChanged( int, int ) ) ); @@ -139,12 +133,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() ); @@ -165,8 +161,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()) ); @@ -188,22 +186,21 @@ 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(); + + 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( 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()) ); + 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 ); @@ -218,7 +215,9 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, // aLay->addLayout(aNameLayout); aLay->addWidget(aSectionGroup); setLayout(aLay); - onSelectionChanged(); + + updateActionsStates(); + updateUndoRedo(); } /** @@ -313,18 +312,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 @@ -333,36 +320,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 ){ @@ -370,7 +344,6 @@ void CurveCreator_Widget::onSelectionChanged() if ( removeEnabled() ) anEnabledAct << REMOVE_ID; QList aSelSections = mySectionView->getSelectedSections(); - QList< QPair< int, int > > aSelPoints = mySectionView->getSelectedPoints(); CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType(); switch( aSelType ){ case CurveCreator_TreeView::ST_NOSEL:{ @@ -395,22 +368,31 @@ void CurveCreator_Widget::onSelectionChanged() } break; case ModificationMode: { - anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID; + if ( myNewSectionEditor->isEnableClosed() ) + anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID; + anEnabledAct << 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; - //} + if( aSectCnt > 1 ) + anEnabledAct << JOIN_ALL_ID; + if( aSelSections.size() > 1 ){ + anEnabledAct << JOIN_ID; + } } break; case DetectionMode: { } break; case NoneMode: + { + int aSectCnt = myCurve->getNbSections(); + if( aSectCnt > 1 ) + anEnabledAct << JOIN_ALL_ID; + if( aSelSections.size() > 1 ) + anEnabledAct << JOIN_ID; + } + break; default: break; } @@ -443,10 +425,9 @@ void CurveCreator_Widget::onSelectionChanged() if( (myCurve->getNbSections() + myCurve->getNbPoints()) > 0 ){ anEnabledAct << REMOVE_ALL_ID; }*/ - // TODO - //if( myCurve->getNbSections() > 1 ){ - // anEnabledAct << JOIN_ALL_ID; - //} + if( myCurve->getNbSections() > 1 ){ + anEnabledAct << JOIN_ALL_ID; + } } QList anIds = myActionMap.keys(); for( int i = 0 ; i < anIds.size() ; i++ ){ @@ -459,8 +440,6 @@ void CurveCreator_Widget::onSelectionChanged() } } } - updateUndoRedo(); - emit selectionChanged(); } void CurveCreator_Widget::onAdditionMode(bool checked) @@ -478,13 +457,6 @@ void CurveCreator_Widget::onAdditionMode(bool checked) if( aSelSection.size() > 0 ){ mySection = aSelSection[0]; } - else{ - QList< QPair > aSelPoints = mySectionView->getSelectedPoints(); - if( aSelPoints.size() > 0 ){ - mySection = aSelPoints[0].first; - myPointNum = aSelPoints[0].second + 1; - } - } // emit subOperationStarted( myNewPointEditor ); } @@ -526,49 +498,35 @@ 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() { if( !myCurve ) return; + + stopActionMode(); 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 ); + emit subOperationStarted( myNewSectionEditor, false ); } 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(); } @@ -591,31 +549,41 @@ QAction* CurveCreator_Widget::createAction( ActionId theId, const QString& theNa return anAct; } -QAction* CurveCreator_Widget::getAction(ActionId theId) +QAction* CurveCreator_Widget::getAction( ActionId theId ) { if( myActionMap.contains(theId) ) return myActionMap[theId]; return NULL; } -CurveCreator_Widget::ActionMode CurveCreator_Widget::getActionMode() const +QAction* CurveCreator_Widget::getAction( ActionMode theMode ) { - 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; + ActionId anActionId = NONE_ID; + switch ( theMode ) { + case AdditionMode: + anActionId = ADDITION_MODE_ID; + break; + case ModificationMode: + anActionId = MODIFICATION_MODE_ID; + break; + case DetectionMode: + anActionId = DETECTION_MODE_ID; + break; + default: + break; + } + QAction* anAction = 0; + if ( anActionId != NONE_ID && myActionMap.contains( anActionId ) ) + anAction = myActionMap[anActionId]; + return anAction; } void CurveCreator_Widget::onEditSection( int theSection ) { if( !myCurve ) return; + + stopActionMode(); mySection = theSection; QString aSectName = QString::fromStdString( myCurve->getSectionName(theSection)); bool isClosed = myCurve->isClosed(theSection); @@ -623,7 +591,7 @@ void CurveCreator_Widget::onEditSection( int theSection ) myNewSectionEditor->setEditMode(true); myNewSectionEditor->setSectionParameters( aSectName, isClosed, aType ); - emit subOperationStarted( myNewSectionEditor ); + emit subOperationStarted( myNewSectionEditor, true ); } void CurveCreator_Widget::onModifySection() @@ -633,7 +601,6 @@ void CurveCreator_Widget::onModifySection() QString aName = myNewSectionEditor->getName(); bool isClosed = myNewSectionEditor->isClosed(); CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType(); -// myCurve->startOperation(); if( myCurve->getSectionName(mySection) != aName.toStdString() ) myCurve->setSectionName( mySection , aName.toStdString() ); @@ -642,38 +609,11 @@ void CurveCreator_Widget::onModifySection() if( myCurve->isClosed(mySection) != isClosed ) myCurve->setClosed( mySection, isClosed ); -// myCurve->finishOperation(); mySectionView->sectionChanged(mySection); updateUndoRedo(); 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 ) @@ -682,18 +622,28 @@ void CurveCreator_Widget::onJoin() if( aSections.size() == 0 ){ return; } - int aMainSect = aSections[0]; - int aMainSectSize = myCurve->getNbPoints(aMainSect); -// myCurve->startOperation(); - for( int i = 1 ; i < aSections.size() ; i++ ){ - int aSectNum = aSections[i] - (i-1); - myCurve->join( aMainSect, aSectNum ); - mySectionView->sectionsRemoved( aSectNum ); + stopActionMode(); + + std::list aSectionsToJoin; + for( int i = 0; i < aSections.size() ; i++ ){ + aSectionsToJoin.push_back( aSections[i] ); } -// myCurve->finishOperation(); + //int aMainSect = aSectionsToJoin.front(); + //int aMainSectSize = myCurve->getNbPoints(aMainSect); + if ( myCurve->join( aSectionsToJoin ) ) + { + std::list::const_iterator anIt = aSectionsToJoin.begin(), + aLast = aSectionsToJoin.end(); + // the first section should be skipped. It is not removed, but is modified + anIt++; + for ( ; anIt != aLast; anIt++ ) + mySectionView->sectionsRemoved( *anIt ); + } + + /* The update for the points of the main section int aNewSectSize = myCurve->getNbPoints(aMainSect); if( aNewSectSize != aMainSectSize ) - mySectionView->pointsAdded( aMainSect, aMainSectSize, aNewSectSize-aMainSectSize ); + mySectionView->pointsAdded( aMainSect, aMainSectSize, aNewSectSize-aMainSectSize );*/ updateUndoRedo(); } @@ -718,9 +668,10 @@ void CurveCreator_Widget::onClearAll() { if( !myCurve ) return; + stopActionMode(); myCurve->clear(); mySectionView->reset(); - onSelectionChanged(); + updateActionsStates(); updateUndoRedo(); } @@ -728,9 +679,16 @@ void CurveCreator_Widget::onJoinAll() { if( !myCurve ) return; - myCurve->join(); + stopActionMode(); + + std::list aSectionsToJoin; + for( int i = 0, aNb = myCurve->getNbSections(); i < aNb ; i++ ){ + aSectionsToJoin.push_back( i ); + } + bool aRes = myCurve->join( aSectionsToJoin ); + mySectionView->reset(); - onSelectionChanged(); + updateActionsStates(); updateUndoRedo(); } @@ -743,13 +701,12 @@ void CurveCreator_Widget::onSetSpline() { if( !myCurve ) return; + stopActionMode(); QList aSelSections = mySectionView->getSelectedSections(); -// myCurve->startOperation(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ myCurve->setSectionType(aSelSections[i], CurveCreator::Spline ); mySectionView->sectionChanged(aSelSections[i]); } -// myCurve->finishOperation(); updateUndoRedo(); } @@ -757,13 +714,12 @@ void CurveCreator_Widget::onSetPolyline() { if( !myCurve ) return; -// myCurve->startOperation(); + stopActionMode(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ myCurve->setSectionType( aSelSections[i], CurveCreator::Polyline ); mySectionView->sectionChanged( aSelSections[i] ); } -// myCurve->finishOperation(); updateUndoRedo(); } @@ -771,13 +727,12 @@ void CurveCreator_Widget::onCloseSections() { if( !myCurve ) return; -// myCurve->startOperation(); + stopActionMode(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ myCurve->setClosed(aSelSections[i], true); mySectionView->sectionChanged(aSelSections[i]); } -// myCurve->finishOperation(); updateUndoRedo(); } @@ -785,13 +740,12 @@ void CurveCreator_Widget::onUncloseSections() { if( !myCurve ) return; -// myCurve->startOperation(); + stopActionMode(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ myCurve->setClosed(aSelSections[i], false); mySectionView->sectionChanged(aSelSections[i]); } -// myCurve->finishOperation(); updateUndoRedo(); } @@ -845,7 +799,7 @@ void CurveCreator_Widget::updateUndoRedo() void CurveCreator_Widget::onContextMenu( QPoint thePoint ) { QList aContextActions; - aContextActions << CLEAR_ALL_ID << JOIN_ALL_ID << SEPARATOR_ID << + aContextActions << CLEAR_ALL_ID << JOIN_ID << JOIN_ALL_ID << SEPARATOR_ID << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID; QPoint aGlPoint = mySectionView->mapToGlobal(thePoint); @@ -886,9 +840,11 @@ QList CurveCreator_Widget::getSelectedSections() return mySectionView->getSelectedSections(); } -QList< QPair< int, int > > CurveCreator_Widget::getSelectedPoints() +void CurveCreator_Widget::setSelectedSections( const QList& theSections ) { - return mySectionView->getSelectedPoints(); + mySectionView->setSelectedSections( theSections ); + updateActionsStates(); + updateUndoRedo(); } /** @@ -914,12 +870,61 @@ bool CurveCreator_Widget::removeEnabled() return isEnabled; } +void CurveCreator_Widget::setActionMode( const ActionMode& theMode ) +{ + ActionMode aPrevMode = getActionMode(); + QAction* aPrevAction = getAction( aPrevMode ); + QAction* anAction = getAction( theMode ); + switch ( theMode ) { + case NoneMode: + case AdditionMode: { + if ( aPrevAction ) { + if ( aPrevAction->isChecked() ) { + aPrevAction->setChecked( false ); + } + } + if ( aPrevMode == ModificationMode ) + onModificationMode( false ); + if ( aPrevMode == AdditionMode ) + onAdditionMode( false ); + + if ( theMode == AdditionMode ) + { + anAction->setChecked( true ); + onModeChanged( true ); + } + } + break; + break; + case ModificationMode: + { + //TODO + } + break; + case DetectionMode: + break; + } +} + +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; +} //================================================================================= -// 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; @@ -937,15 +942,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() ); @@ -957,8 +953,7 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe ) if ( myCurve->getDimension() == 3 ) { aCoords.push_back( aPnt.Z() ); } - onAddNewPoint(aCoords); -// myNewPointEditor->setCoordinates( aCoords ); + addNewPoint(aCoords); } } @@ -972,6 +967,9 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent if ( theEvent->button() != Qt::LeftButton ) return; + myPressedX = theEvent->x(); + myPressedY = theEvent->y(); + switch( getActionMode() ) { case ModificationMode: { //store initial cursor position for Drag&Drop @@ -979,7 +977,7 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent break; } case AdditionMode: { - onGetCoordsByClick( theEvent ); + addCoordsByClick( theEvent ); break; } default: @@ -1000,19 +998,83 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEven if ( myDragStarted ) { bool isDragged = myDragged; CurveCreator_ICurve::SectionToPointList aDraggedPoints; - if ( myDragged ) + QMap > anInitialDragPointsCoords; + if ( myDragged ) { aDraggedPoints = myDragPoints; + anInitialDragPointsCoords = myInitialDragPointsCoords; + } setDragStarted( false ); - // if the drag of some points has happened, restore the drag selection - if ( aDraggedPoints.size() > 0 ) - setSelectedPonts( aDraggedPoints ); + + if ( aDraggedPoints.size() > 0 ) { + // Collect old coordinates of the dragged points + CurveCreator_ICurve::SectionToPointCoordsList anOldPoints; + foreach ( const CurveCreator_ICurve::SectionToPoint aSectionToPoint, anInitialDragPointsCoords.keys() ) { + CurveCreator::Coordinates aCoords = anInitialDragPointsCoords.value( aSectionToPoint ); + anOldPoints.push_back( std::make_pair( aSectionToPoint, aCoords ) ); + } + + if ( myCurve->canPointsBeSorted() ) { + // Add old coordinates of the curve points (except the dragged points) to the list + for( int aSectionId = 0 ; aSectionId < myCurve->getNbSections() ; aSectionId++ ) { + CurveCreator::Coordinates aCoords; + for ( int aPointId = 0, aNb = myCurve->getNbPoints( aSectionId ); aPointId < aNb; aPointId++ ) { + aCoords = myCurve->getPoint( aSectionId, aPointId ); + if ( aCoords.size() < 2 ) { + continue; + } + + CurveCreator_ICurve::SectionToPoint aSectionToPoint = std::make_pair( aSectionId, aPointId ); + + if ( !anInitialDragPointsCoords.contains( aSectionToPoint ) ) { + anOldPoints.push_back( std::make_pair( aSectionToPoint, aCoords ) ); + } + } + } + + // Apply points sorting + CurveCreator_ICurve::SectionToPointList aPoints; + startCurveModification( aPoints, false ); + + myCurve->setSkipSorting( false ); + + CurveCreator_ICurve::SectionToPointCoordsList aCoordList; + CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aDraggedPoints.begin(), + aLast = aDraggedPoints.end(); + for ( ; anIt != aLast; anIt++ ) { + int aSectionId = anIt->first; + int aPointId = anIt->second; + std::deque aPos = myCurve->getPoint( aSectionId, aPointId ); + + aCoordList.push_back( + std::make_pair( std::make_pair( aSectionId, aPointId ), aPos ) ); + } + + myCurve->setSeveralPoints( aCoordList, false ); + + finishCurveModification( aDraggedPoints ); + } else { + // if the drag of some points has happened, restore the drag selection + START_MEASURE_TIME; + setSelectedPoints( aDraggedPoints ); + END_MEASURE_TIME( "drop" ); + } + + // Save drag difference + myCurve->saveCoordDiff( anOldPoints ); + } } else // check whether the segment is clicked an a new point should be added to the segment - insertPointToSelectedSegment( theEvent->pos().x(), theEvent->pos().y() ); + { + int aReleasedX = theEvent->x(); + int aReleasedY = theEvent->y(); + if ( myPressedX == aReleasedX && myPressedY == aReleasedY ) + insertPointToSelectedSegment( aReleasedX, aReleasedY ); + } // updates the input panel table to show the selected point coordinates updateLocalPointView(); + updateUndoRedo(); } /** @@ -1029,8 +1091,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" ); } /** @@ -1059,8 +1125,8 @@ 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; @@ -1083,27 +1149,14 @@ void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) */ void CurveCreator_Widget::removeSection() { - 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++; - } + stopActionMode(); + 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(); } @@ -1114,7 +1167,7 @@ void CurveCreator_Widget::removeSection() void CurveCreator_Widget::removePoint() { CurveCreator_ICurve::SectionToPointList aPoints; - getSelectedPonts( aPoints ); + getSelectedPoints( aPoints ); if ( aPoints.size() == 0 ) return; @@ -1125,6 +1178,21 @@ void CurveCreator_Widget::removePoint() 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, const int theY ) { @@ -1139,8 +1207,9 @@ 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; @@ -1158,6 +1227,7 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints1.begin(), aLast = aPoints1.end(); int aSectionId = -1; + // find the indices of the neighbour point // 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++ ) { @@ -1186,7 +1256,7 @@ void CurveCreator_Widget::insertPointToSelectedSegment( const int theX, finishCurveModification( aSelPoints ); - setSelectedPonts(); + setSelectedPoints(); } void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, @@ -1217,6 +1287,12 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, aChangedPos = myCurve->getPoint( aSectionId, aPointId ); if ( aChangedPos.size() < 2 ) continue; + + // Remember drag points coordinates + if ( !myDragged ) { + myInitialDragPointsCoords.insert( std::make_pair( aSectionId, aPointId ), aChangedPos ); + } + aChangedPos[0] = aChangedPos[0] - aXDelta; aChangedPos[1] = aChangedPos[1] - anYDelta; @@ -1224,7 +1300,7 @@ void CurveCreator_Widget::moveSelectedPoints( const int theXPosition, std::make_pair(std::make_pair( aSectionId, aPointId ), aChangedPos )); } - myCurve->setSeveralPoints( aCoordList ); + myCurve->setSeveralPoints( aCoordList, false ); myDragged = true; finishCurveModification( myDragPoints ); @@ -1238,22 +1314,19 @@ void CurveCreator_Widget::updateLocalPointView() if ( aContext.IsNull() ) return; - std::list aSelectedList = CurveCreator_Utils::getSelectedPoints( aContext ); + CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints ); + int aNbPoints = myLocalPoints.size(); - std::list::const_iterator anIt = aSelectedList.begin(), aLast = aSelectedList.end(); + bool isRowLimit = aNbPoints > myLocalPointRowLimit; + myLocalPointView->setVisible( getActionMode() == ModificationMode && !isRowLimit ); - bool isBlocked = myLocalPointView->blockSignals(true); - myLocalPointView->setRowCount( 0 ); - for ( ; anIt != aLast; anIt++ ) - { - float aX = *anIt; - anIt++; - float anY = *anIt; - anIt++; - float aZ = *anIt; - addLocalPointToTable( aX, anY ); + if ( !isRowLimit ) { + bool isBlocked = myLocalPointView->blockSignals(true); + + myLocalPointView->setLocalPointsToTable( myLocalPoints ); + + myLocalPointView->blockSignals( isBlocked ); } - myLocalPointView->blockSignals(isBlocked); } /** @@ -1261,67 +1334,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 ) -{ - 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, 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; - 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 ); - - 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 @@ -1330,12 +1347,14 @@ 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 ) { // change a viewer interaction style in order to avoid a select rectangle build myDragInteractionStyle = changeInteractionStyle( SUIT_ViewModel::KEY_FREE ); + myCurve->setSkipSorting( true ); } } else { @@ -1343,71 +1362,35 @@ void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& the changeInteractionStyle( myDragInteractionStyle ); myDragStarted = false; myDragPoints.clear(); + myInitialDragPointsCoords.clear(); } myDragged = false; } -void CurveCreator_Widget::getSelectedPonts( CurveCreator_ICurve::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_ICurve::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 ); - - CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), - aLast = thePoints.end(); - CurveCreator_ICurve::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() ); - - if ( aVertex.IsNull() ) - continue; - - gp_Pnt aPnt = BRep_Tool::Pnt( aVertex ); - - 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; anIt++ ) { - aPoint = *anIt; - if ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second ) - aListToSelect.Append( anAIS ); - } - } - } + CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints ); - ic->ClearSelected( Standard_False ); - setObjectsSelected( aListToSelect ); updateLocalPointView(); } +void CurveCreator_Widget::stopActionMode() +{ + setActionMode( NoneMode ); +} + /** * Get viewer information before perform the curve modification. * Take a list of selected cuve points an close local context. @@ -1423,7 +1406,7 @@ void CurveCreator_Widget::startCurveModification( { if ( theFillPoints ) { thePoints.clear(); - getSelectedPonts( thePoints ); + getSelectedPoints( thePoints ); } setLocalPointContext( false ); } @@ -1438,7 +1421,7 @@ void CurveCreator_Widget::finishCurveModification( { if ( getActionMode() == ModificationMode ) setLocalPointContext( true ); - setSelectedPonts( thePoints ); + setSelectedPoints( thePoints ); updateUndoRedo(); } @@ -1464,24 +1447,6 @@ void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList 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