Salome HOME
another z layer for hilight presentation
[modules/hydro.git] / src / HYDROCurveCreator / CurveCreator_Widget.cxx
index 5aea503571e5054bbcef4836ba7e09f518eae8d1..b595c2217d16d73f6481aae0e861c8dc92027260 100644 (file)
 #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 <GEOMUtils.hxx>
+#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 <AIS_ListOfInteractive.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <AIS_Shape.hxx>
-#include <AIS_Point.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-//#include <StdSelect_BRepOwner.hxx>
+#include "OCCViewer_Utilities.h"
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QMouseEvent>
 #include <QApplication>
 #include <QTableWidget>
+#include <QTime>
 
-#define LOCAL_SELECTION_TOLERANCE 0.0001
+//#define MEASURE_TIME
 
-CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
-                                         CurveCreator_ICurve *theCurve,
-                                         Qt::WindowFlags fl) :
-    QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0)
-{
-    myNewSectionEditor = new CurveCreator_NewSectionDlg( this );
-    myNewSectionEditor->hide();
-    connect( myNewSectionEditor, SIGNAL(addSection()), this, SLOT(onAddNewSection()) );
-    connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) );
-    connect( myNewSectionEditor, SIGNAL(cancelSection()), this, SLOT(onCancelSection()) );
-
-    QGroupBox* aSectionGroup = new QGroupBox(tr("Sections"),this);
-
-    mySectionView = new CurveCreator_TreeView(myCurve, aSectionGroup);
-    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 );
-    QStringList aLabels;
-    //aLabels << tr( "IDENTIFIER_LABEL" ) << tr( "X_POSITION_LBL" ) << tr( "Y_POSITION_LBL" );
-    aLabels << tr( "id" ) << tr( "X" ) << tr( "Y" );
-    myLocalPointView->setHorizontalHeaderLabels( aLabels );
-    connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ),
-             this, SLOT( onLocalPointChanged( int, int ) ) );
-
-    QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup);
-//    QToolButton* anUndoBtn = new QToolButton(aTB);
+#ifdef MEASURE_TIME
 
-    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-    QPixmap anUndoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_UNDO")));
-    QPixmap aRedoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_REDO")));
-    QPixmap aNewSectionPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_SECTION")));
-    QPixmap aNewPointPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_POINT")));
-    QPixmap anEditPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS")));
-    QPixmap aDetectPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS")));
-    QPixmap aPolylinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_POLYLINE")));
-    QPixmap aSplinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_SPLINE")));
-    QPixmap aRemovePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_DELETE")));
-    QPixmap aJoinPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_JOIN")));
-    QPixmap aStepUpPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_UP")));
-    QPixmap aStepDownPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_DOWN")));
-
-    QAction* anAct = createAction( UNDO_ID, tr("UNDO"), anUndoPixmap, tr("UNDO_TLT"), 
-                                   QKeySequence(Qt::ControlModifier|Qt::Key_Z) );
-    connect(anAct, SIGNAL(triggered()), this, SLOT(onUndo()) );
-    aTB->addAction(anAct);
+  #define START_MEASURE_TIME \
+    QTime aTimer;            \
+    aTimer.start();          \
 
-    anAct = createAction( REDO_ID, tr("REDO"), aRedoPixmap, tr("REDO_TLT"), 
-                          QKeySequence(Qt::ControlModifier|Qt::Key_Y) );
-    connect(anAct, SIGNAL(triggered()), this, SLOT(onRedo()) );
-    aTB->addAction(anAct);
+  #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 );                                      \
 
-    aTB->addSeparator();
+#else
 
-    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();
+  #define START_MEASURE_TIME
+  #define END_MEASURE_TIME( theMsg )
 
-    anAct = createAction( ADDITION_MODE_ID, tr("ADDITION_MODE"), aNewPointPixmap, tr("ADDITION_MODE_TLT"), 
-                          QKeySequence() );
-    anAct->setCheckable(true);
-    connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onAdditionMode(bool)) );
-    connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) );
-    aTB->addAction(anAct);
-    
-    anAct = createAction( MODIFICATION_MODE_ID, tr("MODIFICATION_MODE"), anEditPointsPixmap, tr("MODIFICATION_MODE_TLT"), 
-                          QKeySequence() );
-    anAct->setCheckable(true);
-    connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onModificationMode(bool)) );
-    connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) );
-    aTB->addAction(anAct);
+#endif
 
