X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=b44a2734c36bbf4fb8465a898ce55cc5eb71b10a;hb=c363fc5c3541669e07cf4d991cc1e94253147ac1;hp=ea0b5098a0cdff39cf4e25d4d25090589c7a3449;hpb=28b09f8fc96218c317aa67805bb3fc0e296aedbd;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index ea0b5098..b44a2734 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,25 +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 @@ -71,7 +50,7 @@ #include #include -#define MEASURE_TIME +//#define MEASURE_TIME #ifdef MEASURE_TIME @@ -99,6 +78,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent, CurveCreator_ICurve *theCurve, + const int theActionFlags, Qt::WindowFlags fl, int theLocalPointRowLimit ) : QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), @@ -150,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() ); @@ -176,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()) ); @@ -199,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(); @@ -517,28 +502,12 @@ void CurveCreator_Widget::onModeChanged(bool checked) 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 ) ); - updateActionsStates(); - updateUndoRedo(); -} - void CurveCreator_Widget::onNewSection() { if( !myCurve ) return; + + stopModificationMode(); myNewSectionEditor->clear(); myNewSectionEditor->setEditMode(false); QString aSectName = QString( CurveCreator_UtilsICurve::getUniqSectionName( myCurve ).c_str() ); @@ -604,6 +573,8 @@ void CurveCreator_Widget::onEditSection( int theSection ) { if( !myCurve ) return; + + stopModificationMode(); mySection = theSection; QString aSectName = QString::fromStdString( myCurve->getSectionName(theSection)); bool isClosed = myCurve->isClosed(theSection); @@ -621,7 +592,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() ); @@ -630,38 +600,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 ) @@ -670,15 +613,15 @@ void CurveCreator_Widget::onJoin() if( aSections.size() == 0 ){ return; } + stopModificationMode(); + 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 ); } -// myCurve->finishOperation(); int aNewSectSize = myCurve->getNbPoints(aMainSect); if( aNewSectSize != aMainSectSize ) mySectionView->pointsAdded( aMainSect, aMainSectSize, aNewSectSize-aMainSectSize ); @@ -706,6 +649,7 @@ void CurveCreator_Widget::onClearAll() { if( !myCurve ) return; + stopModificationMode(); myCurve->clear(); mySectionView->reset(); updateActionsStates(); @@ -716,6 +660,7 @@ void CurveCreator_Widget::onJoinAll() { if( !myCurve ) return; + stopModificationMode(); myCurve->join(); mySectionView->reset(); updateActionsStates(); @@ -731,13 +676,12 @@ void CurveCreator_Widget::onSetSpline() { if( !myCurve ) return; + stopModificationMode(); 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(); } @@ -745,13 +689,12 @@ void CurveCreator_Widget::onSetPolyline() { if( !myCurve ) return; -// myCurve->startOperation(); + stopModificationMode(); 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(); } @@ -759,13 +702,12 @@ void CurveCreator_Widget::onCloseSections() { if( !myCurve ) return; -// myCurve->startOperation(); + stopModificationMode(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ myCurve->setClosed(aSelSections[i], true); mySectionView->sectionChanged(aSelSections[i]); } -// myCurve->finishOperation(); updateUndoRedo(); } @@ -773,13 +715,12 @@ void CurveCreator_Widget::onUncloseSections() { if( !myCurve ) return; -// myCurve->startOperation(); + stopModificationMode(); QList aSelSections = mySectionView->getSelectedSections(); for( int i = 0 ; i < aSelSections.size() ; i++ ){ myCurve->setClosed(aSelSections[i], false); mySectionView->sectionChanged(aSelSections[i]); } -// myCurve->finishOperation(); updateUndoRedo(); } @@ -904,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; @@ -925,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() ); @@ -945,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); } } @@ -967,7 +898,7 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent break; } case AdditionMode: { - onGetCoordsByClick( theEvent ); + addCoordsByClick( theEvent ); break; } default: @@ -1079,10 +1010,11 @@ void CurveCreator_Widget::onCellChanged( int theRow, int theColumn ) */ void CurveCreator_Widget::removeSection() { + stopModificationMode(); + 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; @@ -1099,7 +1031,6 @@ void CurveCreator_Widget::removeSection() myCurve->removeSection( aSectNum ); mySectionView->sectionsRemoved( aSectNum ); } -// myCurve->finishOperation(); mySectionView->clearSelection(); updateUndoRedo(); } @@ -1121,6 +1052,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 ) { @@ -1135,8 +1081,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; @@ -1237,7 +1184,7 @@ void CurveCreator_Widget::updateLocalPointView() CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints ); int aNbPoints = myLocalPoints.size(); bool isRowLimit = aNbPoints > myLocalPointRowLimit; - myLocalPointView->setVisible( !isRowLimit ); + myLocalPointView->setVisible( getActionMode() == ModificationMode && !isRowLimit ); if ( !isRowLimit ) { bool isBlocked = myLocalPointView->blockSignals(true); @@ -1256,7 +1203,7 @@ 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(); } @@ -1305,6 +1252,16 @@ void CurveCreator_Widget::setSelectedPoints( const CurveCreator_ICurve::SectionT updateLocalPointView(); } +void CurveCreator_Widget::stopModificationMode() +{ + QAction* anAction = myActionMap[MODIFICATION_MODE_ID]; + if ( anAction ) { + if ( anAction->isChecked() ) + anAction->setChecked( false ); + } + onModificationMode( false ); +} + /** * Get viewer information before perform the curve modification. * Take a list of selected cuve points an close local context.