]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Feature #228: Import of polylines from GEOM.
authormzn <mzn@opencascade.com>
Wed, 18 Dec 2013 13:09:55 +0000 (13:09 +0000)
committermzn <mzn@opencascade.com>
Wed, 18 Dec 2013 13:09:55 +0000 (13:09 +0000)
Implementation of GUI part.

src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx [new file with mode: 0644]
src/HYDROGUI/HYDROGUI_GeomObjectDlg.h [new file with mode: 0644]
src/HYDROGUI/HYDROGUI_ObstacleDlg.cxx [deleted file]
src/HYDROGUI/HYDROGUI_ObstacleDlg.h [deleted file]

diff --git a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
new file mode 100644 (file)
index 0000000..f3275eb
--- /dev/null
@@ -0,0 +1,265 @@
+// 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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#include "HYDROGUI_GeomObjectDlg.h"
+
+#include "HYDROGUI_Tool.h"
+
+#include <SUIT_FileDlg.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+
+#include <QLabel>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QToolButton>
+#include <QRadioButton>
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QLayout>
+
+static QString lastUsedFilter;
+
+HYDROGUI_GeomObjectDlg::HYDROGUI_GeomObjectDlg( HYDROGUI_Module* theModule, const QString& theTitle,
+                                                const QString& theObjectTypeName,
+                                                const bool theIsToEnableFileSelection )
+: HYDROGUI_InputPanel( theModule, theTitle ),
+  myFileSelectionEnabled( theIsToEnableFileSelection ),
+  myDefaultName( theObjectTypeName )
+{
+  // Get resource manager
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+
+  // File selector
+  QGroupBox* aFileNameGroup = 0;
+  myFileName = 0;
+  if ( myFileSelectionEnabled ) {
+    aFileNameGroup = new QGroupBox( tr( "GET_SHAPE_FROM_FILE" ), this );
+
+    QLabel* aFileNameLabel = new QLabel( tr( "FILE_NAME" ), aFileNameGroup );
+
+    myFileName = new QLineEdit( aFileNameGroup );
+    myFileName->setReadOnly( true );
+
+    QToolButton* aBrowseBtn = new QToolButton( aFileNameGroup );
+    aBrowseBtn->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "BROWSE_ICO" ) ) );
+
+    QBoxLayout* aFileNameLayout = new QHBoxLayout( aFileNameGroup );
+    aFileNameLayout->setMargin( 5 );
+    aFileNameLayout->setSpacing( 5 );
+    aFileNameLayout->addWidget( aFileNameLabel );
+    aFileNameLayout->addWidget( myFileName );
+    aFileNameLayout->addWidget( aBrowseBtn );
+
+    connect( aBrowseBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) );
+  }
+
+  // Obstacle name
+  myNameGroup = new QGroupBox( tr( "OBJECT_NAME" ).arg( theObjectTypeName ), this );
+
+  QLabel* aNameLabel = new QLabel( tr( "NAME" ), myNameGroup );
+  myObjectName = new QLineEdit( myNameGroup );
+
+  QBoxLayout* anNameLayout = new QHBoxLayout( myNameGroup );
+  anNameLayout->setMargin( 5 );
+  anNameLayout->setSpacing( 5 );
+  anNameLayout->addWidget( aNameLabel );
+  anNameLayout->addWidget( myObjectName );
+
+  // Mode selector (create/edit)
+  myModeGroup = new QGroupBox( tr( "MODE" ), this );
+
+  QRadioButton* aNewRB = new QRadioButton( tr( "CREATE_NEW" ), mainFrame() );
+  QRadioButton* aModifyRB = new QRadioButton( tr( "MODIFY" ), mainFrame() );
+
+  myModeButtons = new QButtonGroup( mainFrame() );
+  myModeButtons->addButton( aNewRB, CreateNewId );
+  myModeButtons->addButton( aModifyRB, ModifyExistentId );
+
+  QBoxLayout* aModeSelectorLayout = new QHBoxLayout( myModeGroup );
+  aModeSelectorLayout->setMargin( 5 );
+  aModeSelectorLayout->setSpacing( 5 );
+  aModeSelectorLayout->addWidget( aNewRB );
+  aModeSelectorLayout->addWidget( aModifyRB );
+
+  // Existing obstacles selector
+  myObjectsGroup = new QGroupBox( tr( "OBJECT_TO_EDIT" ).arg( theObjectTypeName ), this );
+
+  QLabel* anObjectLabel = new QLabel( theObjectTypeName, myObjectsGroup );
+
+  myObjects = new QComboBox( mainFrame() );
+  myObjects->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  QBoxLayout* anObjectsSelectorLayout = new QHBoxLayout( myObjectsGroup );
+  anObjectsSelectorLayout->setMargin( 5 );
+  anObjectsSelectorLayout->setSpacing( 5 );
+  anObjectsSelectorLayout->addWidget( anObjectLabel );
+  anObjectsSelectorLayout->addWidget( myObjects );
+
+  // Layout
+  if ( aFileNameGroup ) {
+    addWidget( aFileNameGroup );
+  }
+  addWidget( myNameGroup );
+  addWidget( myModeGroup );
+  addWidget( myObjectsGroup );
+  addStretch();
+
+  // Connect signals and slots
+  connect( myModeButtons, SIGNAL( buttonClicked( int ) ), this, SLOT( onModeActivated( int ) ) );
+  connect( myObjects, SIGNAL( currentIndexChanged( int ) ), this, SLOT( onObjectSelectionChanged( ) ) );
+}
+
+HYDROGUI_GeomObjectDlg::~HYDROGUI_GeomObjectDlg()
+{
+}
+
+void HYDROGUI_GeomObjectDlg::setObjectNames( const QStringList& theNames )
+{
+  myObjects->clear();
+  myObjects->addItems( theNames );
+
+  updateControls();
+}
+
+void HYDROGUI_GeomObjectDlg::onModeActivated( int theMode )
+{
+  updateControls();
+  updateObjectName();
+}
+
+QString HYDROGUI_GeomObjectDlg::getObjectName() const
+{
+  return myObjectName->text();
+
+
+  QString aName;
+
+  if ( myModeButtons->checkedId() == ModifyExistentId ) {
+    aName = myObjects->currentText();
+  }
+
+  return aName;
+}
+
+QString HYDROGUI_GeomObjectDlg::getEditedObjectName() const
+{
+  QString aName;
+
+  if ( myModeButtons->checkedId() == ModifyExistentId ) {
+    aName = myObjects->currentText();
+  }
+
+  return aName;
+}
+
+QString HYDROGUI_GeomObjectDlg::getFileName() const
+{
+  return myFileName->text();
+}
+
+void HYDROGUI_GeomObjectDlg::onBrowse()
+{
+  SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
+  aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
+  aFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+  if ( !lastUsedFilter.isEmpty() ) {
+    aFileDlg->selectFilter( lastUsedFilter );
+  }
+
+  if ( aFileDlg->exec() == QDialog::Accepted ) {
+    QString aFileName = aFileDlg->selectedFile();
+    lastUsedFilter = aFileDlg->selectedFilter();
+
+    if ( !aFileName.isEmpty() ) {
+      myFileName->setText( aFileName );
+      updateObjectName();
+    }
+
+    updateControls();
+  }
+}
+
+void HYDROGUI_GeomObjectDlg::reset()
+{
+  if ( myFileSelectionEnabled ) {
+    myFileName->clear();
+  }
+  myObjectName->clear();
+
+  // Activate the creation mode
+  myModeButtons->button( CreateNewId )->setChecked( true );
+  onModeActivated( CreateNewId );
+
+  updateControls();
+}
+
+void HYDROGUI_GeomObjectDlg::onObjectSelectionChanged()
+{
+  updateObjectName();
+}
+
+void HYDROGUI_GeomObjectDlg::updateControls()
+{
+  myNameGroup->setEnabled( !myFileSelectionEnabled || 
+                           !myFileName->text().isEmpty() );
+  myModeGroup->setEnabled( myNameGroup->isEnabled() && 
+                           myObjects->count() > 0 );
+  myObjectsGroup->setEnabled( myModeButtons->checkedId() == ModifyExistentId );
+}
+
+void HYDROGUI_GeomObjectDlg::updateObjectName()
+{
+  QString aName;
+
+  // Creation mode
+  int aMode = myModeButtons->checkedId();
+  if ( aMode == CreateNewId ) {
+    if ( myFileSelectionEnabled ) {
+      QString aFileName = myFileName->text();
+      if ( !aFileName.isEmpty() ) {
+        QFileInfo aFileInfo( aFileName );
+        aName = HYDROGUI_Tool::GenerateObjectName( 
+          module(), aFileInfo.baseName(), QStringList(), true );
+      }
+    } else {
+      aName = HYDROGUI_Tool::GenerateObjectName( 
+        module(), getDefaultName(), QStringList(), true );
+    }
+  } else if ( aMode == ModifyExistentId ) {
+      aName = getEditedObjectName();
+  }
+
+  myObjectName->setText( aName );
+}
+
+void HYDROGUI_GeomObjectDlg::setDefaultName( const QString& theName )
+{
+  myDefaultName = theName;
+
+  updateObjectName();
+}
+
+QString HYDROGUI_GeomObjectDlg::getDefaultName()
+{
+  return myDefaultName;
+}
\ No newline at end of file
diff --git a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.h b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.h
new file mode 100644 (file)
index 0000000..0c8f480
--- /dev/null
@@ -0,0 +1,82 @@
+// 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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef HYDROGUI_GeomObjectDlg_H
+#define HYDROGUI_GeomObjectDlg_H
+
+#include "HYDROGUI_InputPanel.h"
+
+class QLineEdit;
+class QGroupBox;
+class QComboBox;
+class QButtonGroup;
+
+class HYDROGUI_GeomObjectDlg : public HYDROGUI_InputPanel
+{
+  Q_OBJECT
+
+  enum CreationMode { CreateNewId, ModifyExistentId };
+
+public:
+  HYDROGUI_GeomObjectDlg( HYDROGUI_Module* theModule, const QString& theTitle,
+                          const QString& theObjectTypeName,
+                          const bool theIsToEnableFileSelection = false );
+  virtual ~HYDROGUI_GeomObjectDlg();
+
+  void                       reset();
+
+  QString                    getObjectName() const;
+
+  void                       setObjectNames( const QStringList& theObstacles );
+  QString                    getEditedObjectName() const;
+
+  QString                    getFileName() const;
+
+  QString                    getDefaultName();
+  void                       setDefaultName( const QString& theName );
+
+protected slots:
+  void                       onModeActivated( int );
+  void                       onObjectSelectionChanged();
+  void                       onBrowse();
+
+private:
+  void                       updateControls();
+  void                       updateObjectName();
+
+private:
+  QLineEdit*                 myFileName;
+  
+  QGroupBox*                 myNameGroup;
+  QLineEdit*                 myObjectName;
+
+  QGroupBox*                 myModeGroup;
+  QButtonGroup*              myModeButtons;
+
+  QGroupBox*                 myObjectsGroup;
+  QComboBox*                 myObjects;
+
+  bool                       myFileSelectionEnabled;
+  QString                    myDefaultName;
+};
+
+#endif
diff --git a/src/HYDROGUI/HYDROGUI_ObstacleDlg.cxx b/src/HYDROGUI/HYDROGUI_ObstacleDlg.cxx
deleted file mode 100644 (file)
index 2697c8d..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-// 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
-//
-// 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.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#include "HYDROGUI_ObstacleDlg.h"
-
-#include "HYDROGUI_Tool.h"
-
-#include <SUIT_FileDlg.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QToolButton>
-#include <QRadioButton>
-#include <QButtonGroup>
-#include <QGroupBox>
-#include <QLayout>
-
-static QString lastUsedFilter;
-
-HYDROGUI_ObstacleDlg::HYDROGUI_ObstacleDlg( HYDROGUI_Module* theModule, const QString& theTitle,
-                                            const bool theIsToEnableFileSelection )
-: HYDROGUI_InputPanel( theModule, theTitle ),
-  myFileSelectionEnabled ( theIsToEnableFileSelection ),
-  myDefaultName( tr("DEFAULT_OBSTACLE_NAME") )
-{
-  // Get resource manager
-  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-
-  // File selector
-  QGroupBox* aFileNameGroup = 0;
-  myFileName = 0;
-  if ( myFileSelectionEnabled ) {
-    aFileNameGroup = new QGroupBox( tr( "GET_SHAPE_FROM_FILE" ), this );
-
-    QLabel* aFileNameLabel = new QLabel( tr( "FILE_NAME" ), aFileNameGroup );
-
-    myFileName = new QLineEdit( aFileNameGroup );
-    myFileName->setReadOnly( true );
-
-    QToolButton* aBrowseBtn = new QToolButton( aFileNameGroup );
-    aBrowseBtn->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "BROWSE_ICO" ) ) );
-
-    QBoxLayout* aFileNameLayout = new QHBoxLayout( aFileNameGroup );
-    aFileNameLayout->setMargin( 5 );
-    aFileNameLayout->setSpacing( 5 );
-    aFileNameLayout->addWidget( aFileNameLabel );
-    aFileNameLayout->addWidget( myFileName );
-    aFileNameLayout->addWidget( aBrowseBtn );
-
-    connect( aBrowseBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) );
-  }
-
-  // Obstacle name
-  myObstacleNameGroup = new QGroupBox( tr( "OBSTACLE_NAME" ), this );
-
-  QLabel* anObstacleNameLabel = new QLabel( tr( "NAME" ), myObstacleNameGroup );
-  myObstacleName = new QLineEdit( myObstacleNameGroup );
-
-  QBoxLayout* anObstacleNameLayout = new QHBoxLayout( myObstacleNameGroup );
-  anObstacleNameLayout->setMargin( 5 );
-  anObstacleNameLayout->setSpacing( 5 );
-  anObstacleNameLayout->addWidget( anObstacleNameLabel );
-  anObstacleNameLayout->addWidget( myObstacleName );
-
-  // Mode selector (create/edit)
-  myModeGroup = new QGroupBox( tr( "MODE" ), this );
-
-  QRadioButton* aNewObstacleRB = new QRadioButton( tr( "CREATE_NEW_OBSTACLE" ), mainFrame() );
-  QRadioButton* aModifyObstacleRB = new QRadioButton( tr( "MODIFY_OBSTACLE" ), mainFrame() );
-
-  myModeButtons = new QButtonGroup( mainFrame() );
-  myModeButtons->addButton( aNewObstacleRB, CreateNewId );
-  myModeButtons->addButton( aModifyObstacleRB, ModifyExistentId );
-
-  QBoxLayout* aModeSelectorLayout = new QHBoxLayout( myModeGroup );
-  aModeSelectorLayout->setMargin( 5 );
-  aModeSelectorLayout->setSpacing( 5 );
-  aModeSelectorLayout->addWidget( aNewObstacleRB );
-  aModeSelectorLayout->addWidget( aModifyObstacleRB );
-
-  // Existing obstacles selector
-  myObstaclesGroup = new QGroupBox( tr( "OBSTACLE_TO_EDIT" ), this );
-
-  QLabel* anObstacleLabel = new QLabel( tr( "OBSTACLE" ), myObstaclesGroup );
-
-  myObstacles = new QComboBox( mainFrame() );
-  myObstacles->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  QBoxLayout* anObstaclesSelectorLayout = new QHBoxLayout( myObstaclesGroup );
-  anObstaclesSelectorLayout->setMargin( 5 );
-  anObstaclesSelectorLayout->setSpacing( 5 );
-  anObstaclesSelectorLayout->addWidget( anObstacleLabel );
-  anObstaclesSelectorLayout->addWidget( myObstacles );
-
-  // Layout
-  if ( aFileNameGroup ) {
-    addWidget( aFileNameGroup );
-  }
-  addWidget( myObstacleNameGroup );
-  addWidget( myModeGroup );
-  addWidget( myObstaclesGroup );
-  addStretch();
-
-  // Connect signals and slots
-  connect( myModeButtons, SIGNAL( buttonClicked( int ) ), this, SLOT( onModeActivated( int ) ) );
-  connect( myObstacles, SIGNAL( currentIndexChanged( int ) ), this, SLOT( onObstacleSelectionChanged( ) ) );
-}
-
-HYDROGUI_ObstacleDlg::~HYDROGUI_ObstacleDlg()
-{
-}
-
-void HYDROGUI_ObstacleDlg::setObstacleNames( const QStringList& theObstacles )
-{
-  myObstacles->clear();
-  myObstacles->addItems( theObstacles );
-
-  updateControls();
-}
-
-void HYDROGUI_ObstacleDlg::onModeActivated( int theMode )
-{
-  updateControls();
-  updateObjectName();
-}
-
-QString HYDROGUI_ObstacleDlg::getObstacleName() const
-{
-  return myObstacleName->text();
-
-
-  QString aName;
-
-  if ( myModeButtons->checkedId() == ModifyExistentId ) {
-    aName = myObstacles->currentText();
-  }
-
-  return aName;
-}
-
-QString HYDROGUI_ObstacleDlg::getEditedObstacleName() const
-{
-  QString aName;
-
-  if ( myModeButtons->checkedId() == ModifyExistentId ) {
-    aName = myObstacles->currentText();
-  }
-
-  return aName;
-}
-
-QString HYDROGUI_ObstacleDlg::getFileName() const
-{
-  return myFileName->text();
-}
-
-void HYDROGUI_ObstacleDlg::onBrowse()
-{
-  SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
-  aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
-  aFileDlg->setFilter( tr("OBSTACLE_FILTER") );
-  if ( !lastUsedFilter.isEmpty() ) {
-    aFileDlg->selectFilter( lastUsedFilter );
-  }
-
-  if ( aFileDlg->exec() == QDialog::Accepted ) {
-    QString aFileName = aFileDlg->selectedFile();
-    lastUsedFilter = aFileDlg->selectedFilter();
-
-    if ( !aFileName.isEmpty() ) {
-      myFileName->setText( aFileName );
-      updateObjectName();
-    }
-
-    updateControls();
-  }
-}
-
-void HYDROGUI_ObstacleDlg::reset()
-{
-  if ( myFileSelectionEnabled ) {
-    myFileName->clear();
-  }
-  myObstacleName->clear();
-
-  // Activate the creation mode
-  myModeButtons->button( CreateNewId )->setChecked( true );
-  onModeActivated( CreateNewId );
-
-  updateControls();
-}
-
-void HYDROGUI_ObstacleDlg::onObstacleSelectionChanged()
-{
-  updateObjectName();
-}
-
-void HYDROGUI_ObstacleDlg::updateControls()
-{
-  myObstacleNameGroup->setEnabled( !myFileSelectionEnabled || 
-                                   !myFileName->text().isEmpty() );
-  myModeGroup->setEnabled( myObstacleNameGroup->isEnabled() && 
-                           myObstacles->count() > 0 );
-  myObstaclesGroup->setEnabled( myModeButtons->checkedId() == ModifyExistentId );
-}
-
-void HYDROGUI_ObstacleDlg::updateObjectName()
-{
-  QString aName;
-
-  // Creation mode
-  int aMode = myModeButtons->checkedId();
-  if ( aMode == CreateNewId ) {
-    if ( myFileSelectionEnabled ) {
-      QString aFileName = myFileName->text();
-      if ( !aFileName.isEmpty() ) {
-        QFileInfo aFileInfo( aFileName );
-        aName = HYDROGUI_Tool::GenerateObjectName( 
-          module(), aFileInfo.baseName(), QStringList(), true );
-      }
-    } else {
-      aName = HYDROGUI_Tool::GenerateObjectName( 
-        module(), getDefaultName(), QStringList(), true );
-    }
-  } else if ( aMode == ModifyExistentId ) {
-      aName = getEditedObstacleName();
-  }
-
-  myObstacleName->setText( aName );
-}
-
-void HYDROGUI_ObstacleDlg::setDefaultName( const QString& theName )
-{
-  myDefaultName = theName;
-
-  updateObjectName();
-}
-
-QString HYDROGUI_ObstacleDlg::getDefaultName()
-{
-  return myDefaultName;
-}
\ No newline at end of file
diff --git a/src/HYDROGUI/HYDROGUI_ObstacleDlg.h b/src/HYDROGUI/HYDROGUI_ObstacleDlg.h
deleted file mode 100644 (file)
index 60d2acb..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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
-//
-// 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.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef HYDROGUI_ObstacleDlg_H
-#define HYDROGUI_ObstacleDlg_H
-
-#include "HYDROGUI_InputPanel.h"
-
-class QLineEdit;
-class QGroupBox;
-class QComboBox;
-class QButtonGroup;
-
-class HYDROGUI_ObstacleDlg : public HYDROGUI_InputPanel
-{
-  Q_OBJECT
-
-  enum CreationMode { CreateNewId, ModifyExistentId };
-
-public:
-  HYDROGUI_ObstacleDlg( HYDROGUI_Module* theModule, const QString& theTitle, 
-                        const bool theIsToEnableFileSelection = false );
-  virtual ~HYDROGUI_ObstacleDlg();
-
-  void                       reset();
-
-  QString                    getObstacleName() const;
-
-  void                       setObstacleNames( const QStringList& theObstacles );
-  QString                    getEditedObstacleName() const;
-
-  QString                    getFileName() const;
-
-  QString                    getDefaultName();
-  void                       setDefaultName( const QString& theName );
-
-protected slots:
-  void                       onModeActivated( int );
-  void                       onObstacleSelectionChanged();
-  void                       onBrowse();
-
-private:
-  void                       updateControls();
-  void                       updateObjectName();
-
-private:
-  QLineEdit*                 myFileName;
-  
-  QGroupBox*                 myObstacleNameGroup;
-  QLineEdit*                 myObstacleName;
-
-  QGroupBox*                 myModeGroup;
-  QButtonGroup*              myModeButtons;
-
-  QGroupBox*                 myObstaclesGroup;
-  QComboBox*                 myObstacles;
-
-  bool                       myFileSelectionEnabled;
-  QString                    myDefaultName;
-};
-
-#endif