Changeset 8ccf3b for src/UIElements

Timestamp:

Jan 27, 2015, 5:18:30 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

1c3390

Parents:

6770fa

git-author:

Frederik Heber <heber@…> (01/14/15 22:32:34)

git-committer:

Frederik Heber <heber@…> (01/27/15 17:18:30)

Message:

First change to convert QtMoleculeList into QStandardItemModel.

• this will keep the QtMoleculeList up-to-date automatically.

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.cpp (modified) (2 diffs)
• Views/Qt4/QtMoleculeList.cpp (modified) (14 diffs)
• Views/Qt4/QtMoleculeList.hpp (modified) (5 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -95 +95 @@
   QVBoxLayout *layout = new QVBoxLayout(layoutwidget);
 
-  moleculeList = new QtMoleculeList(worldTab);
+  QTreeView *moleculeListView = new QTreeView(worldTab);
+  moleculeList = new QtMoleculeList;
+  moleculeListView->setModel(moleculeList);
   elementList = new QtElementList(worldTab);
   homologyList = new QtHomologyList(worldTab);
@@ -129 +131 @@
   layout->addWidget(worldTab);
   splitter2->addWidget(layoutwidget);
-  worldTab->addTab(moleculeList, "Molecules");
+  worldTab->addTab(moleculeListView, "Molecules");
   worldTab->addTab(elementList, "All Elements");
   worldTab->addTab(fragmentList, "All Fragments");

src/UIElements/Views/Qt4/QtMoleculeList.cpp

@@ -59 +59 @@
 const char *QtMoleculeList::COLUMNNAMES[QtMoleculeList::COLUMNCOUNT]={"Name","Visibility", "Atoms","Formula","Occurrence"/*,"Size"*/};
 
-QtMoleculeList::QtMoleculeList(QWidget * _parent) :
-  QTreeWidget (_parent),
+QtMoleculeList::QtMoleculeList() :
   Observer("QtMoleculeList")
 {
   setColumnCount(COLUMNCOUNT);
-  setSelectionMode(QAbstractItemView::MultiSelection);
-
-  QStringList header;
-  for(int i=0; i<COLUMNCOUNT;++i)
-    header << COLUMNNAMES[i];
-  setHeaderLabels(header);
+//  setSelectionMode(QAbstractItemView::MultiSelection);
+
+//  QStringList header;
+//  for(int i=0; i<COLUMNCOUNT;++i)
+//    header << COLUMNNAMES[i];
+//  setHeaderLabels(header);
 
   World::getInstance().signOn(this, World::MoleculeInserted);
   World::getInstance().signOn(this, World::MoleculeRemoved);
-
 
   dirty = true;
@@ -82 +80 @@
   refill();
 
-  qRegisterMetaType<QItemSelection>("QItemSelection");
+//  qRegisterMetaType<QItemSelection>("QItemSelection");
   //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)));
+//  connect(selectionModel(),SIGNAL(selectionChanged(QItemSelection, QItemSelection)),this,SLOT(rowsSelected(QItemSelection, QItemSelection)));
+//  connect(this, SIGNAL(itemChanged(QStandardItem*, int)), this, SLOT(visibilityChanged(QStandardItem*, int)));
 }
 
@@ -97 +95 @@
   ASSERT(0,
       "QtMoleculeList::update() - we did not sign up for any global updates.");
+}
+
+QStandardItem * QtMoleculeList::MoleculeToItem(const molecule * const _mol)
+{
+  MoleculeItemBiMap_t::left_const_iterator iter =
+      MoleculeItemBiMap.left.find(_mol);
+  ASSERT( iter != MoleculeItemBiMap.left.end(),
+      "QtMoleculeList - could not find molecule "+_mol->getName()+" in my list.");
+  return iter->second;
 }
 
@@ -106 +113 @@
       {
         const molecule * const mol = World::getInstance().lastChanged<molecule>();
-        addItem(mol);
+        addItem( mol );
         break;
       }