-    anAct = createAction( DETECTION_MODE_ID, tr("DETECTION_MODE"), aDetectPointsPixmap, tr("DETECTION_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);
 
-    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()) );
 
-    anAct = createAction( UNCLOSE_SECTIONS_ID, tr("UNCLOSE_SECTIONS"), QPixmap(), 
-                          tr("UNCLOSE_SECTIONS_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_S) );
-    connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) );
 
-    anAct = createAction( SET_SECTIONS_POLYLINE_ID, tr("SET_SECTIONS_POLYLINE"), 
-                          aPolylinePixmap, tr("SET_POLYLINE_TLT"), 
-                          QKeySequence(Qt::ControlModifier|Qt::Key_E) );
-    connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) );
 
-    anAct = createAction( SET_SECTIONS_SPLINE_ID, tr("SET_SECTIONS_SPLINE"), aSplinePixmap, 
-                          tr("SET_SPLINE_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_R) );
-    connect(anAct, SIGNAL(triggered()), this, SLOT(onSetSpline()) );
 
-    anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"), 
-                          QKeySequence(Qt::ControlModifier|Qt::Key_Delete ) );
-    connect(anAct, SIGNAL(triggered()), this, SLOT(onRemove()) );
-    aTB->addAction(anAct);
-    aTB->addSeparator();
+CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
+                                         CurveCreator_ICurve *theCurve,
+                                         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 )
+{
+  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()) );
+  connect( myNewSectionEditor, SIGNAL(cancelSection()), this, SLOT(onCancelSection()) );
+
+  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 CurveCreator_TableView( myCurve, this, theCoordTitles );
+  connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ),
+           this, SLOT( onCellChanged( int, int ) ) );
+
+  QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup);
+//    QToolButton* anUndoBtn = new QToolButton(aTB);
 
-    anAct = createAction( JOIN_ID, tr("JOIN"), aJoinPixmap, tr("JOIN_TLT"), 
-                          QKeySequence(Qt::ControlModifier|Qt::Key_Plus ) );
-    connect( anAct, SIGNAL(triggered()), this, SLOT(onJoin()) );
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap anUndoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_UNDO")));
+  QPixmap aRedoPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_REDO")));
+  QPixmap aNewSectionPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_SECTION")));
+  QPixmap aNewPointPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_NEW_POINT")));
+  QPixmap anEditPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS")));
+  QPixmap aDetectPointsPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_EDIT_POINTS")));
+  QPixmap aPolylinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_POLYLINE")));
+  QPixmap aSplinePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_SPLINE")));
+  QPixmap aRemovePixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_DELETE")));
+  QPixmap aJoinPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_JOIN")));
+  QPixmap aStepUpPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_UP")));
+  QPixmap aStepDownPixmap(aResMgr->loadPixmap("GEOM", tr("ICON_CC_ARROW_DOWN")));
+
+  QAction* anAct = createAction( UNDO_ID, tr("UNDO"), anUndoPixmap, tr("UNDO_TLT"), 
+                                 QKeySequence(Qt::ControlModifier|Qt::Key_Z) );
+  connect(anAct, SIGNAL(triggered()), this, SLOT(onUndo()) );
+  aTB->addAction(anAct);
+
+  anAct = createAction( REDO_ID, tr("REDO"), aRedoPixmap, tr("REDO_TLT"), 
+                        QKeySequence(Qt::ControlModifier|Qt::Key_Y) );
+  connect(anAct, SIGNAL(triggered()), this, SLOT(onRedo()) );
+  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()) );
+  if ( !(theActionFlags & DisableNewSection) ) {
     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 ) );
