#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 "CurveCreator_TableView.h"
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewPort3d.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 "OCCViewer_Utilities.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
#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;
-const int POINT_INDEX_COLUMN_WIDTH = 50;
-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 ),
- myOCCViewer( 0 )
+ const int theActionFlags,
+ const QStringList& theCoordTitles,
+ Qt::WindowFlags fl,
+ int theLocalPointRowLimit )
+: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0),
+ myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ),
+ myOCCViewer( 0 ), myLocalPointRowLimit( theLocalPointRowLimit )
{
- myNewSectionEditor = new CurveCreator_NewSectionDlg( this );
+ bool isToEnableClosed = !( theActionFlags & DisableClosedSection );
+ myNewSectionEditor = new CurveCreator_NewSectionDlg( this, isToEnableClosed );
myNewSectionEditor->hide();
connect( myNewSectionEditor, SIGNAL(addSection()), this, SLOT(onAddNewSection()) );
connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) );
QGroupBox* aSectionGroup = new QGroupBox(tr("Sections"),this);
mySectionView = new CurveCreator_TreeView(myCurve, aSectionGroup);
+ mySectionView->setSelectionMode( QTreeView::ExtendedSelection );
connect( mySectionView, SIGNAL(selectionChanged()), this, SLOT( onSelectionChanged() ) );
connect( mySectionView, SIGNAL(sectionEntered(int)), this, SLOT(onEditSection(int)) );
connect( mySectionView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onContextMenu(QPoint)) );
- myLocalPointView = new QTableWidget();
- myLocalPointView->setVisible( false );
- myLocalPointView->setColumnCount( 3 );
- myLocalPointView->setColumnWidth( 0, 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" );
- myLocalPointView->setHorizontalHeaderLabels( aLabels );
+ myLocalPointView = new CurveCreator_TableView( myCurve, this, theCoordTitles );
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);
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);
+
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( CLEAR_ALL_ID, tr("CLEAR_ALL"), QPixmap(), tr("CLEAR_ALL_TLT"),
QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Delete ) );
// aLay->addLayout(aNameLayout);
aLay->addWidget(aSectionGroup);
setLayout(aLay);
- onSelectionChanged();
+
+ updateActionsStates();
+ updateUndoRedo();
}
/**
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;
+}
//=======================================================================
-// function: getUniqSectionName
-// purpose: return unique section name
+// function: reset
+// purpose: reset the widget viewer, close local context, clear selection
//=======================================================================
-std::string CurveCreator_Widget::getUniqSectionName( CurveCreator_ICurve* theCurve ) const
-{
- for( int i = 0 ; i < 1000000 ; i++ ){
- char aBuffer[255];
- sprintf( aBuffer, "Section_%d", i+1 );
- std::string aName(aBuffer);
- int j;
- for( j = 0 ; j < theCurve->getNbSections() ; j++ ){
- if( theCurve->getSectionName(j) == aName )
- break;
- }
- if( j == theCurve->getNbSections() )
- return aName;
- }
- return "";
+void CurveCreator_Widget::reset()
+{
}
void CurveCreator_Widget::setCurve( CurveCreator_ICurve* theCurve )
{
myCurve = theCurve;
- mySectionView->setCurve(myCurve);
- onSelectionChanged();
+ mySectionView->setCurve( myCurve );
+ myLocalPointView->setCurve( myCurve );
+ updateActionsStates();
updateUndoRedo();
}
void CurveCreator_Widget::onSelectionChanged()
+{
+ updateActionsStates();
+ updateUndoRedo();
+ emit selectionChanged();
+}
+
+void CurveCreator_Widget::updateActionsStates()
{
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();
switch( aSelType ){
case CurveCreator_TreeView::ST_NOSEL:{
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: {
}
break;
case ModificationMode: {
- anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID;
+ if ( myNewSectionEditor->isEnableClosed() )
+ anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID;
+ anEnabledAct << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID;
int aSectCnt = myCurve->getNbSections();
if( aSectCnt > 0 )
anEnabledAct << CLEAR_ALL_ID;
}
break;
case NoneMode:
+ {
+ int aSectCnt = myCurve->getNbSections();
+ if( aSectCnt > 1 )
+ anEnabledAct << JOIN_ALL_ID;
+ if( aSelSections.size() > 1 )
+ anEnabledAct << JOIN_ID;
+ }
+ break;
default:
break;
}
}
}
}
- 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;
if( aSelSection.size() > 0 ){
mySection = aSelSection[0];
}
- else{
- QList< QPair<int,int> > aSelPoints = mySectionView->getSelectedPoints();
- if( aSelPoints.size() > 0 ){
- mySection = aSelPoints[0].first;
- myPointNum = aSelPoints[0].second + 1;
- }
- }
// emit subOperationStarted( myNewPointEditor );
}
break;
}
}
- 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++;
- 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();
+ updateActionsStates();
updateUndoRedo();
+ setLocalPointContext( aMode == ModificationMode, true );
}
void CurveCreator_Widget::onNewSection()
{
if( !myCurve )
return;
+
+ stopActionMode();
myNewSectionEditor->clear();
myNewSectionEditor->setEditMode(false);
- QString aSectName = QString( getUniqSectionName(myCurve).c_str() );
+ QString aSectName = QString( CurveCreator_UtilsICurve::getUniqSectionName( myCurve ).c_str() );
myNewSectionEditor->setSectionParameters(aSectName, true, CurveCreator::Polyline );
- emit subOperationStarted( myNewSectionEditor );
+ emit subOperationStarted( myNewSectionEditor, false );
}
void CurveCreator_Widget::onAddNewSection()
{
if( !myCurve )
return;
- myCurve->addSection( myNewSectionEditor->getName().toStdString(), myNewSectionEditor->getSectionType(),
- myNewSectionEditor->isClosed() );
+ myCurve->addSection( myNewSectionEditor->getName().toStdString(),
+ myNewSectionEditor->getSectionType(),
+ myNewSectionEditor->isClosed() );
mySectionView->sectionAdded( -1 ); // add a new section to the end of list
- QString aNewName = QString(getUniqSectionName(myCurve).c_str());
+ QString aNewName = QString( CurveCreator_UtilsICurve::getUniqSectionName( myCurve ).c_str() );
myNewSectionEditor->setSectionName(aNewName);
- onSelectionChanged();
+ updateActionsStates();
updateUndoRedo();
onCancelSection();
}
return anAct;
}
-QAction* CurveCreator_Widget::getAction(ActionId theId)
+QAction* CurveCreator_Widget::getAction( ActionId theId )
{
if( myActionMap.contains(theId) )
return myActionMap[theId];
return NULL;
}
-CurveCreator_Widget::ActionMode CurveCreator_Widget::getActionMode() const
+QAction* CurveCreator_Widget::getAction( ActionMode theMode )
{
- ActionMode aMode = NoneMode;
-
- if ( myActionMap[ADDITION_MODE_ID]->isChecked() )
- aMode = AdditionMode;
- else if ( myActionMap[MODIFICATION_MODE_ID]->isChecked() )
- aMode = ModificationMode;
- else if ( myActionMap[DETECTION_MODE_ID]->isChecked() )
- aMode = DetectionMode;
-
- return aMode;
+ ActionId anActionId = NONE_ID;
+ switch ( theMode ) {
+ case AdditionMode:
+ anActionId = ADDITION_MODE_ID;
+ break;
+ case ModificationMode:
+ anActionId = MODIFICATION_MODE_ID;
+ break;
+ case DetectionMode:
+ anActionId = DETECTION_MODE_ID;
+ break;
+ default:
+ break;
+ }
+ QAction* anAction = 0;
+ if ( anActionId != NONE_ID && myActionMap.contains( anActionId ) )
+ anAction = myActionMap[anActionId];
+ return anAction;
}
void CurveCreator_Widget::onEditSection( int theSection )
{
if( !myCurve )
return;
+
+ stopActionMode();
mySection = theSection;
QString aSectName = QString::fromStdString( myCurve->getSectionName(theSection));
bool isClosed = myCurve->isClosed(theSection);
myNewSectionEditor->setEditMode(true);
myNewSectionEditor->setSectionParameters( aSectName, isClosed, aType );
- emit subOperationStarted( myNewSectionEditor );
+ emit subOperationStarted( myNewSectionEditor, true );
}
void CurveCreator_Widget::onModifySection()
QString aName = myNewSectionEditor->getName();
bool isClosed = myNewSectionEditor->isClosed();
CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType();
-// myCurve->startOperation();
- myCurve->setClosed( isClosed, mySection );
- myCurve->setSectionName( mySection , aName.toStdString() );
- myCurve->setSectionType( mySection, aSectType );
-// myCurve->finishOperation();
+ 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 );
mySectionView->sectionChanged(mySection);
updateUndoRedo();
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 )
if( aSections.size() == 0 ){
return;
}
- int aMainSect = aSections[0];
- int aMainSectSize = myCurve->getNbPoints(aMainSect);
-// myCurve->startOperation();
- for( int i = 1 ; i < aSections.size() ; i++ ){
- int aSectNum = aSections[i] - (i-1);
- myCurve->join( aMainSect, aSectNum );
- mySectionView->sectionsRemoved( aSectNum );
+ stopActionMode();
+
+ std::list<int> aSectionsToJoin;
+ for( int i = 0; i < aSections.size() ; i++ ){
+ aSectionsToJoin.push_back( aSections[i] );
+ }
+ //int aMainSect = aSectionsToJoin.front();
+ //int aMainSectSize = myCurve->getNbPoints(aMainSect);
+ if ( myCurve->join( aSectionsToJoin ) )
+ {
+ std::list<int>::const_iterator anIt = aSectionsToJoin.begin(),
+ aLast = aSectionsToJoin.end();
+ // the first section should be skipped. It is not removed, but is modified
+ anIt++;
+ for ( ; anIt != aLast; anIt++ )
+ mySectionView->sectionsRemoved( *anIt );
}
-// myCurve->finishOperation();
+
+ /* The update for the points of the main section
int aNewSectSize = myCurve->getNbPoints(aMainSect);
if( aNewSectSize != aMainSectSize )
- mySectionView->pointsAdded( aMainSect, aMainSectSize, aNewSectSize-aMainSectSize );
+ mySectionView->pointsAdded( aMainSect, aMainSectSize, aNewSectSize-aMainSectSize );*/
updateUndoRedo();
}
{
if( !myCurve )
return;
+ stopActionMode();
myCurve->clear();
mySectionView->reset();
- onSelectionChanged();
+ updateActionsStates();
updateUndoRedo();
}
{
if( !myCurve )
return;
- myCurve->join();
+ stopActionMode();
+
+ std::list<int> aSectionsToJoin;
+ for( int i = 0, aNb = myCurve->getNbSections(); i < aNb ; i++ ){
+ aSectionsToJoin.push_back( i );
+ }
+ bool aRes = myCurve->join( aSectionsToJoin );
+
mySectionView->reset();
- onSelectionChanged();
+ updateActionsStates();
updateUndoRedo();
}
{
if( !myCurve )
return;
+ stopActionMode();
QList<int> aSelSections = mySectionView->getSelectedSections();
-// myCurve->startOperation();
for( int i = 0 ; i < aSelSections.size() ; i++ ){
myCurve->setSectionType(aSelSections[i], CurveCreator::Spline );
mySectionView->sectionChanged(aSelSections[i]);
}
-// myCurve->finishOperation();
updateUndoRedo();
}
{
if( !myCurve )
return;
-// myCurve->startOperation();
+ stopActionMode();
QList<int> aSelSections = mySectionView->getSelectedSections();
for( int i = 0 ; i < aSelSections.size() ; i++ ){
myCurve->setSectionType( aSelSections[i], CurveCreator::Polyline );
mySectionView->sectionChanged( aSelSections[i] );
}
-// myCurve->finishOperation();
updateUndoRedo();
}
{
if( !myCurve )
return;
-// myCurve->startOperation();
+ stopActionMode();
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();
updateUndoRedo();
}
{
if( !myCurve )
return;
-// myCurve->startOperation();
+ stopActionMode();
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();
updateUndoRedo();
}
{
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()
void CurveCreator_Widget::onContextMenu( QPoint thePoint )
{
QList<ActionId> aContextActions;
- aContextActions << CLEAR_ALL_ID << JOIN_ALL_ID << SEPARATOR_ID <<
+ aContextActions << CLEAR_ALL_ID << JOIN_ID << JOIN_ALL_ID << SEPARATOR_ID <<
CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID <<
SET_SECTIONS_SPLINE_ID;
QPoint aGlPoint = mySectionView->mapToGlobal(thePoint);
return mySectionView->getSelectedSections();
}
-QList< QPair< int, int > > CurveCreator_Widget::getSelectedPoints()
+void CurveCreator_Widget::setSelectedSections( const QList<int>& theSections )
+{
+ mySectionView->setSelectedSections( theSections );
+ updateActionsStates();
+ updateUndoRedo();
+}
+
+/**
+ * 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()
{
- return mySectionView->getSelectedPoints();
+ 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;
+}
+
+void CurveCreator_Widget::setActionMode( const ActionMode& theMode )
+{
+ ActionMode aPrevMode = getActionMode();
+ QAction* aPrevAction = getAction( aPrevMode );
+ QAction* anAction = getAction( theMode );
+ switch ( theMode ) {
+ case NoneMode:
+ case AdditionMode: {
+ if ( aPrevAction ) {
+ if ( aPrevAction->isChecked() ) {
+ aPrevAction->setChecked( false );
+ }
+ }
+ if ( aPrevMode == ModificationMode )
+ onModificationMode( false );
+ if ( aPrevMode == AdditionMode )
+ onAdditionMode( false );
+
+ if ( theMode == AdditionMode )
+ {
+ anAction->setChecked( true );
+ onModeChanged( true );
+ }
+ }
+ break;
+ break;
+ case ModificationMode:
+ {
+ //TODO
+ }
+ break;
+ case DetectionMode:
+ break;
+ }
+}
+
+CurveCreator_Widget::ActionMode CurveCreator_Widget::getActionMode() const
+{
+ ActionMode aMode = NoneMode;
+
+ if ( myActionMap[ADDITION_MODE_ID]->isChecked() )
+ aMode = AdditionMode;
+ else if ( myActionMap[MODIFICATION_MODE_ID]->isChecked() )
+ aMode = ModificationMode;
+ else if ( myActionMap[DETECTION_MODE_ID]->isChecked() )
+ aMode = DetectionMode;
+
+ return aMode;
}
//=================================================================================
-// 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;
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;
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 =
- ((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
if ( myCurve->getDimension() == 3 ) {
aCoords.push_back( aPnt.Z() );
}
- onAddNewPoint(aCoords);
-// myNewPointEditor->setCoordinates( aCoords );
+ addNewPoint(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 )
return;
+ myPressedX = theEvent->x();
+ myPressedY = theEvent->y();
+
switch( getActionMode() ) {
case ModificationMode: {
//store initial cursor position for Drag&Drop
break;
}
case AdditionMode: {
- onGetCoordsByClick( theEvent );
+ addCoordsByClick( theEvent );
break;
}
default:
}
}
-//=================================================================================
-// 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 )
return;
- if ( myDragStarted )
+ if ( myDragStarted ) {
+ bool isDragged = myDragged;
+ CurveCreator_ICurve::SectionToPointList aDraggedPoints;
+ QMap<CurveCreator_ICurve::SectionToPoint, std::deque< float > > anInitialDragPointsCoords;
+ if ( myDragged ) {
+ aDraggedPoints = myDragPoints;
+ anInitialDragPointsCoords = myInitialDragPointsCoords;
+ }
+
setDragStarted( false );
+
+ if ( aDraggedPoints.size() > 0 ) {
+ // Collect old coordinates of the dragged points
+ CurveCreator_ICurve::SectionToPointCoordsList anOldPoints;
+ foreach ( const CurveCreator_ICurve::SectionToPoint aSectionToPoint, anInitialDragPointsCoords.keys() ) {
+ CurveCreator::Coordinates aCoords = anInitialDragPointsCoords.value( aSectionToPoint );
+ anOldPoints.push_back( std::make_pair( aSectionToPoint, aCoords ) );
+ }
+
+ if ( myCurve->canPointsBeSorted() ) {
+ // Add old coordinates of the curve points (except the dragged points) to the list
+ for( int aSectionId = 0 ; aSectionId < myCurve->getNbSections() ; aSectionId++ ) {
+ CurveCreator::Coordinates aCoords;
+ for ( int aPointId = 0, aNb = myCurve->getNbPoints( aSectionId ); aPointId < aNb; aPointId++ ) {
+ aCoords = myCurve->getPoint( aSectionId, aPointId );
+ if ( aCoords.size() < 2 ) {
+ continue;
+ }
+
+ CurveCreator_ICurve::SectionToPoint aSectionToPoint = std::make_pair( aSectionId, aPointId );
+
+ if ( !anInitialDragPointsCoords.contains( aSectionToPoint ) ) {
+ anOldPoints.push_back( std::make_pair( aSectionToPoint, aCoords ) );
+ }
+ }
+ }
+
+ // Apply points sorting
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
+
+ myCurve->setSkipSorting( false );
+
+ CurveCreator_ICurve::SectionToPointCoordsList aCoordList;
+ CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aDraggedPoints.begin(),
+ aLast = aDraggedPoints.end();
+ for ( ; anIt != aLast; anIt++ ) {
+ int aSectionId = anIt->first;
+ int aPointId = anIt->second;
+ std::deque<float> aPos = myCurve->getPoint( aSectionId, aPointId );
+
+ aCoordList.push_back(
+ std::make_pair( std::make_pair( aSectionId, aPointId ), aPos ) );
+ }
+
+ myCurve->setSeveralPoints( aCoordList, false );
+
+ finishCurveModification( aDraggedPoints );
+ } else {
+ // if the drag of some points has happened, restore the drag selection
+ START_MEASURE_TIME;
+ setSelectedPoints( aDraggedPoints );
+ END_MEASURE_TIME( "drop" );
+ }
+
+ // Save drag difference
+ myCurve->saveCoordDiff( anOldPoints );
+ }
+ }
else // check whether the segment is clicked an a new point should be added to the segment
- insertPointToSelectedSegment( theEvent->pos().x(), theEvent->pos().y() );
+ {
+ int aReleasedX = theEvent->x();
+ int aReleasedY = theEvent->y();
+ if ( myPressedX == aReleasedX && myPressedY == aReleasedY )
+ insertPointToSelectedSegment( aReleasedX, aReleasedY );
+ }
// updates the input panel table to show the selected point coordinates
updateLocalPointView();
+ updateUndoRedo();
}
-//=================================================================================
-// 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 )
if ( (aPos - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() )
return;
+ START_MEASURE_TIME;
+
moveSelectedPoints( aPos.x(), aPos.y() );
myDragStartPosition = aPos;
+
+ END_MEASURE_TIME( "drag" );
}
-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;
+}
+
+void CurveCreator_Widget::onMousePress( QMouseEvent* theEvent )
+{
+ onMousePress( 0, theEvent );
+}
+
+void CurveCreator_Widget::onMouseRelease( QMouseEvent* theEvent )
+{
+ onMouseRelease( 0, theEvent );
+}
- int aSection = aSelSections[0];
+void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent )
+{
+ onMouseMove( 0, theEvent );
+}
- QList<int> aSelPoints;
+void CurveCreator_Widget::onCellChanged( int theRow, int theColumn )
+{
+ int aCurrSect = myLocalPointView->getSectionId( theRow );
+ int aPntIndex = myLocalPointView->getPointId( theRow );
+
+ if ( aPntIndex < 0 )
+ return;
+
+ CurveCreator_ICurve::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::removeSection()
{
- QList< QPair<int,int> > aSelPoints = mySectionView->getSelectedPoints();
- int aCurrSect=-1;
- int aRemoveCnt = 0;
-// myCurve->startOperation();
- for( int i = 0 ; i < aSelPoints.size() ; i++ ){
- if( aCurrSect != aSelPoints[i].first ){
- aRemoveCnt = 0;
- aCurrSect = aSelPoints[i].first;
- }
- int aPntIndx = aSelPoints[i].second - aRemoveCnt;
- myCurve->removePoint( aCurrSect, aPntIndx );
- mySectionView->pointsRemoved( aCurrSect, aPntIndx );
- aRemoveCnt++;
- }
+ stopActionMode();
+
QList<int> aSections = mySectionView->getSelectedSections();
for( int i = 0 ; i < aSections.size() ; i++ ){
int aSectNum = aSections[i] - (i);
myCurve->removeSection( aSectNum );
mySectionView->sectionsRemoved( aSectNum );
}
-// myCurve->finishOperation();
mySectionView->clearSelection();
updateUndoRedo();
}
*/
void CurveCreator_Widget::removePoint()
{
- int aSectionId = 0;
- QList<int> aPoints;
- qSort( aPoints );
- getSelectedPonts( aSectionId, aPoints );
-
+ CurveCreator_ICurve::SectionToPointList aPoints;
+ getSelectedPoints( aPoints );
if ( aPoints.size() == 0 )
return;
- QList<int> aSelPoints;
+ 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() );
+}
+
+void CurveCreator_Widget::addNewPoint(const CurveCreator::Coordinates& theCoords)
+{
+ if( !myCurve )
+ return;
+ QList<int> aSections = mySectionView->getSelectedSections();
+ if( aSections.size() == 0 ){
+ return;
}
- finishCurveModification( QList<int>() );
+ 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 )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return;
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+
+ OCCViewer_ViewPort3d* aViewPort = getViewPort();
+ Handle(V3d_View) aView;
+ if ( aViewPort )
+ aView = aViewPort->getView();
- int aPoint1 = -1, aPoint2 = -1;
+ 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 );
- }
- }
- bool isDone = false;
- if ( !isFoundPoint || aPoint1 < 0 || aPoint2 < 0 )
+ gp_Pnt aPoint1, aPoint2;
+ Handle(AIS_InteractiveObject) anAISObject = myCurve->getAISObject();
+ bool isFoundPoint = CurveCreator_Utils::pointOnObject( aView, anAISObject, theX, theY,
+ aPoint, aPoint1, aPoint2 );
+ if ( !isFoundPoint )
return;
// insert the point to the model curve
- QList<int> aSelPoints;
+ CurveCreator_ICurve::SectionToPointList aSelPoints;
startCurveModification( aSelPoints );
- int aSection = 0;
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;
+ // find the indices of the neighbour point
+ // 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;
+ }
+ }
+ }
+
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();
+ setSelectedPoints();
}
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;
+ CurveCreator_ICurve::SectionToPointList aPoints;
startCurveModification( aPoints, false );
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
gp_Pnt aStartPnt = CurveCreator_Utils::ConvertClickToPoint( myDragStartPosition.x(),
- myDragStartPosition.y(),
- aWindow->getViewPort()->getView() );
+ myDragStartPosition.y(),
+ aViewPort->getView() );
gp_Pnt anEndPnt = CurveCreator_Utils::ConvertClickToPoint( theXPosition, theYPosition,
- aWindow->getViewPort()->getView() );
+ aViewPort->getView() );
double aXDelta = aStartPnt.X() - anEndPnt.X();
double anYDelta = aStartPnt.Y() - anEndPnt.Y();
- 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];
+ 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;
+
+ // Remember drag points coordinates
+ if ( !myDragged ) {
+ myInitialDragPointsCoords.insert( std::make_pair( aSectionId, aPointId ), aChangedPos );
+ }
+
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, false );
+
+ myDragged = true;
finishCurveModification( myDragPoints );
}
void CurveCreator_Widget::updateLocalPointView()
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ if ( myDragStarted )
return;
- Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
-
- 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() );
- }
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if ( aContext.IsNull() )
+ return;
+
+ CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints );
+ int aNbPoints = myLocalPoints.size();
+
+ bool isRowLimit = aNbPoints > myLocalPointRowLimit;
+ myLocalPointView->setVisible( getActionMode() == ModificationMode && !isRowLimit );
+
+ if ( !isRowLimit ) {
+ bool isBlocked = myLocalPointView->blockSignals(true);
+
+ myLocalPointView->setLocalPointsToTable( myLocalPoints );
+
+ myLocalPointView->blockSignals( isBlocked );
}
- myLocalPointView->blockSignals(isBlocked);
}
/**
*/
void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return;
- Handle(AIS_InteractiveContext) ic = aViewer->getAISContext();
-
- if ( theOpen ) {
- // Open local context if there is no one
- if ( !ic->HasOpenedContext() ) {
- ic->ClearCurrents( false );
- ic->OpenLocalContext( false/*use displayed objects*/, true/*allow shape decomposition*/ );
- }
- AIS_ListOfInteractive aList;
- ic->DisplayedObjects( aList );
- int aLSize = 0;
- for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() )
- aLSize++;
-
- for ( AIS_ListIteratorOfListOfInteractive it( aList ); it.More(); it.Next() )
- {
- Handle(AIS_InteractiveObject) anAIS = it.Value();
- if ( !anAIS.IsNull() )
- {
- if ( anAIS->IsKind( STANDARD_TYPE( AIS_Shape ) ) )
- {
- ic->Load( anAIS, -1/*selection mode*/, true/*allow decomposition*/ );
- ic->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_WIRE ) );
- }
- else if ( anAIS->DynamicType() != STANDARD_TYPE(AIS_Trihedron) )
- {
- ic->Load( anAIS, -1/*selection mode*/, false/*allow decomposition*/ );
- ic->Activate( anAIS, TopAbs_VERTEX );
- }
- }
- continue;
- }
- }
- else {
- if ( ic->HasOpenedContext() )
- ic->CloseAllContexts();
- if ( isUpdateTable )
- updateLocalPointView();
- }
-}
-
-void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY )
-{
- int aRowId = myLocalPointView->rowCount();
- double aCurrentX, aCurrentY;
- 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();
- if ( fabs( aCurrentX - theX ) < LOCAL_SELECTION_TOLERANCE &&
- fabs( aCurrentY - theY ) < LOCAL_SELECTION_TOLERANCE )
- return;
- }
- QTableWidgetItem* anItem;
-
- myLocalPointView->setRowCount( aRowId+1 );
-
- int aPointSection = 0;
- int aPointIndex = findLocalPointIndex( aPointSection, theX, theY );
-
- anItem = new QTableWidgetItem( QString::number( aPointIndex + 1 ) );
- anItem->setFlags( anItem->flags() & ~Qt::ItemIsEnabled );
- myLocalPointView->setItem( aRowId, 0, anItem );
-
- anItem = new QTableWidgetItem( QString::number( theX ) );
- anItem->setData( Qt::UserRole, theX );
- myLocalPointView->setItem( aRowId, 1, anItem );
-
- anItem = new QTableWidgetItem( QString::number( theY ) );
- anItem->setData( Qt::UserRole, theY );
- myLocalPointView->setItem( aRowId, 2, anItem );
+ CurveCreator_Utils::setLocalPointContext( myCurve, getAISContext(), theOpen );
+ if ( !theOpen && isUpdateTable )
+ updateLocalPointView();
}
/**
*/
void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint )
{
- if ( !theState ) {
- myDragStarted = false;
- myDragPoints.clear();
- }
- else {
- getSelectedPonts( 0, myDragPoints );
+ if ( theState ) {
+ getSelectedPoints( myDragPoints );
+
myDragStarted = myDragPoints.size();
myDragStartPosition = thePoint;
+ if ( myDragStarted ) {
+ // change a viewer interaction style in order to avoid a select rectangle build
+ myDragInteractionStyle = changeInteractionStyle( SUIT_ViewModel::KEY_FREE );
+ myCurve->setSkipSorting( true );
+ }
}
+ else {
+ if ( myDragStarted )
+ changeInteractionStyle( myDragInteractionStyle );
+ myDragStarted = false;
+ myDragPoints.clear();
+ myInitialDragPointsCoords.clear();
+ }
+ myDragged = false;
}
-void CurveCreator_Widget::getSelectedPonts( int theSectionId, QList<int>& thePoints )
+void CurveCreator_Widget::getSelectedPoints( 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 );
- }
+ thePoints = myLocalPoints;
}
-void CurveCreator_Widget::setSelectedPonts( const int theSectionId, const QList<int>& thePoints )
+void CurveCreator_Widget::setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& thePoints )
{
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
+ if ( myDragStarted )
return;
-
- AIS_ListOfInteractive aListToSelect;
-
- Handle(AIS_InteractiveContext) ic = aViewer->getAISContext();
- if ( !ic->HasOpenedContext() )
+ Handle(AIS_InteractiveContext) aContext = getAISContext();
+ if ( aContext.IsNull() || !aContext->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() );
-
- if ( aVertex.IsNull() )
- continue;
-
- gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
- int aPointIndex = findLocalPointIndex( theSectionId, aPnt.X(), aPnt.Y() );
- if ( thePoints.contains( aPointIndex ) )
- aListToSelect.Append( anAIS );
- }
+ CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints );
- aViewer->setObjectsSelected( aListToSelect );
updateLocalPointView();
}
+void CurveCreator_Widget::stopActionMode()
+{
+ setActionMode( NoneMode );
+}
+
/**
* Get viewer information before perform the curve modification.
* Take a list of selected cuve points an close local context.
* \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_ICurve::SectionToPointList& thePoints,
+ const bool theFillPoints )
{
if ( theFillPoints ) {
thePoints.clear();
- int aSectionId = 0;
- getSelectedPonts( aSectionId, thePoints );
+ getSelectedPoints( 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_ICurve::SectionToPointList& thePoints )
{
- setLocalPointContext( true );
- int aSectionId = 0;
- setSelectedPonts( aSectionId, thePoints );
+ if ( getActionMode() == ModificationMode )
+ setLocalPointContext( true );
+ setSelectedPoints( thePoints );
+ updateUndoRedo();
}
/**
*/
int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY )
{
- int aPntIndex = -1;
-
- CurveCreator::Coordinates aCoords;
- for ( int i = 0, aNb = myCurve->getNbPoints( theSectionId ); i < aNb && aPntIndex < 0; i++ ) {
- aCoords = myCurve->getPoint( theSectionId, i );
- if ( aCoords.size() < 2 )
- continue;
- if ( fabs( aCoords[0] - theX ) < LOCAL_SELECTION_TOLERANCE &&
- fabs( aCoords[1] - theY ) < LOCAL_SELECTION_TOLERANCE )
- aPntIndex = i;
- }
-
- return aPntIndex;
+ return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY );
}
-/**
- * Checks whether the point belongs to the OCC object
- * \param theObject a line or shape with a bspline inside
- * \param theX the X coordinate in the view.
- * \param theY the Y coordinate in the view.
- * \param thePoint the output point to be append to the model curve
- * \param thePoint1 the output point to bound the line where a new point should be inserted
- * \param thePoint2 the output point to bound the line where a new point should be inserted
- */
-bool CurveCreator_Widget::pointOnObject( Handle(AIS_InteractiveObject) theObject,
- const int theX, const int theY,
- gp_Pnt& thePoint,
- int& thePoint1, int& thePoint2 )
+void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY,
+ CurveCreator_ICurve::SectionToPointList& thePoints )
{
- bool isFound = false;
-
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( theObject.IsNull() || !aViewer )
- return isFound;
+ return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints );
+}
- gp_Pnt aPoint;
- Standard_Real aParameter;
- gp_Pnt aPnt1, aPnt2;
- Handle(AIS_Line) aLine = Handle(AIS_Line)::DownCast( theObject );
- if ( !aLine.IsNull() ) {
- const Handle(Geom_Line) aGLine = aLine->Line();
- isFound = hasProjectPointOnCurve( theX, theY, aGLine, aParameter );
- if ( isFound ) {
- aPoint = aGLine->Value( aParameter );
-
- Handle(Geom_Point) aPStart;
- Handle(Geom_Point) aPEnd;
- aLine->Points( aPStart, aPEnd );
- aPnt1 = aPStart->Pnt();
- aPnt2 = aPEnd->Pnt();
- }
- }
- else {
- Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast( theObject );
- if ( !aShape.IsNull() ) {
- const TopoDS_Wire& aWire = TopoDS::Wire( aShape->Shape() );
- if ( !aWire.IsNull() ) {
- TopExp_Explorer anExp( aWire, TopAbs_EDGE );
- for ( ; anExp.More(); anExp.Next())
- {
- const TopoDS_Edge& anEdge = TopoDS::Edge(anExp.Current());
- if ( !anEdge.IsNull() ) {
- Standard_Real aFirst, aLast;
- Handle(Geom_Curve) aCurve = BRep_Tool::Curve( anEdge, aFirst, aLast );
-
- if ( aCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) ) {
- Handle(Geom_BSplineCurve) aBSplineCurve = Handle(Geom_BSplineCurve)::DownCast( aCurve );
- if ( !aBSplineCurve.IsNull() ) {
- isFound = hasProjectPointOnCurve( theX, theY, aCurve, aParameter );
- if ( isFound ) {
- aPoint = aBSplineCurve->Value( aParameter );
- Standard_Integer anI1, anI2;
- aBSplineCurve->LocateU( aParameter, LOCAL_SELECTION_TOLERANCE, anI1, anI2 );
-
- aPnt1 = aBSplineCurve->Value( aBSplineCurve->Knot( anI1 ) );
- aPnt2 = aBSplineCurve->Value( aBSplineCurve->Knot( anI2 ) );
- }
- }
- }
- }
- }
- }
- }
- }
- if ( isFound ) {
- thePoint = aPoint;
- thePoint1 = findLocalPointIndex( 0, aPnt1.X(), aPnt1.Y() );
- thePoint2 = findLocalPointIndex( 0, aPnt2.X(), aPnt2.Y() );
- isFound = thePoint1 >= 0 && thePoint2 >= 0;
- }
- return isFound;
+void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints,
+ QMap<int, QList<int> >& theConvPoints )
+{
+ return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints );
}
/**
- * Returns whether the clicked point belong to the curve or has a very near projection
- * \param theX the X coordinate of a point clicked in the OCC viewer
- * \param theY the Y coordinate of a point clicked in the OCC viewer
- * \param theCurve a geometry curve
- * \param theOutPoint a found projected point on the curve
+ * Returns whethe the container has the value
+ * \param theList a container of values
+ * \param theValue a value
*/
-bool CurveCreator_Widget::hasProjectPointOnCurve( const int theX, const int theY,
- const Handle(Geom_Curve)& theCurve,
- Standard_Real& theParameter )
+bool CurveCreator_Widget::contains( const CurveCreator_ICurve::SectionToPointList& theList,
+ const CurveCreator_ICurve::SectionToPoint& theValue ) const
{
- bool isFound = false;
- OCCViewer_Viewer* aViewer = getOCCViewer();
- if ( !aViewer )
- return isFound;
-
- OCCViewer_ViewWindow* aWindow =
- (OCCViewer_ViewWindow*)aViewer->getViewManager()->getActiveView();
- Handle(V3d_View) aView = aWindow->getViewPort()->getView();
- gp_Pnt aPoint = CurveCreator_Utils::ConvertClickToPoint( theX, theY, aView );
-
- GeomAPI_ProjectPointOnCurve aProj( aPoint, theCurve );
- Standard_Integer aNbPoint = aProj.NbPoints();
- if (aNbPoint > 0) {
- for (Standard_Integer j = 1; j <= aNbPoint && !isFound; j++) {
- gp_Pnt aNewPoint = aProj.Point( j );
- theParameter = aProj.Parameter( j );
-
- int aX, anY;
- CurveCreator_Utils::ConvertPointToClick( aNewPoint, aView, aX, anY );
-
- int aXDelta = abs( aX - theX );
- int anYDelta = abs( anY - theY );
- isFound = aXDelta < SCENE_PIXEL_TOLERANCE && anYDelta < SCENE_PIXEL_TOLERANCE;
- }
- }
- return isFound;
+ return CurveCreator_UtilsICurve::contains( theList, theValue );
}
