Changeset 0f368b for src/UIElements

Timestamp:

Feb 14, 2016, 12:33:43 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:

b43585

Parents:

5cd3a33

git-author:

Frederik Heber <heber@…> (12/28/15 19:14:32)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:33:43)

Message:

Removed QtSelectionAgent usage in QtMoleculeListView.

• instead we subscribe to MoleculeObserver directly.

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.cpp (modified) (1 diff)
• Views/Qt4/MoleculeList/QtMoleculeListView.cpp (modified) (5 diffs)
• Views/Qt4/MoleculeList/QtMoleculeListView.hpp (modified) (3 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -110 +110 @@
   moleculeList = new QtMoleculeList(InstanceBoard, moleculeListView);
   moleculeListView->setModel(moleculeList);
-  moleculeListView->setSelectionChangedAgent(selectionagent);
 
   elementList = new QtElementList(worldTab);

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

@@ -35 +35 @@
 #include "QtMoleculeListView.hpp"
 
+#include <QtCore/QMetaType>
+
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp"
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
-#include "UIElements/Views/Qt4/QtSelectionChangedAgent.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -45 +46 @@
 #include "Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp"
 #include "Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp"
-
+#include "MoleculeObserver.hpp"
+#include "molecule.hpp"
 #include "World.hpp"
 
@@ -54 +56 @@
 {
   setSelectionMode(QAbstractItemView::MultiSelection);
+
+  qRegisterMetaType<QItemSelection>("QItemSelection");
+
+  MoleculeObserver::getInstance().signOn(this, molecule::SelectionChanged);
 }
 
 QtMoleculeListView::~QtMoleculeListView()
-{}
+{
+  MoleculeObserver::getInstance().signOff(this, molecule::SelectionChanged);
+}
 
 void QtMoleculeListView::setModel(QtMoleculeList *_moleculelist)
@@ -66 +74 @@
       selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
       this, SLOT(rowsSelected(const QItemSelection &, const QItemSelection &)), Qt::DirectConnection);
-}
-
-
-void QtMoleculeListView::setSelectionChangedAgent(QtSelectionChangedAgent *agent)
-{
-  connect(agent, SIGNAL(moleculeSelected(const moleculeId_t)),
-      this, SLOT(MoleculeSelected(const moleculeId_t)));
-  connect(agent, SIGNAL(moleculeUnselected(const moleculeId_t)),
-      this, SLOT(MoleculeUnselected(const moleculeId_t)));
 }
 
@@ -243 +242 @@
       }
       default:
-        ASSERT(0, "QtMoleculeListView::recieveNotification() - cannot get here, not subscribed to channel "
+        ASSERT(0, "QtMoleculeListView::recieveNotification() - cannot get here, not subscribed to World's channel "
             +toString(notification->getChannelNo()));
         break;
     }
+  } else if (dynamic_cast<molecule*>(publisher) != NULL) {
+    const molecule * const mol = dynamic_cast<molecule *>(publisher);
+    switch (notification->getChannelNo()) {
+      case molecule::SelectionChanged:
+      {
+        if (mol->getSelected())
+          MoleculeSelected(mol->getId());
+        else
+          MoleculeUnselected(mol->getId());
+        break;
+      }
+      default:
+        ASSERT(0, "QtMoleculeListView::recieveNotification() - cannot get here, not subscribed to mol's channel "
+            +toString(notification->getChannelNo()));
+        break;
+    }
+  } else {
+    ASSERT(0,
+        "QtMoleculeListView::recieveNotification() - cannot get here, unknown publisher "+toString(publisher));
   }
 }

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

@@ -22 +22 @@
 
 class QtMoleculeList;
-class QtSelectionChangedAgent;
 
 class QtMoleculeListView : public QTreeView, public Observer
@@ -34 +33 @@
   void setModel(QtMoleculeList *_moleculelist);
 
-  void setSelectionChangedAgent(QtSelectionChangedAgent *agent);
-
 public slots:
   void rowsSelected(const QItemSelection&, const QItemSelection&);
-
-  void MoleculeSelected(const moleculeId_t _id);
-  void MoleculeUnselected(const moleculeId_t _id);
 
 protected:
@@ -48 +42 @@
 
 private:
+  void MoleculeSelected(const moleculeId_t _id);
+  void MoleculeUnselected(const moleculeId_t _id);
+
   QModelIndex setIndexToLastColumn(const QModelIndex &_index) const;