Changeset 743eab for src/UIElements

Timestamp:

Apr 18, 2016, 10:33:41 PM (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:

bff202

Parents:

b65879

git-author:

Frederik Heber <heber@…> (03/21/16 19:56:27)

git-committer:

Frederik Heber <heber@…> (04/18/16 22:33:41)

Message:

Added missing updateState() to QtMoleculeList.

• As QtMoleculeItem no longer recieve notifications, QtMoleculeList must update each item itself.

Location:

src/UIElements/Views/Qt4/MoleculeList

Files:

• QtMoleculeList.cpp (modified) (4 diffs)
• QtMoleculeList.hpp (modified) (2 diffs)
• QtObservedMoleculeObserver.cpp (modified) (3 diffs)
• QtObservedMoleculeObserver.hpp (modified) (2 diffs)

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

@@ -87 +87 @@
   connect(&observer, SIGNAL(NameChanged(const QtObservedMolecule::ptr)),
       this, SLOT(nameChanged(const QtObservedMolecule::ptr)));
+  connect(&observer, SIGNAL(AtomCountChanged(const QtObservedMolecule::ptr)),
+      this, SLOT(atomcountChanged(const QtObservedMolecule::ptr)));
   connect(board, SIGNAL(moleculeIndexChanged(const moleculeId_t,const moleculeId_t)),
       this, SLOT(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)));
@@ -573 +575 @@
 void QtMoleculeList::formulaChanged(const QtObservedMolecule::ptr _mol)
 {
-  // we need the id as identifier to the items
+  // we need the id as identifier to the item
   const moleculeId_t molid = _mol->getMolIndex();
+  LOG(3, "DEBUG: QtMoleculeList got formulaChanged for id " << molid);
+  QtMoleculeItem *const molitem = MoleculeIdToItem(molid);
+  // update item
+  {
+    QtMoleculeItem *const formulaitem = getSpecificMoleculeItem(molitem, QtMoleculeItem::FORMULA);
+    ASSERT(formulaitem != NULL,
+        "QtMoleculeList::formulaChanged() - could not item for FORMULA.");
+    formulaitem->updateState(_mol);
+  }
+
   LOG(3, "DEBUG: Moving item to id " << molid);
   const MoleculeFormulaMap_t::iterator formulaiter =
@@ -587 +599 @@
   // then we move the item if necessary
   if (old_formula != new_formula) {
-    QtMoleculeItem *const molitem = MoleculeIdToItem(molid);
-    // update items
-    getSpecificMoleculeItem(molitem, QtMoleculeItem::FORMULA)->updateState(_mol);
-    getSpecificMoleculeItem(molitem, QtMoleculeItem::ATOMCOUNT)->updateState(_mol);
     LOG(3, "DEBUG: Moving item " << molitem);
     // remove from formula<->molecule bimap with old formula
@@ -612 +620 @@
 }
 
-void QtMoleculeList::nameChanged(const QtObservedMolecule::ptr _mol)
+void QtMoleculeList::atomcountChanged(const QtObservedMolecule::ptr _mol)
 {
   // we need the id as identifier to the items
   const moleculeId_t molid = _mol->getMolIndex();
-  // nothing to do, item updates itself
-  LOG(3, "DEBUG: QtMoleculeList got nameChangd for id " << molid);
+  LOG(3, "DEBUG: QtMoleculeList got atomcountChanged for id " << molid);
   QtMoleculeItem *const molitem = MoleculeIdToItem(molid);
   // update items
-  getSpecificMoleculeItem(molitem, QtMoleculeItem::NAME)->updateState(_mol);
-}
+  QtMoleculeItem *const atomcountitem = getSpecificMoleculeItem(molitem, QtMoleculeItem::ATOMCOUNT);
+  ASSERT(atomcountitem != NULL,
+      "QtMoleculeList::atomcountChanged() - could not item for ATOMCOUNT.");
+  atomcountitem->updateState(_mol);
+}
+
+void QtMoleculeList::nameChanged(const QtObservedMolecule::ptr _mol)
+{
+  // we need the id as identifier to the items
+  const moleculeId_t molid = _mol->getMolIndex();
+  LOG(3, "DEBUG: QtMoleculeList got nameChanged for id " << molid);
+  QtMoleculeItem *const molitem = MoleculeIdToItem(molid);
+  // update items
+  QtMoleculeItem *const nameitem = getSpecificMoleculeItem(molitem, QtMoleculeItem::NAME);
+  ASSERT(nameitem != NULL,
+      "QtMoleculeList::nameChanged() - could not item for NAME.");
+  nameitem->updateState(_mol);
+}

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

