//#include "CurveCreator_NewPointDlg.h"
#include "CurveCreator_NewSectionDlg.h"
#include "CurveCreator_Utils.h"
-
-#include <GEOMUtils.hxx>
+#include "CurveCreator_UtilsICurve.hxx"
+#include "CurveCreator_TableView.h"
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewManager.h>
#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_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 <QTableWidget>
const double LOCAL_SELECTION_TOLERANCE = 0.0001;
-const int POINT_INDEX_COLUMN_WIDTH = 50;
+const int SECTION_NAME_COLUMN_WIDTH = 75;
+const int POINT_INDEX_COLUMN_WIDTH = 40;
+
+const int SCENE_PIXEL_TOLERANCE = 10;
CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
CurveCreator_ICurve *theCurve,
Qt::WindowFlags fl)
-: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0), myDragStarted( false ),
+: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0),
+ myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ),
myOCCViewer( 0 )
{
myNewSectionEditor = new CurveCreator_NewSectionDlg( this );
connect( mySectionView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onContextMenu(QPoint)) );
myLocalPointView = new QTableWidget();
+ myLocalPointView->setItemDelegate( new CurveCreator_TableItemDelegate( myLocalPointView ) );
myLocalPointView->setVisible( false );
- myLocalPointView->setColumnCount( 3 );
- myLocalPointView->setColumnWidth( 0, POINT_INDEX_COLUMN_WIDTH );
+ myLocalPointView->setColumnCount( 4 );
+ myLocalPointView->setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH );
+ myLocalPointView->setColumnWidth( 1, POINT_INDEX_COLUMN_WIDTH );
QStringList aLabels;
- //aLabels << tr( "IDENTIFIER_LABEL" ) << tr( "X_POSITION_LBL" ) << tr( "Y_POSITION_LBL" );
- aLabels << tr( "id" ) << tr( "X" ) << tr( "Y" );
+ //aLabels << tr( "SECTION_LABEL" ) << tr( "IDENTIFIER_LABEL" ) << tr( "X_POSITION_LBL" ) << tr( "Y_POSITION_LBL" );
+ aLabels << tr( "Section" ) << "Index" << tr( "X" ) << tr( "Y" );
myLocalPointView->setHorizontalHeaderLabels( aLabels );
connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ),
- this, SLOT( onLocalPointChanged( int, int ) ) );
+ this, SLOT( onCellChanged( int, int ) ) );
QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup);
// QToolButton* anUndoBtn = new QToolButton(aTB);
QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) );
connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) );
aTB->addAction(anAct);
- aTB->addSeparator();
+ // TODO join
+ //aTB->addSeparator();
- anAct = createAction( JOIN_ID, tr("JOIN"), aJoinPixmap, tr("JOIN_TLT"),
- QKeySequence(Qt::ControlModifier|Qt::Key_Plus ) );
- connect( anAct, SIGNAL(triggered()), this, SLOT(onJoin()) );
- aTB->addAction(anAct);
- aTB->addSeparator();
+ //anAct = createAction( JOIN_ID, tr("JOIN"), aJoinPixmap, tr("JOIN_TLT"),
+ // QKeySequence(Qt::ControlModifier|Qt::Key_Plus ) );
+ //connect( anAct, SIGNAL(triggered()), this, SLOT(onJoin()) );
+ //aTB->addAction(anAct);
anAct = createAction( CLEAR_ALL_ID, tr("CLEAR_ALL"), QPixmap(), tr("CLEAR_ALL_TLT"),
QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Delete ) );
connect( anAct, SIGNAL(triggered()), this, SLOT( onClearAll()) );
- anAct = createAction( JOIN_ALL_ID, tr("JOIN_ALL"), QPixmap(), tr("JOIN_ALL_TLT"),
- QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Plus ) );
- connect( anAct, SIGNAL(triggered()), this, SLOT(onJoinAll()) );
+ // TODO join
+ //anAct = createAction( JOIN_ALL_ID, tr("JOIN_ALL"), QPixmap(), tr("JOIN_ALL_TLT"),
+ // QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Plus ) );
+ //connect( anAct, SIGNAL(triggered()), this, SLOT(onJoinAll()) );
QVBoxLayout* aSectLayout = new QVBoxLayout();
aSectLayout->setMargin( 5 );
*/
void CurveCreator_Widget::setOCCViewer( OCCViewer_Viewer* theViewer )
{
+ if ( myOCCViewer == theViewer )
+ return;
+
if ( myOCCViewer ) {
OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
( myOCCViewer->getViewManager() );
this, SLOT( onMouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ) );
disconnect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ disconnect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+ this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+ // restore normal mode in the viewer
+ OCCViewer_Utilities::setViewer2DMode( myOCCViewer, OCCViewer_ViewWindow::No2dMode );
+ // all local contexts should be closed if the viewer is not more used
+ setLocalPointContext( false, true );
}
myOCCViewer = theViewer;
if ( myOCCViewer ) {
- //OCCViewer_ViewWindow* aWnd = dynamic_cast<OCCViewer_ViewWindow*>(myOCCViewer->getViewManager()->getActiveView());
- //if ( aWnd )
- // aWnd->installEventFilter( this );
OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
( myOCCViewer->getViewManager() );
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
this, SLOT( onMouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ) );
connect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ connect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+ this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+ OCCViewer_Utilities::setViewer2DMode( myOCCViewer, OCCViewer_ViewWindow::XYPlane );
}
}
return myOCCViewer;
}
-/*!
- \brief Customize event handling
- \param watched event receiver object
- \param e event
- \return \c true if the event processing should be stopped
-*/
-/*bool CurveCreator_Widget::eventFilter( QObject* theWatched, QEvent* theEvent )
+/**
+ * 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;
- Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
- bool isLocalContext = aContext->HasOpenedContext();
- if ( !isLocalContext )
- return QWidget::eventFilter( theWatched, theEvent );
+ return -1;
- bool isProcessed = true;
+ int aPrevStyle = aViewer->interactionStyle();
+ aViewer->setInteractionStyle( theStyle );
- return isProcessed;
-}*/
+ 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
{
QList<ActionId> anEnabledAct;
if( myCurve ){
- anEnabledAct << NEW_SECTION_ID;
+ anEnabledAct << NEW_SECTION_ID << MODIFICATION_MODE_ID;
+ if ( removeEnabled() )
+ anEnabledAct << REMOVE_ID;
QList<int> aSelSections = mySectionView->getSelectedSections();
QList< QPair< int, int > > aSelPoints = mySectionView->getSelectedPoints();
CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType();
anEnabledAct << UP_ID;
}*/
if( aSelSections.size() == 1 ){
- anEnabledAct << ADDITION_MODE_ID << MODIFICATION_MODE_ID << DETECTION_MODE_ID;
- anEnabledAct << REMOVE_ID;
+ anEnabledAct << ADDITION_MODE_ID << DETECTION_MODE_ID;
}
switch ( getActionMode() ) {
case AdditionMode: {
int aSectCnt = myCurve->getNbSections();
if( aSectCnt > 0 )
anEnabledAct << CLEAR_ALL_ID;
- if( aSectCnt > 1 )
- anEnabledAct << JOIN_ALL_ID;
- if( aSelSections.size() > 1 ){
- anEnabledAct << JOIN_ID;
- }
+ // TODO
+ //if( aSectCnt > 1 )
+ // anEnabledAct << JOIN_ALL_ID;
+ //if( aSelSections.size() > 1 ){
+ // anEnabledAct << JOIN_ID;
+ //}
}
break;
case DetectionMode: {
if( (myCurve->getNbSections() + myCurve->getNbPoints()) > 0 ){
anEnabledAct << REMOVE_ALL_ID;
}*/
- if( myCurve->getNbSections() > 1 ){
- anEnabledAct << JOIN_ALL_ID;
- }
+ // TODO
+ //if( myCurve->getNbSections() > 1 ){
+ // anEnabledAct << JOIN_ALL_ID;
+ //}
}
QList<ActionId> anIds = myActionMap.keys();
for( int i = 0 ; i < anIds.size() ; i++ ){
}
}
}
+ updateUndoRedo();
emit selectionChanged();
}
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;
void CurveCreator_Widget::onModificationMode(bool checked)
{
myLocalPointView->setVisible( checked );
- setLocalPointContext( true );
}
void CurveCreator_Widget::onDetectionMode(bool checked)
void CurveCreator_Widget::onModeChanged(bool checked)
{
- setLocalPointContext( false );
+ ActionMode aMode = NoneMode;
if (checked) {
QAction* anAction = (QAction*)sender();
switch(myActionMap.key(anAction)) {
case ADDITION_MODE_ID:
+ aMode = AdditionMode;
if (myActionMap[MODIFICATION_MODE_ID]->isChecked())
myActionMap[MODIFICATION_MODE_ID]->trigger();
else if (myActionMap[DETECTION_MODE_ID]->isChecked())
myActionMap[DETECTION_MODE_ID]->trigger();
break;
case MODIFICATION_MODE_ID:
+ aMode = ModificationMode;
if (myActionMap[ADDITION_MODE_ID]->isChecked())
myActionMap[ADDITION_MODE_ID]->trigger();
else if (myActionMap[DETECTION_MODE_ID]->isChecked())
myActionMap[DETECTION_MODE_ID]->trigger();
break;
case DETECTION_MODE_ID:
+ aMode = DetectionMode;
if (myActionMap[ADDITION_MODE_ID]->isChecked())
myActionMap[ADDITION_MODE_ID]->trigger();
else if (myActionMap[MODIFICATION_MODE_ID]->isChecked())
}
}
onSelectionChanged();
+ 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++;
+ //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 ) );
onSelectionChanged();
updateUndoRedo();
}
bool isClosed = myNewSectionEditor->isClosed();
CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType();
// myCurve->startOperation();
- myCurve->setClosed( isClosed, mySection );
- myCurve->setSectionName( mySection , aName.toStdString() );
- myCurve->setSectionType( mySection, aSectType );
+ if( myCurve->getSectionName(mySection) != aName.toStdString() )
+ myCurve->setSectionName( mySection , aName.toStdString() );
+
+ if( myCurve->getSectionType(mySection) != aSectType )
+ myCurve->setSectionType( mySection, aSectType );
+
+ if( myCurve->isClosed(mySection) != isClosed )
+ myCurve->setClosed( mySection, isClosed );
// myCurve->finishOperation();
mySectionView->sectionChanged(mySection);
updateUndoRedo();
// myCurve->startOperation();
QList<int> aSelSections = mySectionView->getSelectedSections();
for( int i = 0 ; i < aSelSections.size() ; i++ ){
- myCurve->setClosed(true, aSelSections[i]);
+ myCurve->setClosed(aSelSections[i], true);
mySectionView->sectionChanged(aSelSections[i]);
}
// myCurve->finishOperation();
// myCurve->startOperation();
QList<int> aSelSections = mySectionView->getSelectedSections();
for( int i = 0 ; i < aSelSections.size() ; i++ ){
- myCurve->setClosed(false, aSelSections[i]);
+ myCurve->setClosed(aSelSections[i], false);
mySectionView->sectionChanged(aSelSections[i]);
}
// myCurve->finishOperation();
{
if( !myCurve )
return;
+
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->undo();
+ finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::onRedo()
{
if( !myCurve )
return;
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->redo();
+ finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::updateUndoRedo()
{
- QAction* anAct = myActionMap[UNDO_ID];
- if( anAct != 0 ){
- if( myCurve->getNbUndo() != 0 ){
- anAct->setEnabled(true);
- }
- else{
- anAct->setDisabled(true);
- }
+ if( !myCurve )
+ return;
+ QAction* anAct = myActionMap[UNDO_ID];
+ if( anAct != 0 ){
+ if( myCurve->getNbUndo() != 0 ){
+ anAct->setEnabled(true);
}
- anAct = myActionMap[REDO_ID];
- if( anAct != 0 ){
- if( myCurve->getNbRedo() != 0 ){
- anAct->setEnabled(true);
- }
- else{
- anAct->setDisabled(true);
- }
+ else{
+ anAct->setDisabled(true);
+ }
+ }
+ anAct = myActionMap[REDO_ID];
+ if( anAct != 0 ){
+ if( myCurve->getNbRedo() != 0 ){
+ anAct->setEnabled(true);
}
+ else{
+ anAct->setDisabled(true);
+ }
+ }
}
void CurveCreator_Widget::onContextMenu( QPoint thePoint )
return mySectionView->getSelectedPoints();
}
+/**
+ * According to the widget state, performs the remove action
+ */
+void CurveCreator_Widget::removeSelected()
+{
+ onRemove();
+}
+
+/**
+ * Checks whether there are some selection to be removed
+ */
+bool CurveCreator_Widget::removeEnabled()
+{
+ bool isEnabled = getActionMode() == ModificationMode;
+ if ( !isEnabled ) {
+ QList<int> aSelSections = mySectionView->getSelectedSections();
+ CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType();
+ isEnabled = aSelType == CurveCreator_TreeView::ST_SECTIONS &&
+ aSelSections.size() == 1;
+ }
+ return isEnabled;
+}
+
+
//=================================================================================
// function : GeometryGUI::onGetCoordsByClick()
// purpose : Manage mouse press events in Additon mode
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();
- aPnt = GEOMUtils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
+ OCCViewer_ViewPort3d* vp = getViewPort();
+ aPnt = CurveCreator_Utils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
}
// set the coordinates into dialog
CurveCreator::Coordinates aCoords;
}
}
-//=================================================================================
-// function : CurveCreator_Widget::onMousePress()
-// purpose : Manage mouse press events in Modification mode
-//=================================================================================
+/**
+ * Manage mouse press events
+ * \param theWindow an owner of the signal
+ * \param theEvent a mouse event
+ */
void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent )
{
if ( theEvent->button() != Qt::LeftButton )
}
}
-//=================================================================================
-// function : HYDROGUI_PolylineOp::onMouseRelease()
-// purpose : Manage mouse press events in Modification mode
-//=================================================================================
+/**
+ * Manage mouse release events in Modification mode
+ * \param theWindow an owner of the signal
+ * \param theEvent a mouse event
+ */
void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEvent )
{
- if ( getActionMode() != ModificationMode || !myDragStarted )
+ if ( getActionMode() != ModificationMode )
return;
- setDragStarted( false );
- //store initial cursor position for Drag&Drop
- //QPoint aPos = theEvent->pos();
- //if (pe->button() == Qt::LeftButton)
- // myDragStartPosition = pe->pos();
-
- QPoint aPos = theEvent->pos();
- // check whether the segment is clicked an a new point should be added to the segment
- if ( insertPointToSelectedSegment( aPos.x(), aPos.y() ) ) {
- setSelectedPonts( 0 );
- updateUndoRedo();
+ if ( myDragStarted ) {
+ 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() );
// updates the input panel table to show the selected point coordinates
updateLocalPointView();
}
-//=================================================================================
-// function : GeometryGUI::onMouseMove()
-// purpose : Manage mouse move events in Modification mode
-//=================================================================================
+/**
+ * Manage mouse move events in Modification mode
+ * \param theWindow an owner of the signal
+ * \param theEvent a mouse event
+ */
void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent )
{
if ( getActionMode() != ModificationMode || !myDragStarted )
return;
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return;
-
- //if ( !(pe->buttons() & Qt::LeftButton) )
- // return;
QPoint aPos = theEvent->pos();
if ( (aPos - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() )
return;
- //setLocalPointContext( false );
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
- gp_Pnt aStartPnt = GEOMUtils::ConvertClickToPoint( myDragStartPosition.x(), myDragStartPosition.y(),
- aWindow->getViewPort()->getView() );
- gp_Pnt anEndPnt = GEOMUtils::ConvertClickToPoint( aPos.x(), aPos.y(),
- aWindow->getViewPort()->getView() );
- double aXDelta = aStartPnt.X() - anEndPnt.X();
- double anYDelta = aStartPnt.Y() - anEndPnt.Y();
+ moveSelectedPoints( aPos.x(), aPos.y() );
+ myDragStartPosition = aPos;
+}
- int aSectionId = 0;
- int aPointId;
- std::deque<float> aChangedPos;
- for ( int i = 0, aNb = myDragPoints.size(); i < aNb; i++ ) {
- aPointId = myDragPoints[i];
- aChangedPos = myCurve->getPoint( aSectionId, aPointId );
- if ( aChangedPos.size() < 2 )
- continue;
- aChangedPos[0] = aChangedPos[0] - aXDelta;
- aChangedPos[1] = aChangedPos[1] - anYDelta;
- myCurve->setPoint( aSectionId, aPointId, aChangedPos );
- }
+/**
+ * Set zero viewer by the last view closed in
+ * \param theManager a viewer manager
+ */
+void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* theManager )
+{
+ myOCCViewer = 0;
+}
- //setLocalPointContext( true );
- setSelectedPonts( aSectionId, myDragPoints );
+void CurveCreator_Widget::onMousePress( QMouseEvent* theEvent )
+{
+ onMousePress( 0, theEvent );
+}
- myDragStartPosition = aPos;
- /*
- QDrag *drag = new QDrag(this);
- QMimeData *mimeData = new QMimeData;
-
- mimeData->setData(mimeType, data);
- drag->setMimeData(mimeData);
-
- Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction);
- */
+void CurveCreator_Widget::onMouseRelease( QMouseEvent* theEvent )
+{
+ onMouseRelease( 0, theEvent );
}
-void CurveCreator_Widget::onLocalPointChanged( int theRow, int theColumn )
+void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent )
{
- QList<int> aSelSections = mySectionView->getSelectedSections();
- if ( aSelSections.size() < 0 )
- return;
+ onMouseMove( 0, theEvent );
+}
- int aSection = aSelSections[0];
+void CurveCreator_Widget::onCellChanged( int theRow, int theColumn )
+{
+ int aCurrSect = getSectionId( theRow );
+ int aPntIndex = getPointId( theRow );
- QList<int> aSelPoints;
- getSelectedPonts( aSection, aSelPoints );
- setLocalPointContext( false );
+ if ( aPntIndex < 0 )
+ return;
- int aPntIndex = -1;
- int aCurrSect=-1;
+ CurveCreator_ICurve::SectionToPointList aSelPoints;
+ startCurveModification( aSelPoints );
+
+ double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble();
+ double anY = myLocalPointView->item( theRow, 3 )->data( Qt::UserRole ).toDouble();
std::deque<float> aChangedPos;
- float aPrevX, aPrevY, aX, anY;
- //for( int i = 0 ; i < aSelSections.size() ; i++ ){
- aCurrSect = aSection;//aSelSections[i];
-
- aPrevX = myLocalPointView->item( theRow, 1 )->data( Qt::UserRole ).toDouble();
- aPrevY = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble();
-
- aPntIndex = findLocalPointIndex( aCurrSect, aPrevX, aPrevY );
- if ( aPntIndex >= 0 ) {
- aX = myLocalPointView->item( theRow, 1 )->text().toDouble();
- anY = myLocalPointView->item( theRow, 2 )->text().toDouble();
- aChangedPos.clear();
- aChangedPos.push_back( aX );
- aChangedPos.push_back( anY );
- myCurve->setPoint( aCurrSect, aPntIndex, aChangedPos );
- }
- //}
- setLocalPointContext( true );
- setSelectedPonts( aSection, aSelPoints );
+ aChangedPos.push_back( aX );
+ aChangedPos.push_back( anY );
+ myCurve->setPoint( aCurrSect, aPntIndex, aChangedPos );
+
+ finishCurveModification( aSelPoints );
}
/**
*/
void CurveCreator_Widget::removePoint()
{
- int aSectionId = 0;
- QList<int> aPoints;
- qSort( aPoints );
- getSelectedPonts( aSectionId, aPoints );
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ getSelectedPonts( aPoints );
+ if ( aPoints.size() == 0 )
+ return;
- int aCurrSect=-1;
- int aRemoveCnt = 0;
+ CurveCreator_ICurve::SectionToPointList aSelPoints;
+ startCurveModification( aSelPoints, false );
- for( int i = aPoints.size()-1; i >= 0; i-- ){
- int aPntIndx = aPoints[i];
- myCurve->removePoint( aSectionId, aPntIndx );
- mySectionView->pointsRemoved( aSectionId, aPntIndx );
- }
+ myCurve->removeSeveralPoints( aPoints );
+ finishCurveModification( CurveCreator_ICurve::SectionToPointList() );
}
-bool CurveCreator_Widget::insertPointToSelectedSegment( const int theX,
+void CurveCreator_Widget::insertPointToSelectedSegment( const int theX,
const int theY )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return false;
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
- int aPoint1 = -1, aPoint2 = -1;
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ Handle(V3d_View) aView;
+ if ( aViewPort )
+ aView = aViewPort->getView();
+ if ( aContext.IsNull() || aView.IsNull() )
+ return;
gp_Pnt aPoint;
- 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 );
+ gp_Pnt aPoint1, aPoint2;
+ bool isFoundPoint = CurveCreator_Utils::getNeighbourPoints( aContext, aView, theX, theY,
+ aPoint, aPoint1, aPoint2 );
+ if ( !isFoundPoint )
+ return;
+
+ // insert the point to the model curve
+ CurveCreator_ICurve::SectionToPointList aSelPoints;
+ startCurveModification( aSelPoints );
+
+ CurveCreator::Coordinates aCoords;
+ aCoords.push_back( aPoint.X() );
+ aCoords.push_back( aPoint.Y() );
+
+ CurveCreator_ICurve::SectionToPointList aPoints1, aPoints2;
+ findSectionsToPoints( aPoint1.X(), aPoint1.Y(), aPoints1 );
+ findSectionsToPoints( aPoint2.X(), aPoint2.Y(), aPoints2 );
+ 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;
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt2 = aPoints2.begin(),
+ aLast2 = aPoints2.end();
+ for ( ; anIt2 != aLast2 && aSectionId < 0; anIt2++ ) {
+ if ( anIt2->first == aSectionCur ) {
+ aSectionId = aSectionCur;
+ aPoint1Id = anIt->second;
+ aPoint2Id = anIt2->second;
+ }
}
}
- // insert the point to the model curve
- bool isDone = false;
- if ( isFoundPoint && aPoint1 >= 0 && aPoint2 >= 0 ) {
- int aSection = 0;
- CurveCreator::Coordinates aCoords;
- aCoords.push_back( aPoint.X() );
- aCoords.push_back( aPoint.Y() );
- int anInsertPos = aPoint1 < aPoint2 ? aPoint1 + 1 : aPoint2 + 1;
- myCurve->addPoints( aCoords, aSection, anInsertPos );
- mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) );
+ int anInsertPos = -1;
+ int aLastPoint = myCurve->getNbPoints( aSectionId )-1;
+ if ( ( aPoint1Id == aLastPoint && aPoint2Id == 0 ) ||
+ ( aPoint2Id == aLastPoint && aPoint1Id == 0 ) )
+ anInsertPos = -1; // if the section happens between first and last points
+ else
+ anInsertPos = aPoint1Id < aPoint2Id ? aPoint1Id + 1 : aPoint2Id + 1;
+
+ myCurve->addPoints( aCoords, aSectionId, anInsertPos );
+ mySectionView->pointsAdded( aSectionId, myCurve->getNbPoints( aSectionId ) );
+
+ finishCurveModification( aSelPoints );
- isDone = true;
+ setSelectedPonts();
+}
+
+void CurveCreator_Widget::moveSelectedPoints( const int theXPosition,
+ const int theYPosition )
+{
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ if ( !aViewPort )
+ return;
+
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
+
+ gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(),
+ myDragStartPosition.y(),
+ aViewPort->getView() );
+ gp_Pnt anEndPnt = CurveCreator_Utils::ConvertClickToPoint( theXPosition, theYPosition,
+ aViewPort->getView() );
+ double aXDelta = aStartPnt.X() - anEndPnt.X();
+ double anYDelta = aStartPnt.Y() - anEndPnt.Y();
+
+ CurveCreator_ICurve::SectionToPointCoordsList aCoordList;
+ std::deque<float> aChangedPos;
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = myDragPoints.begin(),
+ aLast = myDragPoints.end();
+ for ( ; anIt != aLast; anIt++ ) {
+ int aSectionId = anIt->first;
+ int aPointId = anIt->second;
+ aChangedPos = myCurve->getPoint( aSectionId, aPointId );
+ if ( aChangedPos.size() < 2 )
+ continue;
+ aChangedPos[0] = aChangedPos[0] - aXDelta;
+ aChangedPos[1] = aChangedPos[1] - anYDelta;
+
+ aCoordList.push_back(
+ std::make_pair(std::make_pair( aSectionId, aPointId ),
+ aChangedPos ));
}
- return isDone;
+ myCurve->setSeveralPoints( aCoordList );
+
+ myDragged = true;
+ finishCurveModification( myDragPoints );
}
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 )
+/**
+ *
+ */
+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
- bool allObjects = true;
- if ( !ic->HasOpenedContext() ) {
- ic->ClearCurrents( false );
- ic->OpenLocalContext( allObjects, true, true );
- }
- AIS_ListOfInteractive aList;
- ic->DisplayedObjects( aList );
- int aLSize = 0;
- for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() )
- aLSize++;
-
- int theMode = TopAbs_VERTEX;
- 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, false );
- ic->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)theMode ) );
- }
- else if ( anAIS->DynamicType() != STANDARD_TYPE(AIS_Trihedron) )
- {
- ic->Load( anAIS, -1, false );
- ic->Activate( anAIS, theMode );
- }
- }
- continue;
- }
- }
- else {
- ic->CloseAllContexts();
- }
+ CurveCreator_Utils::setLocalPointContext( getAISContext(), theOpen );
+ if ( !theOpen && isUpdateTable )
+ updateLocalPointView();
}
void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY )
{
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ findSectionsToPoints( theX, theY, aPoints );
+
+ CurveCreator_ICurve::SectionToPointList aSkipList;
+ // table could not contain two equal value rows
int aRowId = myLocalPointView->rowCount();
double aCurrentX, aCurrentY;
+ int aSectionId, aPointId;
+ CurveCreator_ICurve::SectionToPoint aPoint;
for ( int i = 0; i < aRowId; i++ ) {
- aCurrentX = myLocalPointView->item( i, 1 )->data( Qt::UserRole ).toDouble();
- aCurrentY = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble();
+ aCurrentX = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble();
+ aCurrentY = myLocalPointView->item( i, 3 )->data( Qt::UserRole ).toDouble();
if ( fabs( aCurrentX - theX ) < LOCAL_SELECTION_TOLERANCE &&
- fabs( aCurrentY - theY ) < LOCAL_SELECTION_TOLERANCE )
- return;
+ fabs( aCurrentY - theY ) < LOCAL_SELECTION_TOLERANCE ) {
+ aPoint = std::make_pair<int, int>( getSectionId( i ), getPointId( i ) );
+ if ( !contains( aSkipList, aPoint ) )
+ aSkipList.push_back( aPoint );
+ }
}
+ if ( aSkipList.size() == aPoints.size() )
+ return;
+
QTableWidgetItem* anItem;
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(),
+ aLast = aPoints.end();
+ for ( ; anIt != aLast; anIt++ ) {
+ aPoint = *anIt;
+ if ( contains( aSkipList, aPoint ) )
+ continue;
- myLocalPointView->setRowCount( aRowId+1 );
+ myLocalPointView->setRowCount( aRowId+1 );
+ aSectionId = aPoint.first;
+ aPointId = aPoint.second;
- int aPointSection = 0;
- int aPointIndex = findLocalPointIndex( aPointSection, theX, theY );
+ anItem = new QTableWidgetItem( myCurve->getSectionName( aSectionId ).c_str() );
+ anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled );
+ anItem->setData( Qt::UserRole, aSectionId );
+ myLocalPointView->setItem( aRowId, 0, anItem );
- anItem = new QTableWidgetItem( QString::number( aPointIndex + 1 ) );
- anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled );
- myLocalPointView->setItem( aRowId, 0, anItem );
+ anItem = new QTableWidgetItem( QString::number( aPointId + 1 ) );
+ anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled );
+ anItem->setData( Qt::UserRole, aPointId );
+ myLocalPointView->setItem( aRowId, 1, anItem );
- anItem = new QTableWidgetItem( QString::number( theX ) );
- anItem->setData( Qt::UserRole, theX );
- myLocalPointView->setItem( aRowId, 1, anItem );
+ anItem = new QTableWidgetItem( QString::number( theX ) );
+ anItem->setData( Qt::UserRole, theX );
+ myLocalPointView->setItem( aRowId, 2, anItem );
- anItem = new QTableWidgetItem( QString::number( theY ) );
- anItem->setData( Qt::UserRole, theY );
- myLocalPointView->setItem( aRowId, 2, anItem );
+ anItem = new QTableWidgetItem( QString::number( theY ) );
+ anItem->setData( Qt::UserRole, theY );
+ myLocalPointView->setItem( aRowId, 3, anItem );
+ }
}
/**
*/
void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint )
{
- myDragStarted = theState;
- if ( myDragStarted ) {
+ if ( theState ) {
+ getSelectedPonts( myDragPoints );
+ myDragStarted = myDragPoints.size();
myDragStartPosition = thePoint;
- getSelectedPonts( 0, myDragPoints );
+ if ( myDragStarted ) {
+ // change a viewer interaction style in order to avoid a select rectangle build
+ myDragInteractionStyle = changeInteractionStyle( SUIT_ViewModel::KEY_FREE );
+ }
}
+ else {
+ if ( myDragStarted )
+ changeInteractionStyle( myDragInteractionStyle );
+ myDragStarted = false;
+ myDragPoints.clear();
+ }
+ myDragged = false;
}
-void CurveCreator_Widget::getSelectedPonts( int theSectionId, QList<int>& thePoints )
+void CurveCreator_Widget::getSelectedPonts( CurveCreator_ICurve::SectionToPointList& thePoints )
{
thePoints.clear();
-
- float aPrevX, aPrevY;
- int aPntIndex;
- for ( int i = 0, aNb = myLocalPointView->rowCount(); i < aNb; i++ ) {
- aPrevX = myLocalPointView->item( i, 1 )->data( Qt::UserRole ).toDouble();
- aPrevY = myLocalPointView->item( i, 2 )->data( Qt::UserRole ).toDouble();
-
- aPntIndex = findLocalPointIndex( theSectionId, aPrevX, aPrevY );
- if ( aPntIndex >= 0 )
- thePoints.append( aPntIndex );
- }
+ 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 int theSectionId, const QList<int>& 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 );
- for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() )
- {
- Handle(AIS_InteractiveObject) anAIS = it.Value();
- if ( anAIS.IsNull() )
- continue;
- Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast( anAIS );
- if ( aPoint.IsNull() )
- continue;
- TopoDS_Vertex aVertex = TopoDS::Vertex( aPoint->Vertex() );
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
+ aLast = thePoints.end();
+ CurveCreator_ICurve::SectionToPoint aSToPoint;
+ for( ; anIt != aLast; anIt++ ) {
+ aSToPoint = *anIt;
- if ( aVertex.IsNull() )
- continue;
+ 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() )
+ continue;
+
+ TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() );
+
+ if ( aVertex.IsNull() )
+ continue;
+
+ gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
- gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
- int aPointIndex = findLocalPointIndex( theSectionId, aPnt.X(), aPnt.Y() );
- if ( thePoints.contains( aPointIndex ) )
- aListToSelect.Append( anAIS );
+ 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; anIt++ ) {
+ aPoint = *anIt;
+ if ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second )
+ aListToSelect.Append( anAIS );
+ }
+ }
+ }
+ 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());
+ }*/
}
- aViewer->setObjectsSelected( aListToSelect );
+
+ ic->ClearSelected( Standard_False );
+ setObjectsSelected( aListToSelect );
updateLocalPointView();
}
+/**
+ * Get viewer information before perform the curve modification.
+ * Take a list of selected cuve points an close local context.
+ * The context should be closed because the curve presentation is
+ * redisplayed and if it is not closed, when we close the local context
+ * later, the presentation shown in the local context is disappeared.
+ * \param thePoints an output list of curve selected points
+ * \param theFillPoints a flag whether the selection list should be filled
+ */
+void CurveCreator_Widget::startCurveModification(
+ CurveCreator_ICurve::SectionToPointList& thePoints,
+ const bool theFillPoints )
+{
+ if ( theFillPoints ) {
+ thePoints.clear();
+ getSelectedPonts( thePoints );
+ }
+ setLocalPointContext( false );
+}
+
+/**
+ * Restore the viewer state after the curve modification is done.
+ * Open local context and select given points inside it.
+ * \param thePoints a list of curve selected points
+ */
+void CurveCreator_Widget::finishCurveModification(
+ const CurveCreator_ICurve::SectionToPointList& thePoints )
+{
+ if ( getActionMode() == ModificationMode )
+ setLocalPointContext( true );
+ setSelectedPonts( thePoints );
+ updateUndoRedo();
+}
+
/**
* Returns a point index in the model curve by the point coordinates in the viewer
* \param theX the X coordinate of the point
*/
int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY )
{
- int aPntIndex = -1;
+ return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY );
+}
- 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;
- }
+void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY,
+ CurveCreator_ICurve::SectionToPointList& thePoints )
+{
+ return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints );
+}
- return aPntIndex;
+void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints,
+ QMap<int, QList<int> >& theConvPoints )
+{
+ return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints );
}
/**
- * 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
+ * Returns a section index from the table
+ * \param theRowId a table row
*/
-bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject,
- const int theX, const int theY,
- gp_Pnt& thePoint,
- int& thePoint1, int& thePoint2 )
+int CurveCreator_Widget::getSectionId( const int theRowId ) const
{
- bool isFound = false;
+ return myLocalPointView->item( theRowId, 0 )->data( Qt::UserRole ).toInt();
+}
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( theObject.IsNull() || !aViewer )
- return isFound;
-
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
- thePoint = GEOMUtils::ConvertClickToPoint( theX, theY,
- aWindow->getViewPort()->getView() );
-
- Handle(AIS_Line) aLine = Handle(AIS_Line)::DownCast( theObject );
- if ( !aLine.IsNull() ) {
- Handle(Geom_Point) aPStart;
- Handle(Geom_Point) aPEnd;
- aLine->Points( aPStart, aPEnd );
-
- Standard_Real aStartX = aPStart->X(),
- aStartY = aPStart->Y(),
- aStartZ = aPStart->Z();
- Standard_Real anEndX = aPEnd->X(),
- anEndY = aPEnd->Y(),
- anEndZ = aPEnd->Z();
- // TODO: check whether the point belong to the selected line
- gp_Lin aLin( gp_Pnt( aPStart->X(), aPStart->Y(), aPStart->Z() ),
- gp_Dir( gp_Vec( gp_Pnt( aPStart->X(), aPStart->Y(), aPStart->Z() ),
- gp_Pnt( aPEnd->X(), aPEnd->Y(), aPEnd->Z() ) ) ) );
- double aDistance = aLin.Distance( thePoint );
-
-
- if ( aLin.Contains( thePoint, LOCAL_SELECTION_TOLERANCE ) ) {
- // find the neighbour points
- thePoint1 = findLocalPointIndex( 0, aPStart->X(), aPStart->Y() );
- thePoint2 = findLocalPointIndex( 0, aPEnd->X(), aPEnd->Y() );
-
- isFound = thePoint1 >= 0 && thePoint2 >= 0;
- }
- }
- else {
- Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast( theObject );
- if ( !aShape.IsNull() ) {
- // find the neighbour points
- }
- }
- return isFound;
+/**
+ * Returns a point index from the table
+ * \param theRowId a table row
+ */
+int CurveCreator_Widget::getPointId( const int theRowId ) const
+{
+ return myLocalPointView->item( theRowId, 1 )->data( Qt::UserRole ).toInt();
+}
+
+/**
+ * Returns whethe the container has the value
+ * \param theList a container of values
+ * \param theValue a value
+ */
+bool CurveCreator_Widget::contains( const CurveCreator_ICurve::SectionToPointList& theList,
+ const CurveCreator_ICurve::SectionToPoint& theValue ) const
+{
+ return CurveCreator_UtilsICurve::contains( theList, theValue );
}