-    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()) );
-
-    QVBoxLayout* aSectLayout = new QVBoxLayout();
-    aSectLayout->setMargin( 5 );
-    aSectLayout->setSpacing( 5 );
-    aSectLayout->addWidget(aTB);
-    aSectLayout->addWidget(mySectionView);
-    aSectLayout->addWidget( myLocalPointView );
-    aSectionGroup->setLayout(aSectLayout);
-    QVBoxLayout* aLay = new QVBoxLayout();
-    aLay->setMargin( 0 );
-    aLay->setSpacing( 5 );
+  anAct = createAction( ADDITION_MODE_ID, tr("ADDITION_MODE"), aNewPointPixmap, tr("ADDITION_MODE_TLT"), 
+                        QKeySequence() );
+  anAct->setCheckable(true);
+  connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onAdditionMode(bool)) );
+  connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) );
+  aTB->addAction(anAct);
+  
+  anAct = createAction( MODIFICATION_MODE_ID, tr("MODIFICATION_MODE"), anEditPointsPixmap, tr("MODIFICATION_MODE_TLT"), 
+                        QKeySequence() );
+  anAct->setCheckable(true);
+  connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onModificationMode(bool)) );
+  connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) );
+  aTB->addAction(anAct);
+
+  anAct = createAction( DETECTION_MODE_ID, tr("DETECTION_MODE"), aDetectPointsPixmap, tr("DETECTION_MODE_TLT"), 
+                        QKeySequence() );
+  anAct->setCheckable(true);
+  connect(anAct, SIGNAL(triggered(bool)), this, SLOT(onDetectionMode(bool)) );
+  connect(anAct, SIGNAL(toggled(bool)), this, SLOT(onModeChanged(bool)) );
+  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()) );
+
+  anAct = createAction( UNCLOSE_SECTIONS_ID, tr("UNCLOSE_SECTIONS"), QPixmap(), 
+                        tr("UNCLOSE_SECTIONS_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_S) );
+  connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) );
+
+  anAct = createAction( SET_SECTIONS_POLYLINE_ID, tr("SET_SECTIONS_POLYLINE"), 
+                        aPolylinePixmap, tr("SET_POLYLINE_TLT"), 
+                        QKeySequence(Qt::ControlModifier|Qt::Key_E) );
+  connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) );
+
+  anAct = createAction( SET_SECTIONS_SPLINE_ID, tr("SET_SECTIONS_SPLINE"), aSplinePixmap, 
+                        tr("SET_SPLINE_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_R) );
+  connect(anAct, SIGNAL(triggered()), this, SLOT(onSetSpline()) );
+
+  anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"), 
+                        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);
+
+  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()) );
+
+  QVBoxLayout* aSectLayout = new QVBoxLayout();
+  aSectLayout->setMargin( 5 );
+  aSectLayout->setSpacing( 5 );
+  aSectLayout->addWidget(aTB);
+  aSectLayout->addWidget(mySectionView);
+  aSectLayout->addWidget( myLocalPointView );
+  aSectionGroup->setLayout(aSectLayout);
+  QVBoxLayout* aLay = new QVBoxLayout();
+  aLay->setMargin( 0 );
+  aLay->setSpacing( 5 );
 //    aLay->addLayout(aNameLayout);
-    aLay->addWidget(aSectionGroup);
-    setLayout(aLay);
-    onSelectionChanged();
-
-    /*OCCViewer_Viewer* anOCCViewer = getOCCViewer();
-    if (anOCCViewer) {
-      OCCViewer_ViewWindow* aWnd = dynamic_cast<OCCViewer_ViewWindow*>(anOCCViewer->getViewManager()->getActiveView());
-      if ( aWnd )
-        aWnd->installEventFilter( this );
-    }*/
+  aLay->addWidget(aSectionGroup);
+  setLayout(aLay);
+
+  updateActionsStates();
+  updateUndoRedo();
 }
 
