#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"
#include <OCCViewer_ViewPort3d.h>
#include "OCCViewer_Utilities.h"
-#include <BRep_Tool.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Edge.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Dir.hxx>
-#include <TopExp_Explorer.hxx>
-
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-
-#include <AIS_ListOfInteractive.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <AIS_Shape.hxx>
-#include <AIS_Point.hxx>
-#include <AIS_Line.hxx>
-#include <Geom_Point.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_Line.hxx>
-#include <StdSelect_BRepOwner.hxx>
-
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QLabel>
#include <QMouseEvent>
#include <QApplication>
#include <QTableWidget>
+#include <QTime>
+
+//#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;
CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
CurveCreator_ICurve *theCurve,
- Qt::WindowFlags fl)
+ const int theActionFlags,
+ 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 );
myNewSectionEditor->hide();
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() );
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()) );
QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) );
connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) );
aTB->addAction(anAct);
+
// TODO join
//aTB->addSeparator();
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
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<int> 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 )
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 )
//=================================================================================
-// 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;
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() );
if ( myCurve->getDimension() == 3 ) {
aCoords.push_back( aPnt.Z() );
}
- onAddNewPoint(aCoords);
-// myNewPointEditor->setCoordinates( aCoords );
+ addNewPoint(aCoords);
}
}
break;
}
case AdditionMode: {
- onGetCoordsByClick( theEvent );
+ addCoordsByClick( theEvent );
break;
}
default:
setDragStarted( false );
// if the drag of some points has happened, restore the drag selection
if ( aDraggedPoints.size() > 0 )
- setSelectedPonts( aDraggedPoints );
+ {
+ START_MEASURE_TIME;
+ setSelectedPoints( aDraggedPoints );
+ END_MEASURE_TIME( "drop" );
+ }
}
else // check whether the segment is clicked an a new point should be added to the segment
insertPointToSelectedSegment( theEvent->pos().x(), theEvent->pos().y() );
if ( (aPos - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() )
return;
+ START_MEASURE_TIME;
+
moveSelectedPoints( aPos.x(), aPos.y() );
myDragStartPosition = aPos;
+
+ END_MEASURE_TIME( "drag" );
}
/**
void CurveCreator_Widget::removePoint()
{
CurveCreator_ICurve::SectionToPointList aPoints;
- getSelectedPonts( aPoints );
+ getSelectedPoints( aPoints );
if ( aPoints.size() == 0 )
return;
finishCurveModification( CurveCreator_ICurve::SectionToPointList() );
}
+void CurveCreator_Widget::addNewPoint(const CurveCreator::Coordinates& theCoords)
+{
+ if( !myCurve )
+ return;
+ QList<int> 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 )
{
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;
finishCurveModification( aSelPoints );
- setSelectedPonts();
+ setSelectedPoints();
}
void CurveCreator_Widget::moveSelectedPoints( const int theXPosition,
if ( aContext.IsNull() )
return;
- std::list<float> aSelectedList = CurveCreator_Utils::getSelectedPoints( aContext );
+ CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints );
+ int aNbPoints = myLocalPoints.size();
+ bool isRowLimit = aNbPoints > myLocalPointRowLimit;
+ myLocalPointView->setVisible( getActionMode() == ModificationMode && !isRowLimit );
- std::list<float>::const_iterator anIt = aSelectedList.begin(), aLast = aSelectedList.end();
+ if ( !isRowLimit ) {
+ bool isBlocked = myLocalPointView->blockSignals(true);
+ myLocalPointView->setRowCount( 0 );
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myLocalPoints.begin(),
+ aLast = myLocalPoints.end();
+ for ( ; anIt != aLast; anIt++ )
+ myLocalPointView->addLocalPointToTable( *anIt );
- bool isBlocked = myLocalPointView->blockSignals(true);
- myLocalPointView->setRowCount( 0 );
- for ( ; anIt != aLast; anIt++ )
- {
- float aX = *anIt;
- anIt++;
- float anY = *anIt;
- anIt++;
- float aZ = *anIt;
- myLocalPointView->addLocalPointToTable( aX, anY );
+ myLocalPointView->blockSignals( isBlocked );
}
- myLocalPointView->blockSignals(isBlocked);
}
/**
*/
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::setDragStarted( const bool theState, const QPoint& thePoint )
{
if ( theState ) {
- getSelectedPonts( myDragPoints );
+ getSelectedPoints( myDragPoints );
myDragStarted = myDragPoints.size();
myDragStartPosition = thePoint;
if ( myDragStarted ) {
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( myLocalPointView->getSectionId( i ),
- myLocalPointView->getPointId( i ) ) );
+ 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::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;
+ CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints );
- AIS_ListOfInteractive aDisplayedList;
- ic->DisplayedObjects( aDisplayedList );
- ic->ClearSelected( Standard_False );
-
- CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
- aLast = thePoints.end();
- CurveCreator_ICurve::SectionToPoint aSToPoint;
- bool isSelectedVertex = false;
- 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() ) {
- 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->UpdateCurrentViewer();
- if ( !isSelectedVertex )
- setObjectsSelected( aListToSelect );
updateLocalPointView();
}
{
if ( theFillPoints ) {
thePoints.clear();
- getSelectedPonts( thePoints );
+ getSelectedPoints( thePoints );
}
setLocalPointContext( false );
}
{
if ( getActionMode() == ModificationMode )
setLocalPointContext( true );
- setSelectedPonts( thePoints );
+ setSelectedPoints( thePoints );
updateUndoRedo();
}
