Merge branch 'BR_H2018_3' into BR_2018_V8_5

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_PriorityWidget.cxx

diff --git a/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx b/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx
index 6c85d3e0ab54c76392207576a17c5f2a088dca11..2f84a8229570b92dfa9bd6f83734042a80a5db6f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx
+++ b/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx
@@ -154,12 +154,12 @@ HYDROGUI_PriorityWidget::HYDROGUI_PriorityWidget( QWidget* theParent )
 
   // Set resize mode
   myTable->horizontalHeader()->setStretchLastSection( false);
-  myTable->horizontalHeader()->setResizeMode( 0, QHeaderView::Stretch );
-  myTable->horizontalHeader()->setResizeMode( 1, QHeaderView::ResizeToContents );
-  myTable->horizontalHeader()->setResizeMode( 2, QHeaderView::Stretch );
-  myTable->horizontalHeader()->setResizeMode( 3, QHeaderView::ResizeToContents );
+  myTable->horizontalHeader()->setSectionResizeMode( 0, QHeaderView::Stretch );
+  myTable->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::ResizeToContents );
+  myTable->horizontalHeader()->setSectionResizeMode( 2, QHeaderView::Stretch );
+  myTable->horizontalHeader()->setSectionResizeMode( 3, QHeaderView::ResizeToContents );
 
-  myTable->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents );
+  myTable->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents );
  
   // Layout
   // buttons
@@ -221,9 +221,11 @@ void HYDROGUI_PriorityWidget::onRemoveRule()
   if (aModel) {
     QList<int> aRows;
 
-    QModelIndexList aSelectedIndexes = myTable->selectionModel()->selectedRows();
+    QModelIndexList aSelectedIndexes = myTable->selectionModel()->selectedIndexes();
     foreach ( const QModelIndex& anIndex, aSelectedIndexes ) {
-      aRows << anIndex.row();
+      int aRowIndex = anIndex.row();
+      if ( !aRows.contains( aRowIndex ) )
+        aRows << aRowIndex;
     }
     
     if ( aModel->removeRows( aRows ) ) {
@@ -305,7 +307,7 @@ QTableView* HYDROGUI_PriorityWidget::getTable() const
 */
 void HYDROGUI_PriorityWidget::onSelectionChanged()
 {
-  QModelIndexList aSelectedIndexes = myTable->selectionModel()->selectedRows();
+  QModelIndexList aSelectedIndexes = myTable->selectionModel()->selectedIndexes();
   myRemove->setEnabled( aSelectedIndexes.count() > 0 );
 }