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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeomObjectDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
index aec19adadb9a53638ed26edc34fb14c6e977a8f9..1179745d227bc5a64faf0745a680b021673e7916 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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) 2014-2015 EDF-R&D
// 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
@@
-22,7
+18,7
@@
#include "HYDROGUI_GeomObjectDlg.h"
#include "HYDROGUI_GeomObjectDlg.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool
2
.h"
#include <SUIT_FileDlg.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_FileDlg.h>
#include <SUIT_ResourceMgr.h>
@@
-135,8
+131,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();
}
@@
-181,14
+179,14
@@
void HYDROGUI_GeomObjectDlg::onBrowse()
{
SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
{
SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
- aFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+ aFileDlg->set
Name
Filter( tr("OBSTACLE_FILTER") );
if ( !lastUsedFilter.isEmpty() ) {
if ( !lastUsedFilter.isEmpty() ) {
- aFileDlg->selectFilter( lastUsedFilter );
+ aFileDlg->select
Name
Filter( lastUsedFilter );
}
if ( aFileDlg->exec() == QDialog::Accepted ) {
QString aFileName = aFileDlg->selectedFile();
}
if ( aFileDlg->exec() == QDialog::Accepted ) {
QString aFileName = aFileDlg->selectedFile();
- lastUsedFilter = aFileDlg->selectedFilter();
+ lastUsedFilter = aFileDlg->selected
Name
Filter();
if ( !aFileName.isEmpty() ) {
myFileName->setText( aFileName );
if ( !aFileName.isEmpty() ) {
myFileName->setText( aFileName );
@@
-201,6
+199,7
@@
void HYDROGUI_GeomObjectDlg::onBrowse()
void HYDROGUI_GeomObjectDlg::reset()
{
void HYDROGUI_GeomObjectDlg::reset()
{
+ myDefaultName.clear();
if ( myFileSelectionEnabled ) {
myFileName->clear();
}
if ( myFileSelectionEnabled ) {
myFileName->clear();
}
@@
-262,4
+261,4
@@
void HYDROGUI_GeomObjectDlg::setDefaultName( const QString& theName )
QString HYDROGUI_GeomObjectDlg::getDefaultName()
{
return myDefaultName;
QString HYDROGUI_GeomObjectDlg::getDefaultName()
{
return myDefaultName;
-}
\ No newline at end of file
+}