X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.cxx;h=ba31ad82e4c0b010e89da283171866f569a8ca70;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=da21a508e0c96aa8c852785427bbde35c45bbb24;hpb=dd6cdff692e9ce241c2e5eeb11385a05b3ebbcb3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
index da21a508..ba31ad82 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
@@ -356,7 +356,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject )
     myBathymetryChoice->addItem( tr("MERGE_UNKNOWN"), HYDROData_Zone::Merge_UNKNOWN );
     myBathymetryChoice->addItem( tr("MERGE_ZMIN"), HYDROData_Zone::Merge_ZMIN );
     myBathymetryChoice->addItem( tr("MERGE_ZMAX"), HYDROData_Zone::Merge_ZMAX );
-    QStringList aList = aZone->getBathymetries();
+    QStringList aList = aZone->getAltitudes();
     for ( int i = 0; i < aList.length(); i++ )
     {
       myBathymetryChoice->addItem( aList.at( i ), HYDROData_Zone::Merge_Object );
@@ -372,7 +372,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject )
         aCurIndex = 2;
         break;
       case HYDROData_Zone::Merge_Object:
-        aCurIndex = 3 + aList.indexOf( aZone->text( HYDROGUI_DataObject::BathymetryId ) );
+        aCurIndex = 3 + aList.indexOf( aZone->text( HYDROGUI_DataObject::AltitudeObjId ) );
         break;
       default:
         aCurIndex = 0; // Select unknown by default
@@ -395,7 +395,7 @@ QString HYDROGUI_CalculationDlg::getObjectName() const
   return myObjectName->text();
 }
 
-void HYDROGUI_CalculationDlg::includeGeomObjects( const QStringList& theObjects )
+void moveItems( QListWidget* theSource, QListWidget* theDest, const QStringList& theObjects )
 {
   QList<QListWidgetItem*> aFoundItems;
   int anIdx;
@@ -404,37 +404,26 @@ void HYDROGUI_CalculationDlg::includeGeomObjects( const QStringList& theObjects
   for ( int i = 0, n = theObjects.length(); i < n; ++i )
   {
     QString anObjName = theObjects.at( i );
-    aFoundItems = myAvailableGeomObjects->findItems( anObjName, Qt::MatchExactly );
+    aFoundItems = theSource->findItems( anObjName, Qt::MatchExactly );
     for ( anIdx = 0; anIdx < aFoundItems.length(); anIdx++ )
     {
       anItem = aFoundItems.at( anIdx );
       // Remove this object from available objects list
-      anItem = myAvailableGeomObjects->takeItem( myAvailableGeomObjects->row( anItem ) );
+      anItem = theSource->takeItem( theSource->row( anItem ) );
       // Add the item to the included objects list
-      myGeomObjects->addItem( anItem );
+      theDest->addItem( anItem );
     }
   }
 }
 
-void HYDROGUI_CalculationDlg::excludeGeomObjects( const QStringList& theObjects )
+void HYDROGUI_CalculationDlg::includeGeomObjects( const QStringList& theObjects )
 {
-  QList<QListWidgetItem*> aFoundItems;
-  int anIdx;
-  QListWidgetItem* anItem;
+  moveItems( myAvailableGeomObjects, myGeomObjects, theObjects );
+}
 
-  for ( int i = 0, n = theObjects.length(); i < n; ++i )
-  {
-    QString anObjName = theObjects.at( i );
-    aFoundItems = myGeomObjects->findItems( anObjName, Qt::MatchExactly );
-    for ( anIdx = 0; anIdx < aFoundItems.length(); anIdx++ )
-    {
-      anItem = aFoundItems.at( anIdx );
-      // Remove this object from included objects list
-      anItem = myGeomObjects->takeItem( myGeomObjects->row( anItem ) );
-      // Add the item to the excluded objects list
-      myAvailableGeomObjects->addItem( anItem );
-    }
-  }
+void HYDROGUI_CalculationDlg::excludeGeomObjects( const QStringList& theObjects )
+{
+  moveItems( myGeomObjects, myAvailableGeomObjects, theObjects );
 }
 
 void HYDROGUI_CalculationDlg::setBoundary( const QString& theObjName )
@@ -468,10 +457,10 @@ void HYDROGUI_CalculationDlg::setAllGeomObjects( const QStringList& theObjects,
   }
 }
 
-QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
+QStringList getSelected( QListWidget* theWidget )
 {
   QStringList aResList;
-  QList<QListWidgetItem*> aList = myGeomObjects->selectedItems();
+  QList<QListWidgetItem*> aList = theWidget->selectedItems();
   for ( int i = 0, n = aList.length(); i < n; ++i )
   {
     aResList.append( aList.at( i )->text() );
@@ -479,15 +468,14 @@ QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
   return aResList;
 }
 
+QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
+{
+  return getSelected( myGeomObjects );
+}
+
 QStringList HYDROGUI_CalculationDlg::getSelectedAvailableGeomObjects() const
 {
-  QStringList aResList;
-  QList<QListWidgetItem*> aList = myAvailableGeomObjects->selectedItems();
-  for ( int i = 0, n = aList.length(); i < n; ++i )
-  {
-    aResList.append( aList.at( i )->text() );
-  }
-  return aResList;
+  return getSelected( myAvailableGeomObjects );
 }
 
 void HYDROGUI_CalculationDlg::setEditedObject( const Handle(HYDROData_CalculationCase) theCase )
@@ -524,4 +512,32 @@ void HYDROGUI_CalculationDlg::onDataChanged()
   SUIT_DataObject* aRoot = myBrowser->root();
   module()->getDataModel()->buildCaseTree( aRoot, myEditedObject );
   myBrowser->updateTree( aRoot );
-}
\ No newline at end of file
+}
+
+void HYDROGUI_CalculationDlg::setAvailableGroups( const QStringList& theGroups )
+{
+  myAvailableGroups->clear();
+  myGroups->clear();
+  foreach( QString aGroup, theGroups )
+    myAvailableGroups->addItem( aGroup );
+}
+
+QStringList HYDROGUI_CalculationDlg::getSelectedGroups() const
+{
+  return getSelected( myGroups );
+}
+
+QStringList HYDROGUI_CalculationDlg::getSelectedAvailableGroups() const
+{
+  return getSelected( myAvailableGroups );
+}
+
+void HYDROGUI_CalculationDlg::includeGroups( const QStringList& theObjects )
+{
+  moveItems( myAvailableGroups, myGroups, theObjects );
+}
+
+void HYDROGUI_CalculationDlg::excludeGroups( const QStringList& theObjects )
+{
+  moveItems( myGroups, myAvailableGroups, theObjects );
+}