First implementation of Up/Down buttons.

diff --git a/src/ZLEVEL/HYDROGUI_ZLevelsDlg.cxx b/src/ZLEVEL/HYDROGUI_ZLevelsDlg.cxx
index 267a18693c95a70c87299374cacd8bd9ea11af41..7448ad3662234a55205216f75e30a8e41571908d 100644 (file)
--- a/src/ZLEVEL/HYDROGUI_ZLevelsDlg.cxx
+++ b/src/ZLEVEL/HYDROGUI_ZLevelsDlg.cxx
@@ -27,6 +27,7 @@
 #include <QLayout>
 #include <QListView>
 #include <QPushButton>
+#include <QSignalMapper>
 #include <QSortFilterProxyModel>
 
 
@@ -39,6 +40,7 @@ HYDROGUI_ZLevelsDlg::HYDROGUI_ZLevelsDlg( QWidget* theParent )
   QHBoxLayout* aListLayout = new QHBoxLayout();
 
   myList = new QListView( this );
+  myList->setSelectionMode( QAbstractItemView::ExtendedSelection );
   
   HYDROGUI_ZLevelsModel* aModel = new HYDROGUI_ZLevelsModel();
   QSortFilterProxyModel* aFilteredModel = new QSortFilterProxyModel();
@@ -73,8 +75,21 @@ HYDROGUI_ZLevelsDlg::HYDROGUI_ZLevelsDlg( QWidget* theParent )
   aDlgButtonsLayout->addStretch();
   aMainLayout->addLayout( aDlgButtonsLayout );
 
+  QSignalMapper* aSignalMapper = new QSignalMapper( this );
+  aSignalMapper->setMapping( myTop, HYDROGUI_ZLevelsModel::Top );
+  aSignalMapper->setMapping( myUp, HYDROGUI_ZLevelsModel::Up );
+  aSignalMapper->setMapping( myDown, HYDROGUI_ZLevelsModel::Down );
+  aSignalMapper->setMapping( myBottom, HYDROGUI_ZLevelsModel::Bottom );
+  connect( myTop, SIGNAL( clicked() ), aSignalMapper, SLOT( map() ) );
+  connect( myUp, SIGNAL( clicked() ), aSignalMapper, SLOT( map() ) );
+  connect( myDown, SIGNAL( clicked() ), aSignalMapper, SLOT( map() ) );
+  connect( myBottom, SIGNAL( clicked() ), aSignalMapper, SLOT( map() ) );
+  connect( aSignalMapper, SIGNAL( mapped( int ) ), this, SLOT( onMove( int ) ) );
+
   connect( myAllObjects, SIGNAL( stateChanged( int ) ), this, SLOT( OnStateChanged() ) );
 
+  connect( myClose, SIGNAL( clicked() ), this, SLOT( close() ) );
+
   OnStateChanged();
 }
 
@@ -93,6 +108,23 @@ void HYDROGUI_ZLevelsDlg::setObjects( const QList<QString>& theObjects )
   }
 }
 