-//=======================================================================
-// function: getUniqSectionName
-// purpose: return unique section name
-//=======================================================================
+/**
+ * Set an OCC viewer
+ */
+void CurveCreator_Widget::setOCCViewer( OCCViewer_Viewer* theViewer )
+{
+  if ( myOCCViewer == theViewer )
+    return;
+
+  if ( myOCCViewer ) {
+    OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
+                                                    ( myOCCViewer->getViewManager() );
+    disconnect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+           this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+    disconnect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ),
+           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_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
+                                                    ( myOCCViewer->getViewManager() );
+    connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+           this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+    connect( aViewManager, SIGNAL( mouseRelease( 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 );
+  }
+}
+
+/**
+ * Returns current OCC viewer
+ */
 OCCViewer_Viewer* CurveCreator_Widget::getOCCViewer()
 {
-  OCCViewer_Viewer* anOCCViewer = 0;
+  return myOCCViewer;
+}
 
-  OCCViewer_ViewWindow* aViewWindow = 0;
-  SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
-  if ( activeStudy )
-    aViewWindow = dynamic_cast<OCCViewer_ViewWindow*>(SUIT_Session::session()->activeApplication()->desktop()->activeWindow());
-  if ( aViewWindow == 0 )
-    return anOCCViewer;
-  OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>(aViewWindow->getViewManager());
-  if ( aViewManager == 0 )
-    return anOCCViewer;
+/**
+ * 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;
+}
 
-  anOCCViewer = aViewManager->getOCCViewer();
-  return anOCCViewer;
+/**
+ * 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;
 }
 
-/*!
-  \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 )
+/**
+ * Set interaction style in the OCC viewer
+ * \param theStyle a new style
+ * \return the previous style
+ */
+int CurveCreator_Widget::changeInteractionStyle( int theStyle )
 {
-  OCCViewer_Viewer* anOCCViewer = getOCCViewer();
-  Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext();
-  bool isLocalContext = aContext->HasOpenedContext();
-  if ( !isLocalContext )
-    return QWidget::eventFilter( theWatched, theEvent );
+  OCCViewer_Viewer* aViewer = getOCCViewer();
+  if ( !aViewer )
+    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:{
@@ -292,29 +354,47 @@ void CurveCreator_Widget::onSelectionChanged()
         anEnabledAct << UP_ID;
       }*/
       if( aSelSections.size() == 1 ){
-        anEnabledAct << ADDITION_MODE_ID << MODIFICATION_MODE_ID << DETECTION_MODE_ID;
+        anEnabledAct << ADDITION_MODE_ID << DETECTION_MODE_ID;
       }
-      if (myActionMap[ADDITION_MODE_ID]->isChecked()) {
-        mySection = -1;
-        myPointNum = -1;
-        QList<int> aSelSection = mySectionView->getSelectedSections();
-        if( aSelSection.size() > 0 ){
-          mySection = aSelSection[0];
-          myPointNum = myCurve->getNbPoints(mySection);
+      switch ( getActionMode() ) {
+        case AdditionMode: {
+          mySection = -1;
+          myPointNum = -1;
+          QList<int> aSelSection = mySectionView->getSelectedSections();
+          if( aSelSection.size() > 0 ){
+            mySection = aSelSection[0];
+            myPointNum = myCurve->getNbPoints(mySection);
+          }
+        }
+        break;
+        case ModificationMode: {
+          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;
+          if( aSectCnt > 1 )
+            anEnabledAct << JOIN_ALL_ID;
+          if( aSelSections.size() > 1 ){
+            anEnabledAct << JOIN_ID;
+          }
         }
-      } else if (myActionMap[MODIFICATION_MODE_ID]->isChecked()) {
-        anEnabledAct << REMOVE_ID;
-        anEnabledAct << CLOSE_SECTIONS_ID << UNCLOSE_SECTIONS_ID << SET_SECTIONS_POLYLINE_ID << SET_SECTIONS_SPLINE_ID;
-        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;
+        break;
+        case DetectionMode: {
         }
-      } else if (myActionMap[DETECTION_MODE_ID]->isChecked()) {
-      } else { //no active mode
+        break;
+        case NoneMode:
+          {
+            int aSectCnt = myCurve->getNbSections();
+            if( aSectCnt > 1 )
+              anEnabledAct << JOIN_ALL_ID;
+            if( aSelSections.size() > 1 )
+              anEnabledAct << JOIN_ID;
+          }
+          break;
+        default:
+        break;
       }
       /*if( aSelSections[ aSelSections.size() - 1 ] < ( myCurve->getNbSections() - 1 ) ){
         anEnabledAct << DOWN_ID;
@@ -360,34 +440,16 @@ void CurveCreator_Widget::onSelectionChanged()
       }
     }
   }
-  emit selectionChanged();
 }
 
 void CurveCreator_Widget::onAdditionMode(bool checked)
 {
-  if( !myCurve )
+  if (!checked)
+    return;
+
+  Handle(AIS_InteractiveContext) aContext = getAISContext();
+  if( !myCurve || aContext.IsNull() )
     return;
-  OCCViewer_Viewer* anOCCViewer = getOCCViewer();
-  Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext();
-  OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
-                                                    (anOCCViewer->getViewManager());
-//  if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) {
-  if( anOCCViewer ) {
-    if (checked) {
-/*      myGuiState = aViewWindow->saveState();
-      anOCCViewer->enableMultiselection(false);
-      anOCCViewer->enableSelection(false);*/
-      connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
-             this, SLOT( onGetCoordsByClick( SUIT_ViewWindow*, QMouseEvent* ) ) );
-    } else {
-      disconnect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
-             this, SLOT( onGetCoordsByClick( SUIT_ViewWindow*, QMouseEvent* ) ) );
-/*      anOCCViewer->enableMultiselection(true);
-      anOCCViewer->enableSelection(true);
-      aViewWindow->restoreState( myGuiState );*/
-      return;
-    }
-  }
 
   mySection= -1;
   myPointNum = -1;
