Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

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

diff --git a/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx b/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx
index f842733bad178838730b735016613710340e9610..7175941cca187d7ede319a448db90aa92afa00e5 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx
+++ b/src/HYDROGUI/HYDROGUI_PriorityWidget.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
-// 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
@@ -29,27 +25,12 @@
 #include <SUIT_MessageBox.h>
 
 #include <QComboBox>
+#include <QHeaderView>
 #include <QLayout>
-#include <QStyledItemDelegate>
 #include <QTableView>
 #include <QToolButton>
 
 
-/**
-  Custom item delegate (combobox)
- */
-class HYDROGUI_PriorityWidget::Delegate : public QStyledItemDelegate
-{
-public:
-  Delegate( QObject* theParent = 0 );
-  
-  QWidget* createEditor( QWidget*, const QStyleOptionViewItem&,
-                         const QModelIndex& ) const;
-  
-  void setEditorData( QWidget*, const QModelIndex& ) const;
-  void setModelData( QWidget*, QAbstractItemModel*, const QModelIndex& ) const;
-};
-
 /**
   Constructor.
   @param theParent the parent object
@@ -73,11 +54,12 @@ QWidget* HYDROGUI_PriorityWidget::Delegate::createEditor(
       aComboBox->addItem( aText, aMap.value( aText ).toInt() );
     }
   } else if ( theIndex.column() == 0 || theIndex.column() ==  2 ) {
-    QStringList anItems = theIndex.data( Qt::UserRole ).toStringList();
     QStringList anObjNames = theIndex.data( Qt::UserRole ).toStringList();
     aComboBox->addItems( anObjNames );
   }
   
+  connect( aComboBox, SIGNAL( activated( int ) ), this, SLOT( finishEditing() ) );
+
   return aComboBox;
 }
 
@@ -126,6 +108,18 @@ void HYDROGUI_PriorityWidget::Delegate::setModelData(
   }
 }
 
+/**
+ Emit signal indicating that the user has finished editing.
+ */
+void HYDROGUI_PriorityWidget::Delegate::finishEditing()
+{
+  QWidget* anEditor = qobject_cast<QWidget*>( sender() );
+  if ( anEditor ) {
+    emit commitData( anEditor );
+    emit closeEditor( anEditor );
+  }
+}
+
 
 /**
   Constructor.
@@ -150,12 +144,23 @@ HYDROGUI_PriorityWidget::HYDROGUI_PriorityWidget( QWidget* theParent )
   // Table view
   myTable = new QTableView( this );
   myTable->setItemDelegate( new Delegate( this ) );
-  myTable->setEditTriggers( QAbstractItemView::DoubleClicked   | QAbstractItemView::SelectedClicked );
-
+  myTable->setEditTriggers( QAbstractItemView::DoubleClicked |
+                            QAbstractItemView::SelectedClicked |
+                            QAbstractItemView::EditKeyPressed );
+  
   // Set the custom model
   HYDROGUI_PriorityTableModel* aModel = new HYDROGUI_PriorityTableModel();
   myTable->setModel( aModel );
 
+  // 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->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents );
+ 
   // Layout
   // buttons
   QHBoxLayout* aButtonsLayout = new QHBoxLayout();
@@ -238,9 +243,10 @@ void HYDROGUI_PriorityWidget::onClearRules()
 }
 
 /**
-  Set objects.
+  Set objects which could be used for rules definition.
+  @param theObjects the ordered list of objects
  */
-void HYDROGUI_PriorityWidget::setObjects( const QList<Handle(HYDROData_Object)>& theObjects )
+void HYDROGUI_PriorityWidget::setObjects( const QList<Handle(HYDROData_Entity)>& theObjects )
 {
   HYDROGUI_PriorityTableModel* aModel = 
     dynamic_cast<HYDROGUI_PriorityTableModel*>( myTable->model() );
@@ -281,6 +287,15 @@ void HYDROGUI_PriorityWidget::setRules( const HYDROData_ListOfRules& theRules )
   }
 }
 
+/**
+  Get table view.
+  @return the table view
+ */
+QTableView* HYDROGUI_PriorityWidget::getTable() const
+{
+  return myTable;
+}
+
 /**
  Slot called on table selection change.
 */
@@ -301,9 +316,6 @@ void HYDROGUI_PriorityWidget::updateControls()
     myAdd->setEnabled( aModel->canCreateNewRule() );
     bool isTableNotEmpty = aModel->rowCount() > 0;
     myClear->setEnabled( isTableNotEmpty );
-    if ( isTableNotEmpty ) {
-      myTable->resizeColumnsToContents();
-    }
   }
   onSelectionChanged();
 }
@@ -312,5 +324,5 @@ void HYDROGUI_PriorityWidget::updateControls()
  Show error message.
  */
 void HYDROGUI_PriorityWidget::onShowError( const QString& theMsg ) {
-  SUIT_MessageBox::critical( this, tr( "ERROR" ), theMsg );
+  SUIT_MessageBox::warning( this, tr( "INCORRECT_INPUT" ), theMsg );
 }
\ No newline at end of file