Changes in src/UIElements/Views/Qt4/QtWorldView.cpp [0aa122:a39006]

File:

• src/UIElements/Views/Qt4/QtWorldView.cpp (modified) (6 diffs)

src/UIElements/Views/Qt4/QtWorldView.cpp

@@ -28 +28 @@
 #include "molecule.hpp"
 #include "MoleculeListClass.hpp"
+#include "Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp"
+#include "Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp"
 
 using namespace std;
@@ -36 +38 @@
 // these attributes are skiped so far
 const int QtWorldView::COLUMNCOUNT = COLUMNTYPES_MAX;
-const char *QtWorldView::COLUMNNAMES[QtWorldView::COLUMNCOUNT]={"Name","Atoms","Formula"/*,"Size"*/};
+const char *QtWorldView::COLUMNNAMES[QtWorldView::COLUMNCOUNT]={"Name","Atoms","Formula","Occurrence"/*,"Size"*/};
 
 QtWorldView::QtWorldView(QWidget * _parent) :
-  QTableWidget (_parent),
+  QTreeWidget (_parent),
   Observer("QtWorldView")
 {
-  setRowCount(0);
   setColumnCount(COLUMNCOUNT);
+  setSelectionMode(QAbstractItemView::MultiSelection);
 
-  for(int i=0; i<COLUMNCOUNT;++i) {
-    QTableWidgetItem *heading = new QTableWidgetItem();
-    std::cout << "Creating heading item " << heading << "." << std::endl;
-    heading->setText(QString(COLUMNNAMES[i]));
-    setHorizontalHeaderItem(i,heading);
-  }
+  QStringList header;
+  for(int i=0; i<COLUMNCOUNT;++i)
+    header << COLUMNNAMES[i];
+  setHeaderLabels(header);
 
   molecules = World::getInstance().getMolecules();
   molecules->signOn(this);
-  update(molecules);
 
-  connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
-  connect(this,SIGNAL(cellClicked(int,int)),this,SLOT(cellSelected(int,int)));
+  dirty = true;
+  refill();
+
+  //connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
+  connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
 
 }
@@ -67 +69 @@
 
 void QtWorldView::update(Observable *publisher) {
+
+  dirty = true;
+
+  // force an update from Qt...
+  clear();
+}
+
+void QtWorldView::refill() {
   int numMolecules = molecules->ListOfMolecules.size();
-  setRowCount(numMolecules);
+  clear();
   molSelection.resize(numMolecules);
+
+  // list of (unique) formulas in the world
+  std::vector<Formula> formula;
+
   int i;
   MoleculeList::iterator iter;
@@ -76 +90 @@
       ++i,++iter) {
 
+    // find group if already in list
+    QTreeWidgetItem *groupItem = NULL;
+    for (unsigned int j=0;j<formula.size();j++)
+      if ((*iter)->getFormula() == formula[j]){
+        groupItem = topLevelItem(j);
+        break;
+      }
+
+    // new molecule type -> create new group
+    if (!groupItem){
+      formula.push_back((*iter)->getFormula());
+      groupItem = new QTreeWidgetItem(this);
+      groupItem->setText(0, QString((*iter)->getName().c_str()));
+      groupItem->setText(1, QString::number((*iter)->getAtomCount()));
+      groupItem->setText(2, QString((*iter)->getFormula().toString().c_str()));
+      groupItem->setText(3, "0");
+    }
+
+    // add molecule
+    QTreeWidgetItem *molItem = new QTreeWidgetItem(groupItem);
+    molItem->setText(0, QString((*iter)->getName().c_str()));
+    molItem->setText(1, QString::number((*iter)->getAtomCount()));
+    molItem->setText(2, QString((*iter)->getFormula().toString().c_str()));
     const int index = (*iter)->IndexNr;
-    QTableWidgetItem *indexWidget = new QTableWidgetItem();
-    //std::cout << "Creating index item " << indexWidget << "." << std::endl;
-    indexWidget->setText(QString::number(index));
-    indexWidget->setData(Qt::UserRole,QVariant(index));
-    setVerticalHeaderItem(i,indexWidget);
+    molItem->setData(0, Qt::UserRole, QVariant(index));
+    molItem->setSelected(World::getInstance().isSelected(*iter));
 
-    const string name = (*iter)->getName();
-    QTableWidgetItem *nameWidget = new QTableWidgetItem();
-    //std::cout << "Creating name item " << nameWidget << " at " << i << "," << NAME << "." << std::endl;
-    nameWidget->setText(QString(name.c_str()));
-    setItem(i,NAME,nameWidget);
 
-    const int atomCount = (*iter)->getAtomCount();
-    QTableWidgetItem *countWidget= new QTableWidgetItem();
-    //std::cout << "Creating count item " << countWidget << " at " << i << "," << ATOMCOUNT << "." << std::endl;
-    countWidget->setText(QString::number(atomCount));
-    countWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-    setItem(i,ATOMCOUNT,countWidget);
+    // increase group occurrence
+    int count = groupItem->text(3).toInt() + 1;
+    groupItem->setText(3, QString::number(count));
 
-    const Formula formula = (*iter)->getFormula();
-    QTableWidgetItem *formulaWidget= new QTableWidgetItem();
-    //std::cout << "Creating formula item " << formulaWidget << " at " << i << "," << FORMULA << "." << std::endl;
-    formulaWidget->setText(QString(formula.toString().c_str()));
-    formulaWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-    setItem(i,FORMULA,formulaWidget);
+    //molSelection[i]=nameWidget->isSelected();
+  }
+  dirty = false;
+}
 