@@ -50 +50 @@
   void formulaChanged(const QtObservedMolecule::ptr _mol);
   void nameChanged(const QtObservedMolecule::ptr _mol);
+  void atomcountChanged(const QtObservedMolecule::ptr _mol);
 
   void moleculeNameChanged(QStandardItem*);
@@ -55 +56 @@
 
 signals:
-  void moleculeSelected(const QtObservedMolecule::ptr _mol);
-  void moleculeUnSelected(const QtObservedMolecule::ptr _mol);
   void moleculesVisibilityChanged(const moleculeId_t, bool);
-
-private:
 
 private slots:

src/UIElements/Views/Qt4/MoleculeList/QtObservedMoleculeObserver.cpp

@@ -53 +53 @@
 void QtObservedMoleculeObserver::moleculeInserted(const QtObservedMolecule::ptr _molecule)
 {
+  connect( _molecule.get(), SIGNAL(atomcountChanged()), this, SLOT(atomcountChanged()));
   connect( _molecule.get(), SIGNAL(formulaChanged()), this, SLOT(formulaChanged()));
   connect( _molecule.get(), SIGNAL(nameChanged()), this, SLOT(nameChanged()));
+  connect( _molecule.get(), SIGNAL(selectedChanged()), this, SLOT(selectionChanged()));
   emit MoleculeInserted(_molecule);
 }
@@ -61 +63 @@
 {
   const QtObservedMolecule::ptr mol = board->getObservedMolecule(_moleculeid);
+  disconnect( mol.get(), SIGNAL(atomcountChanged()), this, SLOT(atomcountChanged()));
   disconnect( mol.get(), SIGNAL(formulaChanged()), this, SLOT(formulaChanged()));
   disconnect( mol.get(), SIGNAL(nameChanged()), this, SLOT(nameChanged()));
+  disconnect( mol.get(), SIGNAL(selectedChanged()), this, SLOT(selectionChanged()));
   emit MoleculeRemoved(_moleculeid);
+}
+
+void QtObservedMoleculeObserver::atomcountChanged()
+{
+  QtObservedMolecule * const mol = static_cast<QtObservedMolecule *>(sender());
+  emit AtomCountChanged(mol->getRef());
 }
 
@@ -77 +87 @@
   emit NameChanged(mol->getRef());
 }
+
+void QtObservedMoleculeObserver::selectionChanged()
+{
+  QtObservedMolecule * const mol = static_cast<QtObservedMolecule *>(sender());
+  emit SelectionChanged(mol->getRef());
+}
+

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

@@ -38 +38 @@
 
 signals:
+  void AtomCountChanged(const QtObservedMolecule::ptr _molecule);
   void FormulaChanged(const QtObservedMolecule::ptr _molecule);
   void NameChanged(const QtObservedMolecule::ptr _molecule);
+  void SelectionChanged(const QtObservedMolecule::ptr _molecule);
 
   // relayed signals
@@ -47 +49 @@
 private slots:
   // relayed, and modified signals
+  void atomcountChanged();
   void formulaChanged();
   void nameChanged();
+  void selectionChanged();
 
   void moleculeInserted(const QtObservedMolecule::ptr _molecule);