From: nds <nds@opencascade.com>
Date: Wed, 4 Dec 2013 16:14:52 +0000 (+0000)
Subject: Code correction.
X-Git-Tag: BR_hydro_v_0_4~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=df7a511d3770b09ef476dd5f6a6261135f2fb5e1;p=modules%2Fhydro.git

Code correction.
---

diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx
index 8118eca9..01808e2d 100644
--- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx
+++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx
@@ -20,9 +20,7 @@
 #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"
@@ -38,25 +36,6 @@
 #include <OCCViewer_ViewPort3d.h>
 #include "OCCViewer_Utilities.h"
 
-#include <BRep_Tool.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Edge.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Dir.hxx>
-#include <TopExp_Explorer.hxx>
-
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-
-#include <AIS_ListOfInteractive.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <AIS_Shape.hxx>
-#include <AIS_LocalContext.hxx>
-#include <Geom_Point.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_Line.hxx>
-
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
@@ -517,24 +496,6 @@ void CurveCreator_Widget::onModeChanged(bool checked)
   setLocalPointContext( aMode == ModificationMode, true );
 }
 
-void CurveCreator_Widget::onAddNewPoint(const CurveCreator::Coordinates& theCoords)
-{
-  if( !myCurve )
-    return;
-  //myCurve->addPoints(theCoords, mySection, myPointNum );
-  //mySectionView->pointsAdded( mySection, myPointNum );
-  //myPointNum++;
-  QList<int> aSections = mySectionView->getSelectedSections();
-  if( aSections.size() == 0 ){
-    return;
-  }
-  int aSection = aSections[0];
-  myCurve->addPoints(theCoords, aSection); // add to the end of section
-  mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) );
-  updateActionsStates();
-  updateUndoRedo();
-}
-
 void CurveCreator_Widget::onNewSection()
 {
   if( !myCurve )
@@ -636,32 +597,6 @@ void CurveCreator_Widget::onModifySection()
   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 )
@@ -904,10 +839,10 @@ bool CurveCreator_Widget::removeEnabled()
 
 
 //=================================================================================
-// 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;
@@ -925,15 +860,6 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe )
     else
       ic->Select();       // New selection
 
-    /*TopoDS_Shape aShape;
-
-    ic->InitSelected();
-    if ( ic->MoreSelected() )
-      aShape = ic->SelectedShape();
-
-    if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
-      aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
-    else*/
     {
       OCCViewer_ViewPort3d* vp = getViewPort();
       aPnt = CurveCreator_Utils::ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
@@ -945,8 +871,7 @@ void CurveCreator_Widget::onGetCoordsByClick( QMouseEvent* pe )
     if ( myCurve->getDimension() == 3 ) {
       aCoords.push_back( aPnt.Z() );
     }
-    onAddNewPoint(aCoords);
-//    myNewPointEditor->setCoordinates( aCoords );
+    addNewPoint(aCoords);
   }
 }
 
@@ -967,7 +892,7 @@ void CurveCreator_Widget::onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent
       break;
     }
     case AdditionMode: {
-      onGetCoordsByClick( theEvent );
+      addCoordsByClick( theEvent );
       break;
     }
     default:
@@ -1121,6 +1046,21 @@ void CurveCreator_Widget::removePoint()
   finishCurveModification( CurveCreator_ICurve::SectionToPointList() );
 }
 
+void CurveCreator_Widget::addNewPoint(const CurveCreator::Coordinates& theCoords)
+{
+  if( !myCurve )
+    return;
+  QList<int> aSections = mySectionView->getSelectedSections();
+  if( aSections.size() == 0 ){
+    return;
+  }
+  int aSection = aSections[0];
+  myCurve->addPoints(theCoords, aSection); // add to the end of section
+  mySectionView->pointsAdded( aSection, myCurve->getNbPoints( aSection ) );
+  updateActionsStates();
+  updateUndoRedo();
+}
+
 void CurveCreator_Widget::insertPointToSelectedSegment( const int theX,
                                                         const int theY )
 {
diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.h b/src/HYDROCurveCreator/CurveCreator_Widget.h
index 399711e8..f62b5929 100644
--- a/src/HYDROCurveCreator/CurveCreator_Widget.h
+++ b/src/HYDROCurveCreator/CurveCreator_Widget.h
@@ -87,7 +87,6 @@ protected slots:
   void     onModeChanged(bool checked);
   void     onNewSection();
   void     onSelectionChanged();
-  void     onAddNewPoint(const CurveCreator::Coordinates& theCoords);
   void     onAddNewSection();
   void     onEditSection( int theSection );
   void     onModifySection();
@@ -104,7 +103,6 @@ protected slots:
   void     onRedo();
   void     onUndoSettings();
   void     onContextMenu(QPoint thePoint);
-  void     onGetCoordsByClick( QMouseEvent* );
 
   void     onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent );
   void     onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEvent );
@@ -117,6 +115,9 @@ protected slots:
 
   void     onCellChanged( int theRow, int theColumn );
 
+protected:
+  void     addCoordsByClick( QMouseEvent* );
+
 protected:
   enum ActionId{ UNDO_ID, 
                  REDO_ID, 
@@ -156,6 +157,7 @@ private:
 
   void removeSection();
   void removePoint();
+  void addNewPoint(const CurveCreator::Coordinates& theCoords);
   void insertPointToSelectedSegment( const int theXPosition,
                                      const int theYPosition );
   void moveSelectedPoints( const int theXPosition, const int theYPosition );