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
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeomObjectDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
index f3275eb3d26b6bfc490a3b2bd91ab75543535d56..d889f9859892cc7c3083e2043172ea6a5c266c6a 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-44,7
+44,7
@@
HYDROGUI_GeomObjectDlg::HYDROGUI_GeomObjectDlg( HYDROGUI_Module* theModule, cons
const bool theIsToEnableFileSelection )
: HYDROGUI_InputPanel( theModule, theTitle ),
myFileSelectionEnabled( theIsToEnableFileSelection ),
const bool theIsToEnableFileSelection )
: HYDROGUI_InputPanel( theModule, theTitle ),
myFileSelectionEnabled( theIsToEnableFileSelection ),
- myDefaultName(
theObjectTypeName
)
+ myDefaultName(
""
)
{
// Get resource manager
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
{
// Get resource manager
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
@@
-135,8
+135,10
@@
HYDROGUI_GeomObjectDlg::~HYDROGUI_GeomObjectDlg()
void HYDROGUI_GeomObjectDlg::setObjectNames( const QStringList& theNames )
{
void HYDROGUI_GeomObjectDlg::setObjectNames( const QStringList& theNames )
{
+ bool isBlocked = myObjects->blockSignals( true );
myObjects->clear();
myObjects->addItems( theNames );
myObjects->clear();
myObjects->addItems( theNames );
+ myObjects->blockSignals( isBlocked );
updateControls();
}
updateControls();
}
@@
-201,6
+203,7
@@
void HYDROGUI_GeomObjectDlg::onBrowse()
void HYDROGUI_GeomObjectDlg::reset()
{
void HYDROGUI_GeomObjectDlg::reset()
{
+ myDefaultName.clear();
if ( myFileSelectionEnabled ) {
myFileName->clear();
}
if ( myFileSelectionEnabled ) {
myFileName->clear();
}