+void HYDROGUI_ZLevelsDlg::onMove( int theType )
+{
+  QSortFilterProxyModel* aFilterModel = dynamic_cast<QSortFilterProxyModel*>( myList->model() );
+  if( aFilterModel ) {
+    HYDROGUI_ZLevelsModel* aModel = dynamic_cast<HYDROGUI_ZLevelsModel*>( aFilterModel->sourceModel() );
+    if( aModel ) {
+      QModelIndexList aSelectedIndexes = myList->selectionModel()->selectedIndexes();
+      QModelIndexList aSelectedSourceIndexes;
+      foreach ( const QModelIndex& anIndex, aSelectedIndexes ) {
+        aSelectedSourceIndexes << aFilterModel->mapToSource( anIndex );
+      }
+      QList<int> aSelectedIds = aModel->getIds( aSelectedSourceIndexes );
+      aModel->move( aSelectedIds, theType );      
+    }
+  }
+}
+
 void HYDROGUI_ZLevelsDlg::OnStateChanged()
 {
   QSortFilterProxyModel* aFilterModel = dynamic_cast<QSortFilterProxyModel*>( myList->model() );

diff --git a/src/ZLEVEL/HYDROGUI_ZLevelsDlg.h b/src/ZLEVEL/HYDROGUI_ZLevelsDlg.h
index 44e3343d2a2c79097e3f9669daeca819dcb6018f..2ca17ef2a07041c022f90f60e81d3c8f6391bad3 100644 (file)
--- a/src/ZLEVEL/HYDROGUI_ZLevelsDlg.h
+++ b/src/ZLEVEL/HYDROGUI_ZLevelsDlg.h
@@ -44,6 +44,7 @@ public:
   void setObjects( const QList<QString>& theObjects );
 
 private slots:
+  void onMove( int theType );
   void OnStateChanged();
 
 private:

diff --git a/src/ZLEVEL/HYDROGUI_ZLevelsModel.cxx b/src/ZLEVEL/HYDROGUI_ZLevelsModel.cxx
index 9702bf77c0ee310eb810d7534e1db31a3b33a198..fe49aac2969ef7d92b752882164ccd339dd8565a 100644 (file)
--- a/src/ZLEVEL/HYDROGUI_ZLevelsModel.cxx
+++ b/src/ZLEVEL/HYDROGUI_ZLevelsModel.cxx
@@ -82,12 +82,17 @@ int HYDROGUI_ZLevelsModel::rowCount( const QModelIndex &theParent ) const
 void HYDROGUI_ZLevelsModel::setObjects( const QList<QString>& theObjects )
 {
   myObjects = theObjects;
+
   reset();
 }
 
 bool HYDROGUI_ZLevelsModel::IsObjectVisible( int theIndex ) const
 {
-  return theIndex%2==0;//TODO: implement real visibility state
+  //TODO: reimplement
+  return myObjects[ theIndex ] == "A" ||
+         myObjects[ theIndex ] == "C" ||
+         myObjects[ theIndex ] == "E" ||
+         myObjects[ theIndex ] == "G";
 }
 
 QVariant HYDROGUI_ZLevelsModel::headerData( int theSection,
@@ -106,3 +111,69 @@ QVariant HYDROGUI_ZLevelsModel::headerData( int theSection,
   }
   return QVariant();
 }
+
+QList<int> HYDROGUI_ZLevelsModel::getIds( const QModelIndexList& theIndexes, bool theIsToSort ) const
+{
+  QList<int> anIds;
+  foreach( const QModelIndex& anIndex, theIndexes ) {
+    anIds << anIndex.row();
+  }
+
+  if ( theIsToSort ) {
+    qSort( anIds );
+  }
+
+  return anIds;
+}
+
+bool HYDROGUI_ZLevelsModel::move( const int theItem, const int theType, 
+                                  const int theDropItem )
+{
+  bool aRes = false;
+
+  switch ( theType ) {
+    case Up:
+      if ( theItem > 0 ) {
+        myObjects.swap( theItem, theItem - 1 );
+        aRes = true;
+      }
+      break;
+    case Down:
+      if ( theItem < myObjects.count() - 1 ) {
+        myObjects.swap( theItem, theItem + 1 );
+        aRes = true;
+      }
+      break;
+  }
+
+  return aRes;
+}
+
+bool HYDROGUI_ZLevelsModel::move( const QList<int>& theItems, const int theType, 
+                               const int theDropItem )
+{
+  bool aRes = true;
+
+  bool isReverse = theType == Top || theType == Down;
+  QListIterator<int> anIt( theItems );
+  if ( isReverse ) {
+    anIt.toBack();
+    while ( anIt.hasPrevious() ) {
+      if ( !move( anIt.previous(), theType, theDropItem ) ) {
+        aRes = false;
+        break;
+      }
+    }
+  } else {
+    while ( anIt.hasNext() ) {
+      if ( !move( anIt.next(), theType, theDropItem ) ) {
+        aRes = false;
+        break;
+      }
+    }
+  }
+
+  reset(); //TODO dataChanged?
+
+  return aRes;
+}
\ No newline at end of file

diff --git a/src/ZLEVEL/HYDROGUI_ZLevelsModel.h b/src/ZLEVEL/HYDROGUI_ZLevelsModel.h
index bdacefc76aa41483aa426385edfa96f3cd3ba167..5dbd2a9f8e50683716dbbb944c8517fe32bcce94 100644 (file)
--- a/src/ZLEVEL/HYDROGUI_ZLevelsModel.h
+++ b/src/ZLEVEL/HYDROGUI_ZLevelsModel.h
@@ -36,19 +36,30 @@ class HYDROGUI_ZLevelsModel : public QAbstractListModel
 {
   Q_OBJECT
 
+public:
+  enum OpType { Top, Up, Down, Bottom, DragAndDrop };
+
 public:
   HYDROGUI_ZLevelsModel( QObject* theParent = 0 );
   virtual ~HYDROGUI_ZLevelsModel();
 
   virtual QVariant data( const QModelIndex &theIndex, int theRole = Qt::DisplayRole ) const;  
 
-  virtual int rowCount( const QModelIndex& theParent = QModelIndex() ) const;
+  virtual int rowCount( const QModelIndex &theParent = QModelIndex() ) const;
+
   virtual QVariant headerData( int theSection,
                                Qt::Orientation theOrientation,
                                int theRole = Qt::DisplayRole ) const;
 
+  QList<int> getIds( const QModelIndexList& theIndexes, bool theIsToSort = true ) const;
+
   void setObjects( const QList<QString>& theObjects );
 
+  bool move( const int theItem, const int theType, 
+             const int theDropItem = -1 );
+  bool move( const QList<int>& theItems, const int theType, 
+             const int theDropItem = -1 );
+
 protected:
   bool IsObjectVisible( int theIndex ) const;
 
@@ -57,4 +68,4 @@ private:
   QPixmap myEmpty, myEye;
 };
 
-#endif
+#endif
\ No newline at end of file