Merge branch 'BR_H2018_3' into BR_2018_V8_5

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_SplitPolylinesDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx b/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx
index aa70371aac72b4a49798d1c8e364e2146979724c..a6ce1887022474cd89291d391c76544a1d69f075 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx
@@ -19,7 +19,7 @@
 #include <HYDROGUI_SplitPolylinesDlg.h>
 #include <HYDROGUI_ObjComboBox.h>
 #include <HYDROGUI_ObjListBox.h>
-#include <HYDROGUI_Tool.h>
+#include <HYDROGUI_Tool2.h>
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewWindow.h>
 #include <OCCViewer_ViewPort3d.h>
@@ -31,7 +31,6 @@
 #include <QGridLayout>
 #include <QTabWidget>
 #include <QMouseEvent>
-#include <QLineEdit>
 #include <gp_Pnt2d.hxx>
 
 const double MIN_COORD = -1000000;
@@ -48,10 +47,6 @@ HYDROGUI_SplitPolylinesDlg::HYDROGUI_SplitPolylinesDlg( HYDROGUI_Module* theModu
   aLayout->setMargin( 5 );
   aLayout->setSpacing( 5 );
 
-  myName = new QLineEdit( mainFrame() );
-  aLayout->addWidget( new QLabel( tr( "RESULT_NAME" ) ), 0, 0 );
-  aLayout->addWidget( myName, 0, 1 );
-
   myTab = new QTabWidget( aFrame );
   aLayout->addWidget( myTab, 1, 0, 1, 2 );
 
@@ -149,6 +144,7 @@ void HYDROGUI_SplitPolylinesDlg::setPolylinesFromSelection()
 {
   myMainPolyline1->reset();
   myMainPolyline2->reset();
+  myToolPolyline->reset();
   myPolylines->reset();
 
   Handle( HYDROData_Entity ) anObject = HYDROGUI_Tool::GetSelectedObject( module() );
@@ -189,8 +185,3 @@ OCCViewer_ViewPort3d* HYDROGUI_SplitPolylinesDlg::getViewPort() const
     
   return aViewPort;
 }
-
-QString HYDROGUI_SplitPolylinesDlg::GetResultName() const
-{
-  return myName->text();
-}