@@ -395,51 +457,12 @@ void CurveCreator_Widget::onAdditionMode(bool checked)
   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 );
 }
 
 void CurveCreator_Widget::onModificationMode(bool checked)
 {
   myLocalPointView->setVisible( checked );
-  OCCViewer_Viewer* anOCCViewer = getOCCViewer();
-  OCCViewer_ViewManager* aViewManager = dynamic_cast<OCCViewer_ViewManager*>
-                                                    (anOCCViewer->getViewManager());
-/*
-  SUIT_ViewWindow* aViewWindow = 0;
-  SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
-  if ( activeStudy )
-    aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
-  if ( aViewWindow == 0 )
-    return;
-  SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();*/
-  if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) {
-    if (checked) {
-      connect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ),
-             this, SLOT( onPointSelect( SUIT_ViewWindow*, QMouseEvent* ) ) );
-      connect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
-             this, SLOT( onPointDrag( SUIT_ViewWindow*, QMouseEvent* ) ) );
-    }
-    else {
-      disconnect( aViewManager, SIGNAL( mouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ),
-             this, SLOT( onPointSelect( SUIT_ViewWindow*, QMouseEvent* ) ) );
-      disconnect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
-             this, SLOT( onPointDrag( SUIT_ViewWindow*, QMouseEvent* ) ) );
-      return;
-    }
-  }
-  //NDS OCCViewer_ViewWindow* anOCCWnd = dynamic_cast<OCCViewer_ViewWindow*>(aViewWindow);
-  //anOCCWnd->activateStartPointSelection();
-    // activate selection ------>
-  //OCCViewer_Viewer* anOCCViewer = dynamic_cast<OCCViewer_Viewer*>(aViewManager->getViewModel());
-
-  setLocalPointContext( true );
 }
 
 void CurveCreator_Widget::onDetectionMode(bool checked)
@@ -448,23 +471,26 @@ 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())
@@ -472,41 +498,35 @@ void CurveCreator_Widget::onModeChanged(bool checked)
         break;
     }
   }
-  onSelectionChanged();
-}
-
-void CurveCreator_Widget::onAddNewPoint(const CurveCreator::Coordinates& theCoords)
-{
-  if( !myCurve )
-    return;
-  myCurve->addPoints(theCoords, mySection, myPointNum );
-  mySectionView->pointsAdded( mySection, myPointNum );
-  myPointNum++;
-  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();
 }
@@ -529,17 +549,41 @@ QAction* CurveCreator_Widget::createAction( ActionId theId, const QString& theNa
   return anAct;
 }
 
-QAction* CurveCreator_Widget::getAction(ActionId theId)
+QAction* CurveCreator_Widget::getAction( ActionId theId )
 {
   if( myActionMap.contains(theId) )
     return myActionMap[theId];
   return NULL;
 }
 
+QAction* CurveCreator_Widget::getAction( ActionMode theMode )
+{
+  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);
@@ -547,7 +591,7 @@ void CurveCreator_Widget::onEditSection( int theSection )
   myNewSectionEditor->setEditMode(true);
   myNewSectionEditor->setSectionParameters( aSectName, isClosed, aType );
 
-  emit subOperationStarted( myNewSectionEditor );
+  emit subOperationStarted( myNewSectionEditor, true );
 }
 
 void CurveCreator_Widget::onModifySection()
@@ -557,42 +601,19 @@ 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 )
@@ -601,18 +622,28 @@ void CurveCreator_Widget::onJoin()
   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] );
   }
