//#include "CurveCreator_NewPointDlg.h"
#include "CurveCreator_NewSectionDlg.h"
#include "CurveCreator_Utils.h"
+#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 "OCCViewer_ViewWidget.h"
#include <BRep_Tool.hxx>
#include <TopoDS.hxx>
#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;
Qt::WindowFlags fl)
: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0),
myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ),
- myOCCViewer( 0 )
+ myOCCViewer( 0 ), myOCCViewWidget( 0 )
{
myNewSectionEditor = new CurveCreator_NewSectionDlg( this );
myNewSectionEditor->hide();
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 );
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 );
}
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;
}
+/**
+ * Set an OCC viewer
+ */
+void CurveCreator_Widget::setOCCViewWidget( OCCViewer_ViewWidget* theViewWidget )
+{
+ if ( myOCCViewWidget == theViewWidget )
+ return;
+
+ if ( myOCCViewWidget ) {
+ disconnect( myOCCViewWidget, SIGNAL( mousePressed( QMouseEvent* ) ),
+ this, SLOT( onMousePress( QMouseEvent* ) ) );
+ disconnect( myOCCViewWidget, SIGNAL( mouseReleased( QMouseEvent* ) ),
+ this, SLOT( onMouseRelease( QMouseEvent* ) ) );
+ disconnect( myOCCViewWidget, SIGNAL( mouseMoving( QMouseEvent* ) ),
+ this, SLOT( onMouseMove( QMouseEvent* ) ) );
+ //disconnect( myOCCViewWidget, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+ // this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+
+ // restore normal mode in the viewer
+ OCCViewer_Utilities::setViewWidget2DMode( myOCCViewWidget, OCCViewer_ViewWidget::No2dMode );
+ // all local contexts should be closed if the viewer is not more used
+ setLocalPointContext( false, true );
+ }
+
+ myOCCViewWidget = theViewWidget;
+ if ( myOCCViewWidget ) {
+ connect( myOCCViewWidget, SIGNAL( mousePressed( QMouseEvent* ) ),
+ this, SLOT( onMousePress( QMouseEvent* ) ) );
+ connect( myOCCViewWidget, SIGNAL( mouseReleased( QMouseEvent* ) ),
+ this, SLOT( onMouseRelease( QMouseEvent* ) ) );
+ connect( myOCCViewWidget, SIGNAL( mouseMoving( QMouseEvent* ) ),
+ this, SLOT( onMouseMove( QMouseEvent* ) ) );
+ //connect( aViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+ // this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+ OCCViewer_Utilities::setViewWidget2DMode( myOCCViewWidget, OCCViewer_ViewWidget::XYPlane );
+ }
+}
+
+/**
+ * Returns current OCC viewer
+ */
+OCCViewer_ViewWidget* CurveCreator_Widget::getOCCViewWidget()
+{
+ return myOCCViewWidget;
+}
+
+/**
+ * Returns OCC viewer context
+ */
+Handle(AIS_InteractiveContext) CurveCreator_Widget::getAISContext()
+{
+ Handle(AIS_InteractiveContext) aContext;
+ OCCViewer_Viewer* aViewer = getOCCViewer();
+ if ( aViewer )
+ aContext = aViewer->getAISContext();
+ else if ( myOCCViewWidget )
+ aContext = myOCCViewWidget->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();
+ else if ( myOCCViewWidget )
+ aViewPort = myOCCViewWidget->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);
+ else if ( myOCCViewWidget ) {
+ Handle(AIS_InteractiveContext) aContext = myOCCViewWidget->getAISContext();
+
+ AIS_ListIteratorOfListOfInteractive aIt;
+ for (aIt.Initialize(theList); aIt.More(); aIt.Next())
+ aContext->AddOrRemoveSelected(aIt.Value(), false);
+ aContext->UpdateCurrentViewer();
+ }
+}
+
+//=======================================================================
+// function: reset
+// purpose: reset the widget viewer, close local context, clear selection
+//=======================================================================
+void CurveCreator_Widget::reset()
+{
+}
+
//=======================================================================
// function: getUniqSectionName
// purpose: return unique section name
{
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++ ){
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 )
+ return;
mySection= -1;
myPointNum = -1;
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_Widget::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->undo();
+ finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::onRedo()
{
if( !myCurve )
return;
+ CurveCreator_Widget::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->redo();
+ finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::updateUndoRedo()
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 )
+ 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
}
}
-//=================================================================================
-// 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 )
if ( myDragStarted ) {
if ( myDragged ) // if the drag of some points has happened, restore the drag selection
- setSelectedPonts( 0, myDragPoints );
+ setSelectedPonts( myDragPoints );
setDragStarted( false );
}
else // check whether the segment is clicked an a new point should be added to the segment
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 )
myDragStartPosition = aPos;
}
-void CurveCreator_Widget::onLocalPointChanged( int theRow, int theColumn )
+/**
+ * Set zero viewer by the last view closed in
+ * \param theManager a viewer manager
+ */
+void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* theManager )
{
- QList<int> aSelSections = mySectionView->getSelectedSections();
- if ( aSelSections.size() < 0 )
- return;
+ myOCCViewer = 0;
+}
- int aSection = aSelSections[0];
+void CurveCreator_Widget::onMousePress( QMouseEvent* theEvent )
+{
+ onMousePress( 0, theEvent );
+}
- QList<int> aSelPoints;
+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 );
+ int aPntIndex = getPointId( theRow );
+
+ if ( aPntIndex < 0 )
+ return;
+
+ SectionToPointList aSelPoints;
startCurveModification( aSelPoints );
- int aPntIndex = -1;
- int aCurrSect=-1;
+ 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 );
- }
- //}
+ 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;
- getSelectedPonts( aSectionId, aPoints );
+ SectionToPointList aPoints;
+ getSelectedPonts( aPoints );
if ( aPoints.size() == 0 )
return;
- QList<int> aSelPoints;
+ SectionToPointList aSelPoints;
startCurveModification( aSelPoints, false );
- // the points should be removed in a decreased order
- qSort( aPoints );
- for( int i = aPoints.size()-1; i >= 0; i-- ){
- int aPntIndx = aPoints[i];
- myCurve->removePoint( aSectionId, aPntIndx );
- mySectionView->pointsRemoved( aSectionId, aPntIndx );
- }
- finishCurveModification( QList<int>() );
+ myCurve->removeSeveralPoints( aPoints );
+ finishCurveModification( SectionToPointList() );
}
void CurveCreator_Widget::insertPointToSelectedSegment( const int theX,
const int theY )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if ( !aContext )
return;
-
- int aPoint1 = -1, aPoint2 = -1;
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();
isFoundPoint = pointOnObject( anAIS, theX, theY, aPoint, aPoint1, aPoint2 );
}
}
- bool isDone = false;
- if ( !isFoundPoint || aPoint1 < 0 || aPoint2 < 0 )
+ if ( !isFoundPoint )
return;
// insert the point to the model curve
- QList<int> aSelPoints;
+ SectionToPointList aSelPoints;
startCurveModification( aSelPoints );
- int aSection = 0;
CurveCreator::Coordinates aCoords;
aCoords.push_back( aPoint.X() );
aCoords.push_back( aPoint.Y() );
+ SectionToPointList aPoints1, aPoints2;
+ findSectionsToPoints( aPoint1.X(), aPoint1.Y(), aPoints1 );
+ findSectionsToPoints( aPoint2.X(), aPoint2.Y(), aPoints2 );
+ 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();
+ for ( ; anIt2 != aLast2 && aSectionId < 0; anIt2++ ) {
+ if ( anIt2->first == aSectionCur ) {
+ aSectionId = aSectionCur;
+ aPoint1Id = anIt->second;
+ aPoint2Id = anIt2->second;
+ }
+ }
+ }
+
int anInsertPos = -1;
- int aLastPoint = myCurve->getNbPoints( 0/*SectionId*/ )-1;
- if ( ( aPoint1 == aLastPoint && aPoint2 == 0 ) ||
- ( aPoint2 == aLastPoint && aPoint1 == 0 ) )
+ 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 = aPoint1 < aPoint2 ? aPoint1 + 1 : aPoint2 + 1;
+ anInsertPos = aPoint1Id < aPoint2Id ? aPoint1Id + 1 : aPoint2Id + 1;
- myCurve->addPoints( aCoords, aSection, anInsertPos );
- mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) );
+ myCurve->addPoints( aCoords, aSectionId, anInsertPos );
+ mySectionView->pointsAdded( aSectionId, myCurve->getNbPoints( aSectionId ) );
finishCurveModification( aSelPoints );
- setSelectedPonts( 0 );
- updateUndoRedo();
+ setSelectedPonts();
}
void CurveCreator_Widget::moveSelectedPoints( const int theXPosition,
const int theYPosition )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ if ( !aViewPort )
return;
- QList<int> aPoints;
+ 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();
- int aSectionId = 0;
- int aPointId;
+ CurveCreator_ICurve::SectionToPointCoordsList aCoordList;
std::deque<float> aChangedPos;
- for ( int i = 0, aNb = myDragPoints.size(); i < aNb; i++ ) {
- aPointId = myDragPoints[i];
+ 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;
- myCurve->setPoint( aSectionId, aPointId, aChangedPos );
+
+ aCoordList.push_back(
+ std::make_pair(std::make_pair( aSectionId, aPointId ),
+ aChangedPos ));
}
+ myCurve->setSeveralPoints( aCoordList );
+
myDragged = true;
finishCurveModification( myDragPoints );
}
void CurveCreator_Widget::updateLocalPointView()
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if ( !aContext )
return;
- Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
bool isBlocked = myLocalPointView->blockSignals(true);
gp_Pnt aPnt;
*/
void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ Handle(AIS_InteractiveContext) ic = getAISContext();
+ if ( !ic )
return;
- Handle(AIS_InteractiveContext) ic = aViewer->getAISContext();
if ( theOpen ) {
// Open local context if there is no one
void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY )
{
+ SectionToPointList aPoints;
+ findSectionsToPoints( theX, theY, aPoints );
+
+ SectionToPointList aSkipList;
+ // table could not contain two equal value rows
int aRowId = myLocalPointView->rowCount();
double aCurrentX, aCurrentY;
+ int aSectionId, aPointId;
+ 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;
+ 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 )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
if ( theState ) {
- getSelectedPonts( 0, myDragPoints );
+ 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( int theSectionId, QList<int>& thePoints )
+void CurveCreator_Widget::getSelectedPonts( CurveCreator_Widget::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_Widget::SectionToPointList& thePoints )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ Handle(AIS_InteractiveContext) ic = getAISContext();
+ if ( !ic || !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() );
+ SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end();
+ 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 );
+ 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 )
+ aListToSelect.Append( anAIS );
+ }
+ }
}
ic->ClearSelected( Standard_False );
- aViewer->setObjectsSelected( aListToSelect );
+ setObjectsSelected( aListToSelect );
updateLocalPointView();
}
* \param thePoints an output list of curve selected points
* \param theFillPoints a flag whether the selection list should be filled
*/
-void CurveCreator_Widget::startCurveModification( QList<int>& thePoints, const bool theFillPoints )
+void CurveCreator_Widget::startCurveModification(
+ CurveCreator_Widget::SectionToPointList& thePoints,
+ const bool theFillPoints )
{
if ( theFillPoints ) {
thePoints.clear();
- int aSectionId = 0;
- getSelectedPonts( aSectionId, thePoints );
+ getSelectedPonts( thePoints );
}
setLocalPointContext( false );
}
* Open local context and select given points inside it.
* \param thePoints a list of curve selected points
*/
-void CurveCreator_Widget::finishCurveModification( const QList<int>& thePoints )
+void CurveCreator_Widget::finishCurveModification(
+ const CurveCreator_Widget::SectionToPointList& thePoints )
{
- setLocalPointContext( true );
- int aSectionId = 0;
- setSelectedPonts( aSectionId, thePoints );
+ if ( getActionMode() == ModificationMode )
+ setLocalPointContext( true );
+ setSelectedPonts( thePoints );
+ updateUndoRedo();
}
/**
return aPntIndex;
}
-void CurveCreator_Widget::findSections( int thePointId, QList<int>& theSections )
+void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY,
+ CurveCreator_Widget::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 );
+ }
+}
+
+void CurveCreator_Widget::convert( const 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;
+ }
}
/**
bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject,
const int theX, const int theY,
gp_Pnt& thePoint,
- int& thePoint1, int& thePoint2 )
+ gp_Pnt& thePoint1, gp_Pnt& thePoint2 )
{
bool isFound = false;
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( theObject.IsNull() || !aViewer )
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if ( theObject.IsNull() || !aContext )
return isFound;
gp_Pnt aPoint;
}
if ( isFound ) {
thePoint = aPoint;
- thePoint1 = findLocalPointIndex( 0, aPnt1.X(), aPnt1.Y() );
- thePoint2 = findLocalPointIndex( 0, aPnt2.X(), aPnt2.Y() );
- isFound = thePoint1 >= 0 && thePoint2 >= 0;
+ thePoint1 = aPnt1;
+ thePoint2 = aPnt2;
}
return isFound;
}
Standard_Real& theParameter )
{
bool isFound = false;
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ if ( !aViewPort )
return isFound;
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
- Handle(V3d_View) aView = aWindow->getViewPort()->getView();
+ Handle(V3d_View) aView = aViewPort->getView();
gp_Pnt aPoint = CurveCreator_Utils::ConvertClickToPoint( theX, theY, aView );
GeomAPI_ProjectPointOnCurve aProj( aPoint, theCurve );
}
return isFound;
}
+
+/**
+ * Returns a section index from the table
+ * \param theRowId a table row
+ */
+int CurveCreator_Widget::getSectionId( const int theRowId ) const
+{
+ return myLocalPointView->item( theRowId, 0 )->data( Qt::UserRole ).toInt();
+}
+
+/**
+ * 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_Widget::SectionToPointList& theList,
+ const CurveCreator_Widget::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;
+}
