Changes in src/UIElements/Views/Qt4/QtMoleculeList.cpp [d7cad1:0741f4d]

File:

• src/UIElements/Views/Qt4/QtMoleculeList.cpp (modified) (9 diffs)

src/UIElements/Views/Qt4/QtMoleculeList.cpp

@@ -55 +55 @@
 // these attributes are skipped so far
 const int QtMoleculeList::COLUMNCOUNT = COLUMNTYPES_MAX;
-const char *QtMoleculeList::COLUMNNAMES[QtMoleculeList::COLUMNCOUNT]={"Name","Visibility", "Atoms","Formula","Occurrence"/*,"Size"*/};
+const char *QtMoleculeList::COLUMNNAMES[QtMoleculeList::COLUMNCOUNT]={"Name","Atoms","Formula","Occurrence"/*,"Size"*/};
 
 QtMoleculeList::QtMoleculeList(QWidget * _parent) :
@@ -69 +69 @@
   setHeaderLabels(header);
 
-  World::getInstance().signOn(this, World::MoleculeInserted);
-  World::getInstance().signOn(this, World::MoleculeRemoved);
+  World::getInstance().signOn(this);//, World::MoleculeInserted);
+  //World::getInstance().signOn(this, World::MoleculeRemoved);
 
 
@@ -76 +76 @@
   clearing = false;
   selecting = false;
-  ChangingChildrensVisibility = false;
   refill();
 
@@ -82 +81 @@
   //connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
   connect(selectionModel(),SIGNAL(selectionChanged(QItemSelection, QItemSelection)),this,SLOT(rowsSelected(QItemSelection, QItemSelection)));
