Changeset 8ccf3b for src/UIElements/Views/Qt4/QtMoleculeList.hpp

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.

File:

• src/UIElements/Views/Qt4/QtMoleculeList.hpp (modified) (5 diffs)

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;
 };