-//  myCurve->finishOperation();
+  //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 );
+  }
+
+  /* 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();
 }
 
@@ -620,38 +651,27 @@ void CurveCreator_Widget::onRemove()
 {
   if( !myCurve )
     return;
-  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++;
-  }
-  QList<int> aSections = mySectionView->getSelectedSections();
-  for( int i = 0 ; i < aSections.size() ; i++ ){
-    int aSectNum = aSections[i] - (i);
-    myCurve->removeSection( aSectNum );
-    mySectionView->sectionsRemoved( aSectNum );
+
+  switch( getActionMode() ) {
+    case NoneMode:
+      removeSection();
+    break;
+    case ModificationMode:
+      removePoint();
+    break;
+    default:
+      break;
   }
-//  myCurve->finishOperation();
-  mySectionView->clearSelection();
-  updateUndoRedo();
 }
 
 void CurveCreator_Widget::onClearAll()
 {
   if( !myCurve )
     return;
+  stopActionMode();
   myCurve->clear();
   mySectionView->reset();
-  onSelectionChanged();
+  updateActionsStates();
   updateUndoRedo();
 }
 
@@ -659,9 +679,16 @@ void CurveCreator_Widget::onJoinAll()
 {
   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();
 }
 
@@ -674,13 +701,12 @@ void CurveCreator_Widget::onSetSpline()
 {
   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();
 }
 
@@ -688,13 +714,12 @@ void CurveCreator_Widget::onSetPolyline()
 {
   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();
 }
 
@@ -702,13 +727,12 @@ void CurveCreator_Widget::onCloseSections()
 {
   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();
 }
 
@@ -716,13 +740,12 @@ void CurveCreator_Widget::onUncloseSections()
 {
   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();
 }
 
@@ -730,46 +753,53 @@ void CurveCreator_Widget::onUndo()
 {
     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 )
 {
   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);
@@ -810,25 +840,99 @@ QList<int> CurveCreator_Widget::getSelectedSections()
   return mySectionView->getSelectedSections();
 }
 
-QList< QPair< int, int > > CurveCreator_Widget::getSelectedPoints()
+void CurveCreator_Widget::setSelectedSections( const QList<int>& theSections )
 {
-  return mySectionView->getSelectedPoints();
+  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()
+{
+  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( SUIT_ViewWindow* theViewWindow, QMouseEvent* pe )
+void CurveCreator_Widget::addCoordsByClick( QMouseEvent* pe )
 {
   if (pe->button() != Qt::LeftButton)
     return;
 
-  if ( theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
-       pe->modifiers() != Qt::ControlModifier ) {
-    OCCViewer_Viewer* anOCCViewer =
-      ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer();
-    Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
+  if ( pe->modifiers() != Qt::ControlModifier ) {
+    Handle(AIS_InteractiveContext) ic = getAISContext();
+    if ( ic.IsNull() )
+      return;
 
     gp_Pnt aPnt;    
 
@@ -838,18 +942,9 @@ void CurveCreator_Widget::onGetCoordsByClick( SUIT_ViewWindow* theViewWindow, QM
     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*)theViewWindow)->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;
@@ -858,231 +953,507 @@ void CurveCreator_Widget::onGetCoordsByClick( SUIT_ViewWindow* theViewWindow, QM
     if ( myCurve->getDimension() == 3 ) {
       aCoords.push_back( aPnt.Z() );
     }
-    onAddNewPoint(aCoords);
-//    myNewPointEditor->setCoordinates( aCoords );
+    addNewPoint(aCoords);
   }
 }
 
-//=================================================================================
-// function : HYDROGUI_PolylineOp::onPointSelect()
-// purpose  : Manage mouse press events in Modification mode
-//=================================================================================
-void CurveCreator_Widget::onPointSelect( SUIT_ViewWindow* theViewWindow, QMouseEvent* pe )
+/**
+ * Manage mouse press events
+ * \param theWindow an owner of the signal
+ * \param theEvent a mouse event
+ */
+void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent )
 {
-  //store initial cursor position for Drag&Drop
-  if (pe->button() == Qt::LeftButton)
-    myDragStartPosition = pe->pos();
-  
-  //gp_Pnt aPnt;
-  OCCViewer_Viewer* anOCCViewer = 
-      ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer();
-  Handle(AIS_InteractiveContext) aContext = anOCCViewer->getAISContext();
-  
-  //ic->InitSelected();
-  //if ( pe->modifiers() == Qt::ShiftModifier )
-  //  ic->ShiftSelect();  // Append selection
-  //else
-  //  ic->Select();       // New selection
-  
-  /*ic->InitSelected();
-  if ( ic->MoreSelected() ) {
-    TopoDS_Shape aShape = ic->SelectedShape();
-    Standard_Boolean hasdet = ic->HasDetectedShape();
-    Standard_Boolean hassel = ic->HasSelectedShape();
-    Standard_Integer nbcur = ic->NbCurrents();
-    Standard_Integer nbsel = ic->NbSelected();
-    if(!aShape.IsNull())
-      if ( aShape.ShapeType() == TopAbs_VERTEX )
-        aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
+  if ( theEvent->button() != Qt::LeftButton )
+    return;
+
+  myPressedX = theEvent->x();
+  myPressedY = theEvent->y();
+
+  switch( getActionMode() ) {
+    case ModificationMode: {
+      //store initial cursor position for Drag&Drop
+      setDragStarted( true, theEvent->pos() );
+      break;
+    }
+    case AdditionMode: {
+      addCoordsByClick( theEvent );
+      break;
+    }
+    default:
+      break;
   }
-  
-  Qt::KeyboardModifiers modifiers = pe->modifiers();
-//  aSketcherDlg->OnPointSelected( modifiers, aPnt );  // "feed" the point to point construction dialog*/
+}
+
+/**
+ * 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 ) {
+    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
+  {
+    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::onPointDrag()
-// purpose  : Manage mouse move events in Modification mode
-//=================================================================================
-void CurveCreator_Widget::onPointDrag( SUIT_ViewWindow* theViewWindow, QMouseEvent* pe )
+/**
+ * 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 ( !(pe->buttons() & Qt::LeftButton) )
+  if ( getActionMode() != ModificationMode || !myDragStarted )
     return;
-  if ( (pe->pos() - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() )
+
+  QPoint aPos = theEvent->pos();
+  if ( (aPos - myDragStartPosition).manhattanLength() < QApplication::startDragDistance() )
     return;
-/*  
-  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);
-  */
+
+  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 )
 {
-  setLocalPointContext( false );
+  myOCCViewer = 0;
+}
 
