Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #727, #736: fix for the first bug and for the second part (Bug2) of the last...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_MergePolylinesDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
b/src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
index 5035aae9a265dc29f4da0942df82516beba49ef0..620e8397a1f57868d9a1a3eacad9dd5d1ca792b8 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_MergePolylinesDlg.cxx
@@
-22,6
+22,7
@@
#include <QLabel>
#include <QGridLayout>
#include <QLineEdit>
#include <QLabel>
#include <QGridLayout>
#include <QLineEdit>
+#include <QCheckBox>
HYDROGUI_MergePolylinesDlg::HYDROGUI_MergePolylinesDlg( HYDROGUI_Module* theModule, const QString& theTitle )
: HYDROGUI_InputPanel( theModule, theTitle )
HYDROGUI_MergePolylinesDlg::HYDROGUI_MergePolylinesDlg( HYDROGUI_Module* theModule, const QString& theTitle )
: HYDROGUI_InputPanel( theModule, theTitle )
@@
-37,8
+38,11
@@
HYDROGUI_MergePolylinesDlg::HYDROGUI_MergePolylinesDlg( HYDROGUI_Module* theModu
aLayout->addWidget( new QLabel( tr( "RESULT_NAME" ) ), 0, 0 );
aLayout->addWidget( myName, 0, 1 );
aLayout->addWidget( new QLabel( tr( "RESULT_NAME" ) ), 0, 0 );
aLayout->addWidget( myName, 0, 1 );
+ myIsConnect = new QCheckBox( tr( "IS_CONNECT" ), mainFrame() );
+ aLayout->addWidget( myIsConnect, 1, 0, 1, 2 );
+
myList = new HYDROGUI_ObjListBox( theModule, tr( "POLYLINES" ), KIND_POLYLINEXY, mainFrame() );
myList = new HYDROGUI_ObjListBox( theModule, tr( "POLYLINES" ), KIND_POLYLINEXY, mainFrame() );
- aLayout->addWidget( myList,
1
, 0, 1, 2 );
+ aLayout->addWidget( myList,
2
, 0, 1, 2 );
}
HYDROGUI_MergePolylinesDlg::~HYDROGUI_MergePolylinesDlg()
}
HYDROGUI_MergePolylinesDlg::~HYDROGUI_MergePolylinesDlg()
@@
-64,3
+68,8
@@
QString HYDROGUI_MergePolylinesDlg::GetResultName() const
{
return myName->text();
}
{
return myName->text();
}
+
+bool HYDROGUI_MergePolylinesDlg::IsConnectByNewSegment() const
+{
+ return myIsConnect->isChecked();
+}