X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=4d1b80914ceb8ea2380a9d46309c9aa19de5104f;hb=65c66988575cb4fc8de7d838cde08b4731a6e54b;hp=f3c5b8e85f2c971c216cc6264cbd0a406be343c0;hpb=ccba842d3f399476c64ddc0bebc191e3c1daebd0;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx index f3c5b8e8..4d1b8091 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,28 +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 #include @@ -74,7 +50,7 @@ #include #include -#define MEASURE_TIME +//#define MEASURE_TIME #ifdef MEASURE_TIME @@ -100,10 +76,9 @@ -const double LOCAL_SELECTION_TOLERANCE = 0.0001; - 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), @@ -155,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() ); @@ -181,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()) ); @@ -204,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(); @@ -331,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 @@ -534,24 +502,6 @@ 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 ) @@ -653,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 ) @@ -921,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; @@ -942,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() ); @@ -962,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); } } @@ -984,7 +898,7 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent break; } case AdditionMode: { - onGetCoordsByClick( theEvent ); + addCoordsByClick( theEvent ); break; } default: @@ -1138,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 ) { @@ -1152,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; @@ -1254,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); @@ -1273,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(); } @@ -1309,133 +1239,16 @@ void CurveCreator_Widget::getSelectedPoints( CurveCreator_ICurve::SectionToPoint thePoints = myLocalPoints; } - -bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex, - const CurveCreator_ICurve::SectionToPoint& theSToPoint ) -{ - bool isIntersect = false; - if ( theVertex.IsNull() ) - return isIntersect; - - gp_Pnt aSPoint; - CurveCreator_UtilsICurve::getPoint( myCurve, theSToPoint.first, theSToPoint.second, - aSPoint ); - gp_Pnt aVertexPoint = BRep_Tool::Pnt( theVertex ); - isIntersect = fabs( aVertexPoint.X() - aSPoint.X() ) < LOCAL_SELECTION_TOLERANCE && - fabs( aVertexPoint.Y() - aSPoint.Y() ) < LOCAL_SELECTION_TOLERANCE; - - return isIntersect; -} - - 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 ); - ic->ClearSelected( Standard_False ); - - bool isSelectedVertex = false; - - //ASL: std::vector aVetexVec; - for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() ) - { - Handle(AIS_InteractiveObject) anAIS = it.Value(); - if ( anAIS.IsNull() ) - continue; - Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( anAIS ); - if ( anAISShape.IsNull() ) - continue; - - - /*ASL: const TopoDS_Shape& aShape = anAISShape->Shape(); - TopExp_Explorer aExpV( aShape, TopAbs_VERTEX); - for ( ; aExpV.More(); aExpV.Next() ) - { - const TopoDS_Vertex& aVertex = TopoDS::Vertex( aExpV.Current() ); - aVetexVec.push_back( aVertex ); - }*/ - - - //ASL: we convert list of point indices to list of points coordinates - int aSize = thePoints.size(); - std::vector aPntsToSelect( aSize ); - - CurveCreator_ICurve::SectionToPointList::const_iterator - aPIt = thePoints.begin(), aPLast = thePoints.end(); - CurveCreator_ICurve::SectionToPoint aSToPoint; - for( int i=0; aPIt != aPLast; aPIt++, i++ ) - { - gp_Pnt aPntToSelect; - CurveCreator_UtilsICurve::getPoint( myCurve, aPIt->first, aPIt->second, aPntToSelect ); - aPntsToSelect[i] = aPntToSelect; - } - - - //ASL: we switch off automatic highlight to improve performance of selection - ic->SetAutomaticHilight( Standard_False ); - - Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); - for( aSelection->Init(); aSelection->More(); aSelection->Next() ) - { - Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive(); - Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity ); - - gp_Pnt anOwnerPnt = aSenPnt->Point(); - Handle_SelectMgr_EntityOwner anOwner = Handle_SelectMgr_EntityOwner::DownCast( aSenPnt->OwnerId() ); - - - CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), - aLast = thePoints.end(); - bool isFound = false; - for( int i=0; iAddOrRemoveSelected( anOwner, Standard_False ); - break; - } - } - } - } - - /*ASL: std::vector::const_iterator aVecIt = aVetexVec.begin(), aVecLast = aVetexVec.end(); - CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), - aLast = thePoints.end(); - int aSize = aVetexVec.size(); - CurveCreator_ICurve::SectionToPoint aSToPoint; - int anAddedSize = 0; - for( ; anIt != aLast; anIt++ ) { - aSToPoint = *anIt; - - for ( aVecIt = aVetexVec.begin(); aVecIt != aVecLast; aVecIt++ ) - { - TopoDS_Vertex aVertex = TopoDS::Vertex( *aVecIt ); - if ( isIntersectVertexToPoint( aVertex, aSToPoint ) ) { - ic->AddOrRemoveSelected( aVertex, Standard_False ); - isSelectedVertex = true; - anAddedSize++; - } - } - }*/ - - //ASL: we switch on again automatic highlight (otherwise selection will not be shown) - // and call HilightPicked to draw selected owners - ic->SetAutomaticHilight( Standard_True ); - ic->LocalContext()->HilightPicked( Standard_True ); + CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints ); - //ic->UpdateCurrentViewer(); - if ( !isSelectedVertex ) - setObjectsSelected( aListToSelect ); updateLocalPointView(); }