-  QList<int> aSelSections = mySectionView->getSelectedSections();
+void CurveCreator_Widget::onMousePress( QMouseEvent* theEvent )
+{
+  onMousePress( 0, theEvent );
+}
+
+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 = 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 = aSelSections[i];
+  aChangedPos.push_back( aX );
+  aChangedPos.push_back( anY );
+  myCurve->setPoint( aCurrSect, aPntIndex, aChangedPos );
 
-    aPrevX = myLocalPointView->item( theRow, 1 )->data( Qt::UserRole ).toDouble();
-    aPrevY = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble();
+  finishCurveModification( aSelPoints );
+}
 
-    aPntIndex = findLocalPointIndex( aCurrSect, aPrevX, aPrevY );
-    if ( aPntIndex < 0 )
-      continue;
+/**
+ * Removes a selected section from the curve. Updates undo/redo status
+ */
+void CurveCreator_Widget::removeSection()
+{
+  stopActionMode();
 
-    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 );
+  QList<int> aSections = mySectionView->getSelectedSections();
+  for( int i = 0 ; i < aSections.size() ; i++ ){
+    int aSectNum = aSections[i] - (i);
+    myCurve->removeSection( aSectNum );
+    mySectionView->sectionsRemoved( aSectNum );
   }
-  updateLocalPointView();
+  mySectionView->clearSelection();
+  updateUndoRedo();
+}
+
+/**
+ * Removes a selected points from the curve. Updates undo/redo status
+ */
+void CurveCreator_Widget::removePoint()
+{
+  CurveCreator_ICurve::SectionToPointList aPoints;
+  getSelectedPoints( aPoints );
+  if ( aPoints.size() == 0 )
+    return;
+
+  CurveCreator_ICurve::SectionToPointList aSelPoints;
+  startCurveModification( aSelPoints, false );
 
-  setLocalPointContext( true );
+  myCurve->removeSeveralPoints( aPoints );
+  finishCurveModification( CurveCreator_ICurve::SectionToPointList() );
 }
 
-int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY )
+void CurveCreator_Widget::addNewPoint(const CurveCreator::Coordinates& theCoords)
+{
+  if( !myCurve )
+    return;
+  QList<int> aSections = mySectionView->getSelectedSections();
+  if( aSections.size() == 0 ){
+    return;
+  }
+  int aSection = aSections[0];
+  myCurve->addPoints(theCoords, aSection); // add to the end of section
+  mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) );
+  updateActionsStates();
+  updateUndoRedo();
+}
+
+void CurveCreator_Widget::insertPointToSelectedSegment( const int theX,
+                                                        const int theY )
 {
-  int aPntIndex = -1;
+  Handle(AIS_InteractiveContext) aContext = getAISContext();
+
+  OCCViewer_ViewPort3d* aViewPort = getViewPort();
+  Handle(V3d_View) aView;
+  if ( aViewPort )
+    aView = aViewPort->getView();
+
+  if ( aContext.IsNull() || aView.IsNull() )
+    return;
+  gp_Pnt aPoint;
+  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
+  CurveCreator_ICurve::SectionToPointList aSelPoints;
+  startCurveModification( aSelPoints );
 
   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 )
