Changeset 3054f4a for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

Timestamp:

Apr 20, 2016, 8:51:51 AM (9 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:

0a558d

Parents:

1a58ce

git-author:

Frederik Heber <heber@…> (03/21/16 21:13:43)

git-committer:

Frederik Heber <heber@…> (04/20/16 08:51:51)

Message:

QtObserved...Observed now get index on ...Removed() signal.

• Changed slots of QtElementList, QtMoleculeList, and QtMoleculeListView. This is not all of them, but they now all used ObservedValue_Index_t.

File:

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

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

@@ -56 +56 @@
 
 signals:
-  void moleculesVisibilityChanged(const moleculeId_t, bool);
+  void moleculesVisibilityChanged(ObservedValue_Index_t, bool);
 
 private slots:
   void moleculeInserted(QtObservedMolecule::ptr _mol);
-  void moleculeRemoved(const moleculeId_t _id);
-  void moleculeIndexChanged(const moleculeId_t _oldid, const moleculeId_t _newid);
+  void moleculeRemoved(ObservedValue_Index_t _id);
 
 private:
   friend class QtMoleculeListView;
 
-  bool isMoleculeItemPresent(const moleculeId_t _molid) const;
-  QtMoleculeItem * MoleculeIdToItem(const moleculeId_t _molid) const;
-  const moleculeId_t ItemToMoleculeId(const QtMoleculeItem * const _item) const;
-  const QModelIndex MoleculeIdToIndex(const moleculeId_t _id) const;
-  const moleculeId_t IndexToMoleculeId(const QModelIndex &_index) const;
+  bool isMoleculeItemPresent(ObservedValue_Index_t _id) const;
+  QtMoleculeItem * MoleculeIdToItem(ObservedValue_Index_t _id) const;
+  ObservedValue_Index_t ItemToMoleculeId(const QtMoleculeItem * const _item) const;
+  const QModelIndex MoleculeIdToIndex(ObservedValue_Index_t _id) const;
+  ObservedValue_Index_t IndexToMoleculeId(const QModelIndex &_index) const;
   QtMoleculeItem * getSpecificMoleculeItem(
       const QtMoleculeItem * const _item,
@@ -107 +106 @@
   FormulaTreeItemBiMap_t FormulaItemBiMap;
 
-  typedef std::map<moleculeId_t, std::string> MoleculeFormulaMap_t;
+  typedef std::map<ObservedValue_Index_t, std::string> MoleculeFormulaMap_t;
   //!> map of (unique) formulas in the world
   MoleculeFormulaMap_t MoleculeFormulaMap;
 
-  typedef boost::bimap<moleculeId_t, QtMoleculeItem*> MoleculeItemBiMap_t;
+  typedef boost::bimap<ObservedValue_Index_t, QtMoleculeItem*> MoleculeItemBiMap_t;
   MoleculeItemBiMap_t MoleculeItemBiMap;
-
-  typedef std::set< moleculeId_t > list_of_molecules_t;
-  typedef std::set< std::pair<moleculeId_t, QtMoleculeItem::COLUMNTYPES> > list_of_molecule_items_t;
-  typedef std::set< std::pair<std::string, QtMoleculeItem::COLUMNTYPES> > list_of_group_items_t;
 
   //!> listens to all QtObservedMolecule and relays important events to us