//#include "CurveCreator_NewPointDlg.h"
#include "CurveCreator_NewSectionDlg.h"
#include "CurveCreator_Utils.h"
+#include "CurveCreator_UtilsICurve.hxx"
#include "CurveCreator_TableView.h"
#include <SUIT_Session.h>
this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
connect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
- OCCViewer_Utilities::setViewer2DMode( theViewer, OCCViewer_ViewWindow::XYPlane );
+ OCCViewer_Utilities::setViewer2DMode( myOCCViewer, OCCViewer_ViewWindow::XYPlane );
}
}
return myOCCViewer;
}
+/**
+ * Returns OCC viewer context
+ */
+Handle(AIS_InteractiveContext) CurveCreator_Widget::getAISContext()
+{
+ Handle(AIS_InteractiveContext) aContext;
+ OCCViewer_Viewer* aViewer = getOCCViewer();
+ if ( aViewer )
+ aContext = aViewer->getAISContext();
+
+ return aContext;
+}
+
+/**
+ * Returns OCC viewer view port
+ */
+OCCViewer_ViewPort3d* CurveCreator_Widget::getViewPort()
+{
+ OCCViewer_ViewPort3d* aViewPort = 0;
+ OCCViewer_Viewer* aViewer = getOCCViewer();
+ if ( aViewer )
+ aViewPort = ((OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView())->getViewPort();
+
+ return aViewPort;
+}
+
+/**
+ * Set interaction style in the OCC viewer
+ * \param theStyle a new style
+ * \return the previous style
+ */
+int CurveCreator_Widget::changeInteractionStyle( int theStyle )
+{
+ OCCViewer_Viewer* aViewer = getOCCViewer();
+ if ( !aViewer )
+ return -1;
+
+ int aPrevStyle = aViewer->interactionStyle();
+ aViewer->setInteractionStyle( 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
+//=======================================================================
+void CurveCreator_Widget::reset()
+{
+}
+
//=======================================================================
// function: getUniqSectionName
// purpose: return unique section name
void CurveCreator_Widget::onAdditionMode(bool checked)
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if( !myCurve || !aViewer )
+ if (!checked)
return;
- Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
- OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
- (aViewer->getViewManager());
-// if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) {
- if( aViewer ) {
- if (checked) {
-/* myGuiState = aViewWindow->saveState();
- aViewer->enableMultiselection(false);
- aViewer->enableSelection(false);*/
- } else {
-/* aViewer->enableMultiselection(true);
- aViewer->enableSelection(true);
- aViewWindow->restoreState( myGuiState );*/
- return;
- }
- }
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if( !myCurve || aContext.IsNull() )
+ return;
mySection= -1;
myPointNum = -1;
if( !myCurve )
return;
- CurveCreator_Widget::SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
startCurveModification( aPoints, false );
myCurve->undo();
finishCurveModification();
{
if( !myCurve )
return;
- CurveCreator_Widget::SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
startCurveModification( aPoints, false );
myCurve->redo();
finishCurveModification();
return;
if ( pe->modifiers() != Qt::ControlModifier ) {
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return;
- Handle(AIS_InteractiveContext) ic = aViewer->getAISContext();
+ Handle(AIS_InteractiveContext) ic = getAISContext();
+ if ( ic.IsNull() )
+ return;
gp_Pnt aPnt;
aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
else*/
{
- OCCViewer_ViewPort3d* vp =
- ((OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView())->getViewPort();
+ OCCViewer_ViewPort3d* vp = getViewPort();
aPnt = CurveCreator_Utils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
}
// set the coordinates into dialog
return;
if ( myDragStarted ) {
- if ( myDragged ) // if the drag of some points has happened, restore the drag selection
- setSelectedPonts( myDragPoints );
+ bool isDragged = myDragged;
+ 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 );
}
else // check whether the segment is clicked an a new point should be added to the segment
insertPointToSelectedSegment( theEvent->pos().x(), theEvent->pos().y() );
myOCCViewer = 0;
}
+void CurveCreator_Widget::onMousePress( QMouseEvent* theEvent )
+{
+ onMousePress( 0, theEvent );
+}
+
+void CurveCreator_Widget::onMouseRelease( QMouseEvent* theEvent )
+{
+ onMouseRelease( 0, theEvent );
+}
+
+void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent )
+{
+ onMouseMove( 0, theEvent );
+}
+
void CurveCreator_Widget::onCellChanged( int theRow, int theColumn )
{
int aCurrSect = getSectionId( theRow );
if ( aPntIndex < 0 )
return;
- SectionToPointList aSelPoints;
+ CurveCreator_ICurve::SectionToPointList aSelPoints;
startCurveModification( aSelPoints );
double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble();
*/
void CurveCreator_Widget::removePoint()
{
- SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
getSelectedPonts( 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::insertPointToSelectedSegment( const int theX,
const int theY )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return;
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ Handle(V3d_View) aView;
+ if ( aViewPort )
+ aView = aViewPort->getView();
+ if ( aContext.IsNull() || aView.IsNull() )
+ return;
gp_Pnt aPoint;
gp_Pnt aPoint1, aPoint2;
- bool isFoundPoint = false;
- Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
- for ( aContext->InitSelected(); aContext->MoreSelected() && !isFoundPoint;
- aContext->NextSelected() ) {
- TopoDS_Shape aTShape = aContext->SelectedShape();
- if ( !aTShape.IsNull() && aTShape.ShapeType() == TopAbs_VERTEX )
- continue;
- else {
- Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
- if ( anOwner.IsNull() )
- continue;
- const TopLoc_Location& aLocation = anOwner->Location();
- Handle(AIS_InteractiveObject) anAIS = Handle(AIS_InteractiveObject)::DownCast( anOwner->Selectable() );
- isFoundPoint = pointOnObject( anAIS, theX, theY, aPoint, aPoint1, aPoint2 );
- }
- }
+ bool isFoundPoint = CurveCreator_Utils::getNeighbourPoints( aContext, aView, 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;
void CurveCreator_Widget::moveSelectedPoints( const int theXPosition,
const int theYPosition )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ if ( !aViewPort )
return;
- SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
startCurveModification( aPoints, false );
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(),
- myDragStartPosition.y(),
- aWindow->getViewPort()->getView() );
+ myDragStartPosition.y(),
+ aViewPort->getView() );
gp_Pnt anEndPnt = CurveCreator_Utils::ConvertClickToPoint( theXPosition, theYPosition,
- aWindow->getViewPort()->getView() );
+ aViewPort->getView() );
double aXDelta = aStartPnt.X() - anEndPnt.X();
double anYDelta = aStartPnt.Y() - anEndPnt.Y();
CurveCreator_ICurve::SectionToPointCoordsList aCoordList;
std::deque<float> 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;
void CurveCreator_Widget::updateLocalPointView()
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ if ( myDragStarted )
+ return;
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if ( aContext.IsNull() )
return;
- Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
+
+ std::list<float> aSelectedList = CurveCreator_Utils::getSelectedPoints( aContext );
+
+ std::list<float>::const_iterator anIt = aSelectedList.begin(), aLast = aSelectedList.end();
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() );
- }
+ for ( ; anIt != aLast; anIt++ )
+ {
+ float aX = *anIt;
+ anIt++;
+ float anY = *anIt;
+ anIt++;
+ float aZ = *anIt;
+ addLocalPointToTable( aX, anY );
}
myLocalPointView->blockSignals(isBlocked);
}
*/
void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return;
- Handle(AIS_InteractiveContext) ic = aViewer->getAISContext();
-
- if ( theOpen ) {
- // Open local context if there is no one
- if ( !ic->HasOpenedContext() ) {
- ic->ClearCurrents( false );
- ic->OpenLocalContext( false/*use displayed objects*/, true/*allow shape decomposition*/ );
- }
- AIS_ListOfInteractive aList;
- ic->DisplayedObjects( aList );
- int aLSize = 0;
- for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() )
- aLSize++;
-
- for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() )
- {
- Handle(AIS_InteractiveObject) anAIS = it.Value();
- if ( !anAIS.IsNull() )
- {
- if ( anAIS->IsKind( STANDARD_TYPE( AIS_Shape ) ) )
- {
- ic->Load( anAIS, -1/*selection mode*/, true/*allow decomposition*/ );
- ic->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_WIRE ) );
- }
- else if ( anAIS->DynamicType() != STANDARD_TYPE(AIS_Trihedron) )
- {
- ic->Load( anAIS, -1/*selection mode*/, false/*allow decomposition*/ );
- ic->Activate( anAIS, TopAbs_VERTEX );
- }
- }
- continue;
- }
- }
- else {
- if ( ic->HasOpenedContext() )
- ic->CloseAllContexts();
- if ( isUpdateTable )
- updateLocalPointView();
- }
+ CurveCreator_Utils::setLocalPointContext( getAISContext(), theOpen );
+ if ( !theOpen && isUpdateTable )
+ updateLocalPointView();
}
void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY )
{
- SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
findSectionsToPoints( theX, theY, aPoints );
- SectionToPointList aSkipList;
+ CurveCreator_ICurve::SectionToPointList aSkipList;
// table could not contain two equal value rows
int aRowId = myLocalPointView->rowCount();
double aCurrentX, aCurrentY;
int aSectionId, aPointId;
- SectionToPoint aPoint;
+ 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();
return;
QTableWidgetItem* anItem;
- SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end();
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(),
+ aLast = aPoints.end();
for ( ; anIt != aLast; anIt++ ) {
aPoint = *anIt;
if ( contains( aSkipList, aPoint ) )
*/
void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
if ( theState ) {
getSelectedPonts( myDragPoints );
myDragStarted = myDragPoints.size();
myDragStartPosition = thePoint;
- if ( aViewer && myDragStarted ) {
+ if ( myDragStarted ) {
// change a viewer interaction style in order to avoid a select rectangle build
- myDragInteractionStyle = aViewer->interactionStyle();
- aViewer->setInteractionStyle(SUIT_ViewModel::KEY_FREE);
+ myDragInteractionStyle = changeInteractionStyle( SUIT_ViewModel::KEY_FREE );
}
}
else {
- if ( aViewer && myDragStarted )
- aViewer->setInteractionStyle( myDragInteractionStyle );
+ if ( myDragStarted )
+ changeInteractionStyle( myDragInteractionStyle );
myDragStarted = false;
myDragPoints.clear();
}
myDragged = false;
}
-void CurveCreator_Widget::getSelectedPonts( CurveCreator_Widget::SectionToPointList& thePoints )
+void CurveCreator_Widget::getSelectedPonts( 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 ) ) );
}
-void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionToPointList& thePoints )
+void CurveCreator_Widget::setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& thePoints )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ if ( myDragStarted )
+ return;
+ Handle(AIS_InteractiveContext) ic = getAISContext();
+ if ( ic.IsNull() || !ic->HasOpenedContext() )
return;
AIS_ListOfInteractive aListToSelect;
- Handle(AIS_InteractiveContext) ic = aViewer->getAISContext();
- if ( !ic->HasOpenedContext() )
- return;
-
AIS_ListOfInteractive aDisplayedList;
ic->DisplayedObjects( aDisplayedList );
- SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end();
- SectionToPoint aSToPoint;
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
+ aLast = thePoints.end();
+ CurveCreator_ICurve::SectionToPoint aSToPoint;
for( ; anIt != aLast; anIt++ ) {
aSToPoint = *anIt;
gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
- SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints );
- SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end();
- SectionToPoint aPoint;
+ 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 )
}
}
}
+ if ( thePoints.size() > 0 && aListToSelect.First() == aListToSelect.Last() ) {
+ /*TopExp_Explorer aExpF(myShape,TopAbs_FACE);
+ for (; aExpF.More(); aExpF.Next())
+ {
+ const TopoDS_Face& aFace = TopoDS::Face(aExpF.Current());
+ }*/
+ }
+
ic->ClearSelected( Standard_False );
- aViewer->setObjectsSelected( aListToSelect );
+ setObjectsSelected( aListToSelect );
updateLocalPointView();
}
* \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 ) {
* \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 );
*/
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<int, QList<int> >& theConvPoints )
{
- theConvPoints.clear();
-
- SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end();
- QList<int> 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;
- }
-}
-
-/**
- * Checks whether the point belongs to the OCC object
- * \param theObject a line or shape with a bspline inside
- * \param theX the X coordinate in the view.
- * \param theY the Y coordinate in the view.
- * \param thePoint the output point to be append to the model curve
- * \param thePoint1 the output point to bound the line where a new point should be inserted
- * \param thePoint2 the output point to bound the line where a new point should be inserted
- */
-bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject,
- const int theX, const int theY,
- gp_Pnt& thePoint,
- gp_Pnt& thePoint1, gp_Pnt& thePoint2 )
-{
- bool isFound = false;
-
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( theObject.IsNull() || !aViewer )
- return isFound;
-
- gp_Pnt aPoint;
- Standard_Real aParameter;
- gp_Pnt aPnt1, aPnt2;
- Handle(AIS_Line) aLine = Handle(AIS_Line)::DownCast( theObject );
- if ( !aLine.IsNull() ) {
- const Handle(Geom_Line) aGLine = aLine->Line();
- isFound = hasProjectPointOnCurve( theX, theY, aGLine, aParameter );
- if ( isFound ) {
- aPoint = aGLine->Value( aParameter );
-
- Handle(Geom_Point) aPStart;
- Handle(Geom_Point) aPEnd;
- aLine->Points( aPStart, aPEnd );
- aPnt1 = aPStart->Pnt();
- aPnt2 = aPEnd->Pnt();
-
- // in case of Geom line a projection is performed to the infinite line,
- // so it is necessary to bound it by the line size
- Bnd_Box aLineBox;
- aLineBox.Set( aPnt1, gp_Vec( aPnt1, aPnt2 ) );
- isFound = !aLineBox.IsOut( aPoint );
- }
- }
- else {
- Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast( theObject );
- if ( !aShape.IsNull() ) {
- const TopoDS_Wire& aWire = TopoDS::Wire( aShape->Shape() );
- if ( !aWire.IsNull() ) {
- TopExp_Explorer anExp( aWire, TopAbs_EDGE );
- for ( ; anExp.More(); anExp.Next())
- {
- const TopoDS_Edge& anEdge = TopoDS::Edge(anExp.Current());
- if ( !anEdge.IsNull() ) {
- Standard_Real aFirst, aLast;
- Handle(Geom_Curve) aCurve = BRep_Tool::Curve( anEdge, aFirst, aLast );
-
- if ( aCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) ) {
- Handle(Geom_BSplineCurve) aBSplineCurve = Handle(Geom_BSplineCurve)::DownCast( aCurve );
- if ( !aBSplineCurve.IsNull() ) {
- isFound = hasProjectPointOnCurve( theX, theY, aCurve, aParameter );
- if ( isFound ) {
- aPoint = aBSplineCurve->Value( aParameter );
- Standard_Integer anI1, anI2;
- aBSplineCurve->LocateU( aParameter, LOCAL_SELECTION_TOLERANCE, anI1, anI2 );
-
- aPnt1 = aBSplineCurve->Value( aBSplineCurve->Knot( anI1 ) );
- aPnt2 = aBSplineCurve->Value( aBSplineCurve->Knot( anI2 ) );
- }
- }
- }
- }
- }
- }
- }
- }
- if ( isFound ) {
- thePoint = aPoint;
- thePoint1 = aPnt1;
- thePoint2 = aPnt2;
- }
- return isFound;
-}
-
-/**
- * Returns whether the clicked point belong to the curve or has a very near projection
- * \param theX the X coordinate of a point clicked in the OCC viewer
- * \param theY the Y coordinate of a point clicked in the OCC viewer
- * \param theCurve a geometry curve
- * \param theOutPoint a found projected point on the curve
- */
-bool CurveCreator_Widget::hasProjectPointOnCurve( const int theX, const int theY,
- const Handle(Geom_Curve)& theCurve,
- Standard_Real& theParameter )
-{
- bool isFound = false;
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return isFound;
-
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
- Handle(V3d_View) aView = aWindow->getViewPort()->getView();
- gp_Pnt aPoint = CurveCreator_Utils::ConvertClickToPoint( theX, theY, aView );
-
- GeomAPI_ProjectPointOnCurve aProj( aPoint, theCurve );
- Standard_Integer aNbPoint = aProj.NbPoints();
- if (aNbPoint > 0) {
- for (Standard_Integer j = 1; j <= aNbPoint && !isFound; j++) {
- gp_Pnt aNewPoint = aProj.Point( j );
- theParameter = aProj.Parameter( j );
-
- int aX, anY;
- CurveCreator_Utils::ConvertPointToClick( aNewPoint, aView, aX, anY );
-
- int aXDelta = abs( aX - theX );
- int anYDelta = abs( anY - theY );
- isFound = aXDelta < SCENE_PIXEL_TOLERANCE && anYDelta < SCENE_PIXEL_TOLERANCE;
- }
- }
- return isFound;
+ return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints );
}
/**
* \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 );
}
