Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

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

diff --git a/src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx b/src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
index 39bbcc1a0bd8595cd2764cbdf19d42936b3af7aa..5035aae9a265dc29f4da0942df82516beba49ef0 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
@@ -19,7 +19,9 @@
 #include <HYDROGUI_MergePolylinesDlg.h>
 #include <HYDROGUI_ObjListBox.h>
 #include <QFrame>
+#include <QLabel>
 #include <QGridLayout>
+#include <QLineEdit>
 
 HYDROGUI_MergePolylinesDlg::HYDROGUI_MergePolylinesDlg( HYDROGUI_Module* theModule, const QString& theTitle )
 : HYDROGUI_InputPanel( theModule, theTitle )
@@ -31,8 +33,12 @@ HYDROGUI_MergePolylinesDlg::HYDROGUI_MergePolylinesDlg( 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 );
+
   myList = new HYDROGUI_ObjListBox( theModule, tr( "POLYLINES" ), KIND_POLYLINEXY, mainFrame() );
-  aLayout->addWidget( myList, 0, 0 );
+  aLayout->addWidget( myList, 1, 0, 1, 2 );
 }
 
 HYDROGUI_MergePolylinesDlg::~HYDROGUI_MergePolylinesDlg()
@@ -53,3 +59,8 @@ void HYDROGUI_MergePolylinesDlg::setPolylinesFromSelection()
 {
   return myList->setObjectsFromSelection();
 }
+
+QString HYDROGUI_MergePolylinesDlg::GetResultName() const
+{
+  return myName->text();
+}