+  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( 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 );
+
+  setSelectedPoints();
+}
+
+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;
-    if ( fabs( aCoords[0] - theX ) < LOCAL_SELECTION_TOLERANCE &&
-         fabs( aCoords[1] - theY ) < LOCAL_SELECTION_TOLERANCE )
-      aPntIndex = i;
+
+    // Remember drag points coordinates
+    if ( !myDragged ) {
+      myInitialDragPointsCoords.insert( std::make_pair( aSectionId, aPointId ), aChangedPos );
+    }
+
+    aChangedPos[0] = aChangedPos[0] - aXDelta;
+    aChangedPos[1] = aChangedPos[1] - anYDelta;
+    
+    aCoordList.push_back(
+      std::make_pair(std::make_pair( aSectionId, aPointId ), 
+                     aChangedPos ));
   }
+  myCurve->setSeveralPoints( aCoordList, false );
 
-  return aPntIndex;
+  myDragged = true;
+  finishCurveModification( myDragPoints );
 }
 
 void CurveCreator_Widget::updateLocalPointView()
 {
-  OCCViewer_Viewer* anOCCViewer = getOCCViewer();
-  if ( !anOCCViewer )
+  if ( myDragStarted )
     return;
-  Handle(AIS_InteractiveContext) aContext = anOCCViewer->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 )
+/**
+ * 
+ */
+void CurveCreator_Widget::setLocalPointContext( const bool theOpen, const bool isUpdateTable )
 {
-  OCCViewer_Viewer* anOCCViewer = getOCCViewer();
-  Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
+  CurveCreator_Utils::setLocalPointContext( myCurve, getAISContext(), theOpen );
+  if ( !theOpen && isUpdateTable )
+    updateLocalPointView();
+}
 
-  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;
+/**
+ * Set drag operation started. Save the position and a list of dragged points
+ * \param theState the drag operation state: started/finished
+ * \param thePoint the start drag position
+ */
+void CurveCreator_Widget::setDragStarted( const bool theState, const QPoint& thePoint )
+{
+  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 {
-    ic->CloseAllContexts();
+    if ( myDragStarted )
+      changeInteractionStyle( myDragInteractionStyle );
+    myDragStarted = false;
+    myDragPoints.clear();
+    myInitialDragPointsCoords.clear();
   }
+  myDragged = false;
 }
 
-void CurveCreator_Widget::addLocalPointToTable( const double theX, const double theY )
+void CurveCreator_Widget::getSelectedPoints( CurveCreator_ICurve::SectionToPointList& thePoints )
 {
-  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;
+  thePoints.clear();
+  thePoints = myLocalPoints;
+}
+
+void CurveCreator_Widget::setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& thePoints )
+{
+  if ( myDragStarted )
+    return;
+  Handle(AIS_InteractiveContext) aContext = getAISContext();
+  if ( aContext.IsNull() || !aContext->HasOpenedContext() )
+    return;
+
+  CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints );
+
+  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.
+ * 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();
+    getSelectedPoints( thePoints );
   }
-  QTableWidgetItem* anItem;
+  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 );
+  setSelectedPoints( thePoints );
+  updateUndoRedo();
+}
 
-  myLocalPointView->setRowCount( aRowId+1 );
-  myLocalPointView->setItem( aRowId, 0, new QTableWidgetItem( QString::number( aRowId + 1 ) ) );
+/**
+ * Returns a point index in the model curve by the point coordinates in the viewer
+ * \param theX the X coordinate of the point
+ * \param theY the Y coordinate of the point
+ */
+int CurveCreator_Widget::findLocalPointIndex( int theSectionId, float theX, float theY )
+{
+  return CurveCreator_UtilsICurve::findLocalPointIndex( myCurve, theSectionId, theX, theY );
+}
+
+void CurveCreator_Widget::findSectionsToPoints( const double theX, const double theY,
+                                 CurveCreator_ICurve::SectionToPointList& thePoints )
+{
+  return CurveCreator_UtilsICurve::findSectionsToPoints( myCurve, theX, theY, thePoints );
+}
 
-  anItem = new QTableWidgetItem( QString::number( theX ) );
-  anItem->setData( Qt::UserRole, theX );
-  myLocalPointView->setItem( aRowId, 1, anItem );
+void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList& thePoints,
+                                   QMap<int, QList<int> >& theConvPoints )
+{
+  return CurveCreator_UtilsICurve::convert( thePoints, theConvPoints );
+}
 
-  anItem = new QTableWidgetItem( QString::number( theY ) );
-  anItem->setData( Qt::UserRole, theY );
-  myLocalPointView->setItem( aRowId, 2, anItem );
-}
\ No newline at end of file
+/**
+ * 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 );
+}