@@ -112 +119 @@
       {
         const molecule * const mol = World::getInstance().lastChanged<molecule>();
-        removeItem(mol);
+        removeItem(  mol );
         break;
       }
@@ -129 +136 @@
 
 void QtMoleculeList::addGroupItem(
-    QTreeWidgetItem *&_groupItem,
+    QStandardItem *&mainitem,
     const std::string &_molecule_formula)
 {
-  _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->setData(0, Qt::UserRole, QVariant(-1));
+  QList<QStandardItem *> groupItems;
+  // fill item list
+  mainitem = new QStandardItem(QString("default"));
+  mainitem->setFlags(mainitem->flags() ^ Qt::ItemIsSelectable);
+  formula.insert( std::make_pair(_molecule_formula, mainitem) );
+  groupItems << mainitem;
+  QStandardItem *visitem = new QStandardItem;
+  visitem->setCheckState(Qt::Unchecked);
+  visitem->setFlags(mainitem->flags() | Qt::ItemIsUserCheckable);
+  groupItems << visitem;
+  groupItems << new QStandardItem(QString::number(0));
+  groupItems << new QStandardItem(QString(""));
+  groupItems << new QStandardItem(QString::number(0));
+  invisibleRootItem()->appendRow(groupItems);
+//  _groupItem->setData(0, Qt::UserRole, QVariant(-1));
 }
 
 void QtMoleculeList::addMoleculeItem(
-    QTreeWidgetItem *&_groupItem,
+    QStandardItem *_groupitem,
     const molecule *_mol,
     const std::string &_molecule_formula)
 {
-  QTreeWidgetItem *molItem = new QTreeWidgetItem(_groupItem);
-  molItem->setText(NAME, QString(_mol->getName().c_str()));
-  molItem->setFlags(molItem->flags() | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
-  molItem->setCheckState(VISIBILITY, Qt::Unchecked);
-  molItem->setText(ATOMCOUNT, QString::number(_mol->getAtomCount()));
-  molItem->setText(FORMULA, QString(_molecule_formula.c_str()));
-  const int index = _mol->getId();
-  molItem->setData(0, Qt::UserRole, QVariant(index));
-  molItem->setSelected(World::getInstance().isSelected(_mol));
+  QList<QStandardItem *> molItems;
+  QStandardItem *mainitem = new QStandardItem(QString(_mol->getName().c_str()));
+  mainitem->setFlags(mainitem->flags() | Qt::ItemIsSelectable);
+//  mainitem->setSelected(World::getInstance().isSelected(_mol));
+  MoleculeItemBiMap.left.insert( std::make_pair(_mol, mainitem) );
+  molItems << mainitem;
+  QStandardItem *visitem = new QStandardItem();
+  visitem->setCheckState(Qt::Unchecked);
+  visitem->setFlags(mainitem->flags() | Qt::ItemIsUserCheckable);
+  molItems << visitem;
+  molItems << new QStandardItem(QString::number(_mol->getAtomCount()));
+  molItems << new QStandardItem(QString(_molecule_formula.c_str()));
+  molItems << new QStandardItem(QString::number(0));
+//  const int index = _mol->getId();
+//  molItem->setData(0, Qt::UserRole, QVariant(index));
+  _groupitem->appendRow(molItems);
 }
 
@@ -166 +185 @@
   changing = true;
   // find group if already in list
-  QTreeWidgetItem *groupItem = NULL;
+  QStandardItem *groupItem = NULL;
 
   const std::string &molecule_formula = _mol->getFormula().toString();
@@ -197 +216 @@
 
   // increase group occurrence
-  int count = groupItem->text(OCCURRENCE).toInt() + 1;
-  groupItem->setText(OCCURRENCE, QString::number(count));
+  const int index = groupItem->index().row();
+  QStandardItem *occ_item = invisibleRootItem()->child(index, OCCURRENCE);
+  int count = occ_item->text().toInt() + 1;
+  occ_item->setText(QString::number(count));
 
   changing = false;
@@ -225 +246 @@
   formula.clear();
   FormulaVisibilityCountMap.clear();
+  MoleculeItemBiMap.clear();
 
   for (std::vector<molecule*>::const_iterator iter = molecules.begin();
@@ -236 +258 @@
 }
 
+/*
 void QtMoleculeList::paintEvent(QPaintEvent * event)
 {
@@ -242 +265 @@
   QTreeWidget::paintEvent(event);
 }
+*/
 
 void QtMoleculeList::subjectKilled(Observable *publisher) {
 }
 
-void QtMoleculeList::visibilityChanged(QTreeWidgetItem* item, int column)
+/*
+void QtMoleculeList::visibilityChanged(QStandardItem* item, int column)
 {
   if ((!changing) && (!clearing) && (!ChangingChildrensVisibility))
@@ -313 +338 @@
     }
 }
+*/
 
 void QtMoleculeList::moleculeChanged() {
@@ -326 +352 @@
 }
 
+/*
 void QtMoleculeList::rowsSelected(const QItemSelection & selected, const QItemSelection & deselected){
 
@@ -369 +396 @@
   selecting = false;
 }
+
+*/

src/UIElements/Views/Qt4/QtMoleculeList.hpp

@@ -14 +14 @@
 #endif
 
-#include <QtGui/QTreeWidget>
+#include <QtGui/QStandardItem>
+#include <QtGui/QStandardItemModel>
 
+#include <boost/bimap.hpp>
 #include <map>
 #include <string>
@@ -26 +28 @@
 class MoleculeListClass;
 
-class QtMoleculeList : public QTreeWidget, public Observer
+class QtMoleculeList : public QStandardItemModel, public Observer
 {
   Q_OBJECT
 
 public:
-  QtMoleculeList(QWidget * _parent=0);
+  QtMoleculeList();
   virtual ~QtMoleculeList();
 
@@ -38 +40 @@
   virtual void recieveNotification(Observable *publisher, Notification_ptr notification);
   virtual void subjectKilled(Observable *publisher);
-  virtual void paintEvent(QPaintEvent * event);
+//  virtual void paintEvent(QPaintEvent * event);
   void refill();
 
@@ -47 +49 @@
 private slots:
   void moleculeChanged();
-  void visibilityChanged(QTreeWidgetItem*, int);
+//  void visibilityChanged(QStandardItem*, int);
 
-  void rowsSelected(const QItemSelection & selected, const QItemSelection & deselected);
+//  void rowsSelected(const QItemSelection & selected, const QItemSelection & deselected);
+
 
 signals:
@@ -63 +66 @@
   bool ChangingChildrensVisibility;
 
-  void addItem(const molecule *_mol);
-  void addGroupItem(QTreeWidgetItem *&_groupItem, const std::string &_molecule_formula);
-  void addMoleculeItem(QTreeWidgetItem *&_groupItem, const molecule *_mol, const std::string &molecule_formula);
-  void removeItem(const molecule *_mol);
+  QStandardItem * MoleculeToItem(const molecule * const _mol);
+
+  void addItem(const molecule * const _mol);
+  void addGroupItem(QStandardItem *&mainitem, const std::string &_molecule_formula);
+  void addMoleculeItem(QStandardItem *_groupitem, const molecule *_mol, const std::string &molecule_formula);
+  void removeItem(const molecule * const _mol);
 
   typedef std::map<std::string, unsigned int> FormulaVisibilityCountMap_t;
   FormulaVisibilityCountMap_t FormulaVisibilityCountMap;
 
-  typedef std::map<std::string, QTreeWidgetItem*> FormulaTreeItemMap_t;
+  typedef std::map<std::string, QStandardItem*> FormulaTreeItemMap_t;
   //!> map of (unique) formulas in the world
   FormulaTreeItemMap_t formula;
+
+  typedef boost::bimap<const molecule *, QStandardItem*> MoleculeItemBiMap_t;
+  MoleculeItemBiMap_t MoleculeItemBiMap;
 };