-  connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(visibilityChanged(QTreeWidgetItem*, int)));
+
 }
 
 QtMoleculeList::~QtMoleculeList()
 {
-  World::getInstance().signOff(this, World::MoleculeInserted);
-  World::getInstance().signOff(this, World::MoleculeRemoved);
+  World::getInstance().signOff(this);//, World::MoleculeInserted);
+  //World::getInstance().signOff(this, World::MoleculeRemoved);
 }
 
 void QtMoleculeList::update(Observable *publisher) {
-  ASSERT(0,
-      "QtMoleculeList::update() - we did not sign up for any global updates.");
-}
-
-void QtMoleculeList::recieveNotification(Observable *publisher, Notification_ptr notification) {
 
   if (selecting)
@@ -102 +96 @@
 
   dirty = true;
-}
-
+
+  // force an update from Qt...
+  clearing = true;
+  clear();
+  clearing = false;
+}
 
 void QtMoleculeList::refill() {
@@ -110 +108 @@
 
   clear();
-  formula.clear();
-  FormulaVisibilityCountMap.clear();
+
+  // list of (unique) formulas in the world
+  std::vector<Formula> formula;
 
   for (std::vector<molecule*>::const_iterator iter = molecules.begin();
@@ -119 +118 @@
     // find group if already in list
     QTreeWidgetItem *groupItem = NULL;
-    const std::string &molecule_formula = (*iter)->getFormula().toString();
-    FormulaTreeItemMap_t::const_iterator formulaiter =
-        formula.find(molecule_formula);
+    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 (formulaiter == formula.end()){
-      // insert new formula entry into visibility
-#ifndef NDEBUG
-      std::pair< FormulaVisibilityCountMap_t::iterator, bool> visibilityinserter =
-#endif
-          FormulaVisibilityCountMap.insert(
-              std::make_pair( molecule_formula, (unsigned int)0) );
-      ASSERT( visibilityinserter.second,
-          "QtMoleculeList::refill() - molecule with formula "
-          +molecule_formula+" already in FormulaVisibilityCountMap.");
-
-      // create item and place into Map with formula as key
+    if (!groupItem){
+      formula.push_back((*iter)->getFormula());
       groupItem = new QTreeWidgetItem(this);
-      formula.insert( std::make_pair(molecule_formula, groupItem) );
-      // fill item
-      groupItem->setText(NAME, QString("default"));
-      groupItem->setFlags((groupItem->flags() | Qt::ItemIsUserCheckable) ^ Qt::ItemIsSelectable);
-      groupItem->setCheckState(VISIBILITY, Qt::Unchecked);
-      groupItem->setText(ATOMCOUNT, QString::number(0));
-      groupItem->setText(FORMULA, QString(""));
-      groupItem->setText(OCCURRENCE, "0");
+      groupItem->setText(0, QString("default"));
+      groupItem->setText(1, QString::number(0));
+      groupItem->setText(2, QString(""));
+      groupItem->setText(3, "0");
       groupItem->setData(0, Qt::UserRole, QVariant(-1));
-    } else {
-      groupItem = formulaiter->second;
     }
 
     // add molecule
     QTreeWidgetItem *molItem = new QTreeWidgetItem(groupItem);
-    molItem->setText(NAME, QString((*iter)->getName().c_str()));
-    molItem->setFlags(molItem->flags() | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
-    molItem->setCheckState(VISIBILITY, Qt::Unchecked);
-    molItem->setText(ATOMCOUNT, QString::number((*iter)->getAtomCount()));
-    molItem->setText(FORMULA, QString(molecule_formula.c_str()));
+    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)->getId();
     molItem->setData(0, Qt::UserRole, QVariant(index));
     molItem->setSelected(World::getInstance().isSelected(*iter));
 
+
     // increase group occurrence
-    int count = groupItem->text(OCCURRENCE).toInt() + 1;
-    groupItem->setText(OCCURRENCE, QString::number(count));
+    int count = groupItem->text(3).toInt() + 1;
+    groupItem->setText(3, QString::number(count));
   }
   dirty = false;
@@ -177 +161 @@
 
 void QtMoleculeList::subjectKilled(Observable *publisher) {
-}
-
-void QtMoleculeList::visibilityChanged(QTreeWidgetItem* item, int column)
-{
-  if ((!clearing) && (!ChangingChildrensVisibility))
-    if (column == VISIBILITY) {
-      const moleculeId_t molid = item->data(0, Qt::UserRole).toInt();
-      const bool visible = item->checkState(VISIBILITY);
-      if (molid != (unsigned int)-1) { // molecule item
-        const molecule * const _molecule =
-            World::getInstance().getMolecule(MoleculeById(molid));
-        ASSERT( _molecule != NULL,
-            "QtMoleculeList::visibilityChanged() - molecule with id "
-            +toString(molid)+" is not known to World.");
-        const std::string &molecule_formula = _molecule->getFormula().toString();
-        ASSERT( FormulaVisibilityCountMap.count(molecule_formula) != 0,
-            "QtMoleculeList::visibilityChanged() - molecule with formula " +molecule_formula
-            +" is not present in FormulaVisibilityCountMap.");
-
-        // get parent
-        QTreeWidgetItem *groupItem = item->parent();
-        ASSERT( groupItem != NULL,
-            "QtMoleculeList::visibilityChanged() - item with id "+toString(molid)
-            +" has not parent?");
-        // check whether we have to set the group item
-
-        ChangingChildrensVisibility = true;
-        if (visible) {
-          ++(FormulaVisibilityCountMap[molecule_formula]);
-          // compare with occurence/total number of molecules
-          if (FormulaVisibilityCountMap[molecule_formula] ==
-              (unsigned int)(groupItem->text(OCCURRENCE).toInt()))
-            groupItem->setCheckState(VISIBILITY, Qt::Checked);
-        } else {
-          --(FormulaVisibilityCountMap[molecule_formula]);
-          // none selected anymore?
-          if (FormulaVisibilityCountMap[molecule_formula] == 0)
-            groupItem->setCheckState(VISIBILITY, Qt::Unchecked);
-        }
-        ChangingChildrensVisibility = false;
-
-        emit moleculesVisibilityChanged(molid, visible);
-
-      } else { // group item
-
-        // go through all children, but don't enter for groupItem once more
-        ChangingChildrensVisibility = true;
-        for (int i=0;i<item->childCount();++i) {
-          QTreeWidgetItem *molItem = item->child(i);
-          const moleculeId_t molid = molItem->data(0, Qt::UserRole).toInt();
-          ASSERT( molid != (unsigned int)-1,
-              "QtMoleculeList::visibilityChanged() - to child with index"
-              +toString(i)+" there is no molecule?");
-          molItem->setCheckState(VISIBILITY, visible ? Qt::Checked : Qt::Unchecked);
-
-          // emit signal
-          emit moleculesVisibilityChanged(molid, visible);
-        }
-        // set current number of visible children
-        const std::string molecule_formula =
-            item->text(FORMULA).toStdString();
-        FormulaVisibilityCountMap[molecule_formula] =
-            visible ? item->text(OCCURRENCE).toInt() : 0;
-
-        ChangingChildrensVisibility = false;
-      }
-    }
 }
 
@@ -268 +185 @@
   // Select all molecules which belong to newly selected rows.
   QModelIndex index;
-  {
-    QModelIndexList items = selected.indexes();
-    molids_t ids;
-    ids.reserve(items.size());
-    foreach (index, items)
-      if (index.column() == 0){
-        int mol_id = model()->data(index, Qt::UserRole).toInt();
-        if (mol_id < 0)
-          continue;
-        ids.push_back(mol_id);
-        //std::cout << "select molecule" << std::endl;
-      }
-    MoleCuilder::SelectionMoleculeById(ids);
-  }
+  QModelIndexList items = selected.indexes();
+  foreach (index, items)
+    if (index.column() == 0){
+      int mol_id = model()->data(index, Qt::UserRole).toInt();
+      if (mol_id < 0)
+        continue;
+      //std::cout << "select molecule" << std::endl;
+      MoleCuilder::SelectionMoleculeById(mol_id);
+    }
 
   // Unselect all molecules which belong to newly unselected rows.
-  {
-    QModelIndexList items = deselected.indexes();
-    molids_t ids;
-    ids.reserve(items.size());
-    foreach (index, items)
-      if (index.column() == 0){
-        int mol_id = model()->data(index, Qt::UserRole).toInt();
-        if (mol_id < 0)
-          continue;
-        //std::cout << "unselect molecule" << std::endl;
-        ids.push_back(mol_id);
-      }
-    MoleCuilder::SelectionNotMoleculeById(ids);
-  }
+  items = deselected.indexes();
+  foreach (index, items)
+    if (index.column() == 0){
+      int mol_id = model()->data(index, Qt::UserRole).toInt();
+      if (mol_id < 0)
+        continue;
+      //std::cout << "unselect molecule" << std::endl;
+      MoleCuilder::SelectionNotMoleculeById(mol_id);
+    }
 
   selecting = false;