//#include "CurveCreator_NewPointDlg.h"
#include "CurveCreator_NewSectionDlg.h"
#include "CurveCreator_Utils.h"
+#include "CurveCreator_UtilsICurve.hxx"
#include "CurveCreator_TableView.h"
#include <SUIT_Session.h>
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();
if ( myDragStarted ) {
bool isDragged = myDragged;
- CurveCreator_Widget::SectionToPointList aDraggedPoints;
+ CurveCreator_ICurve::SectionToPointList aDraggedPoints;
if ( myDragged )
aDraggedPoints = myDragPoints;
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,
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;
if ( !aViewPort )
return;
- SectionToPointList aPoints;
+ CurveCreator_ICurve::SectionToPointList aPoints;
startCurveModification( aPoints, false );
gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(),
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::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 ) )
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 )
+
+bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex,
+ const CurveCreator_ICurve::SectionToPoint& theSToPoint )
+{
+ bool isIntersect = false;
+
+ if ( theVertex.IsNull() )
+ return isIntersect;
+
+ gp_Pnt aPnt = BRep_Tool::Pnt( theVertex );
+
+ 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 && !isIntersect; anIt++ ) {
+ aPoint = *anIt;
+ isIntersect = aPoint.first == theSToPoint.first && aPoint.second == theSToPoint.second;
+ }
+
+ return isIntersect;
+}
+
+
+void CurveCreator_Widget::setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& thePoints )
{
if ( myDragStarted )
return;
return;
AIS_ListOfInteractive aListToSelect;
+
AIS_ListOfInteractive aDisplayedList;
ic->DisplayedObjects( aDisplayedList );
+ ic->ClearSelected( Standard_False );
- 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;
+ bool isSelectedVertex = false;
for( ; anIt != aLast; anIt++ ) {
aSToPoint = *anIt;
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 );
-
- 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 )
+ if ( !anAISPoint.IsNull() ) {
+ TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() );
+ if ( isIntersectVertexToPoint( aVertex, aSToPoint ) )
aListToSelect.Append( anAIS );
}
+ else {
+ Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( anAIS );
+ if ( anAISShape.IsNull() )
+ continue;
+ 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() );
+ if ( isIntersectVertexToPoint( aVertex, aSToPoint ) ) {
+ ic->AddOrRemoveSelected( aVertex, Standard_False );
+ isSelectedVertex = true;
+ }
+ }
+ }
}
}
-
- ic->ClearSelected( Standard_False );
- setObjectsSelected( aListToSelect );
+ ic->UpdateCurrentViewer();
+ if ( !isSelectedVertex )
+ 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;
- }
+ 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 );
}