-    molSelection[i]=nameWidget->isSelected();
-  }
+void QtWorldView::paintEvent(QPaintEvent * event)
+{
+  if (dirty)
+    refill();
+  QTreeWidget::paintEvent(event);
 }
 
@@ -110 +137 @@
 }
 
-void QtWorldView::moleculeChanged(int row, int column) {
-  int idx = verticalHeaderItem(row)->data(Qt::UserRole).toInt();
+void QtWorldView::moleculeChanged() {
+  /*int idx = verticalHeaderItem(row)->data(Qt::UserRole).toInt();
   molecule *mol = molecules->ReturnIndex(idx);
   string cellValue = item(row,NAME)->text().toStdString();
@@ -119 +146 @@
   else if(cellValue==""){
     item(row,NAME)->setText(QString(mol->getName().c_str()));
-  }
+  }*/
 }
 
 
-void QtWorldView::cellSelected(int row, int column){
-  //std::cout << "Selection in (" << row << "," << column << "): " << item(row,column) << std::endl;
-  bool state = item(row,column)->isSelected();
-  for(int i = 0; i<COLUMNCOUNT; i++){
-    //std::cout << "Setting " << i << "-th item " << item(row,i) << " in row " << row << " to state selected." << std::endl;
-    item(row,i)->setSelected(state);
-  }
-  // figure out which rows have changed
-  for(int i=0; i<rowCount();++i){
-    state = item(i,0)->isSelected();
-    if(molSelection[i]!=state){
-      int idx = verticalHeaderItem(i)->data(Qt::UserRole).toInt();
-      molecule *mol = molecules->ReturnIndex(idx);
-      if(state){
-        emit moleculeSelected(mol);
+void QtWorldView::rowSelected(){
+
+  // lookup all molecules in the treeWidget
+  for (int i=0;i<topLevelItemCount();i++){
+    QTreeWidgetItem *top = topLevelItem(i);
+    for (int j=0;j<top->childCount();j++){
+
+      // molecules are 1 level below the top
+      QTreeWidgetItem *molItem = top->child(j);
+
+      // molecule index stored as user data
+      int index = molItem->data(0, Qt::UserRole).toInt();
+      molecule *mol = molecules->ReturnIndex(index);
+      ASSERT(mol, "QtWorldView::rowSelected()");
+
+      // selection changed by user?
+      bool molSelectedWorld = World::getInstance().isSelected(mol);
+      bool molSelectedList = molItem->isSelected();
+      //std::cout << molSelectedWorld << " " << molSelectedList << std::endl;
+
+      if (molSelectedWorld != molSelectedList){
+
+        // apply new selection state
+        if (molSelectedList){
+          //std::cout << "select molecule" << std::endl;
+          MoleCuilder::SelectionMoleculeById(mol->getId());
+        }else{
+          //std::cout << "unselect molecule" << std::endl;
+          MoleCuilder::SelectionNotMoleculeById(mol->getId());
+        }
       }
-      else{
-        emit moleculeUnSelected(mol);
-      }
-      molSelection[i]=state;
     }
   }