Changeset 3054f4a for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.cpp

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/QtMoleculeListView.cpp (modified) (11 diffs)

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

@@ -42 +42 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "CodePatterns/Observer/Notification.hpp"
-
 #include "Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp"
 #include "Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp"
-#include "MoleculeObserver.hpp"
 #include "molecule.hpp"
 #include "World.hpp"
@@ -52 +49 @@
 QtMoleculeListView::QtMoleculeListView(QWidget * _parent) :
   QTreeView(_parent),
-  Observer("QtMoleculeListView"),
   selecting(false)
 {
@@ -58 +54 @@
 
   qRegisterMetaType<QItemSelection>("QItemSelection");
-
-  MoleculeObserver::getInstance().signOn(this, molecule::SelectionChanged);
 }
 
 QtMoleculeListView::~QtMoleculeListView()
 {
-  MoleculeObserver::getInstance().signOff(this, molecule::SelectionChanged);
 }
 
@@ -74 +67 @@
       selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
       this, SLOT(rowsSelected(const QItemSelection &, const QItemSelection &)), Qt::DirectConnection);
-}
-
-void QtMoleculeListView::update(Observable *publisher)
-{}
+
+  connect(&_moleculelist->observer, SIGNAL(SelectionChanged(QtObservedMolecule::ptr)),
+      this, SLOT(selectionChanged(QtObservedMolecule::ptr)));
+}
 
 QModelIndex QtMoleculeListView::setIndexToLastColumn(const QModelIndex &_index) const
@@ -110 +103 @@
     foreach (index, items)
       if ((index.column() == 0) && (selectionModel()->isSelected(index))) {
-        const moleculeId_t mol_id = moleculelist->IndexToMoleculeId(index);
+        const moleculeId_t mol_id = moleculelist->observer.getIdtoIndex(
+            moleculelist->IndexToMoleculeId(index));
         const molecule * const mol = const_cast<const World &>(World::getInstance()).
             getMolecule(MoleculeById(mol_id));
@@ -134 +128 @@
     foreach (index, items)
       if ((index.column() == 0) && (!selectionModel()->isSelected(index))) {
-        const moleculeId_t mol_id = moleculelist->IndexToMoleculeId(index);
+        const moleculeId_t mol_id = moleculelist->observer.getIdtoIndex(
+            moleculelist->IndexToMoleculeId(index));
         const molecule * const mol = const_cast<const World &>(World::getInstance()).
             getMolecule(MoleculeById(mol_id));
@@ -154 +149 @@
 }
 
-void QtMoleculeListView::MoleculeSelected(const moleculeId_t _id)
+void QtMoleculeListView::selectionChanged(const QtObservedMolecule::ptr _molecule)
+{
+  if (_molecule->getMolSelected())
+    MoleculeSelected(_molecule->getIndex());
+  else
+    MoleculeUnselected(_molecule->getIndex());
+}
+
+void QtMoleculeListView::MoleculeSelected(ObservedValue_Index_t _id)
 {
   if (selecting)
@@ -166 +169 @@
 //    ASSERT( !selectionModel()->isSelected(index),
 //        "QtMoleculeListView::MoleculeSelected() - row to molecule "
-//        +toString(_id)+" is already selected.");
+//        +toString(mol->getMolIndex())+" is already selected.");
 
     // select the full row
@@ -176 +179 @@
 }
 
-void QtMoleculeListView::MoleculeUnselected(const moleculeId_t _id)
+void QtMoleculeListView::MoleculeUnselected(ObservedValue_Index_t _id)
 {
   if (selecting)
@@ -188 +191 @@
 //    ASSERT( selectionModel()->isSelected(index),
 //        "QtMoleculeListView::MoleculeSelected() - row to molecule "
-//        +toString(_id)+" is already unselected.");
+//        +toString(mol->getMolIndex())+" is already unselected.");
 
     // unselect the full row
@@ -197 +200 @@
   selecting = false;
 }
-
-
-void QtMoleculeListView::recieveNotification(Observable *publisher, Notification_ptr notification)
-{
-  if (dynamic_cast<World *>(publisher) != NULL) {
-    switch (notification->getChannelNo()) {
-      case World::SelectionChanged:
-      {
-        // obtain molecule selection from World and go through our selection step by step
-        const std::vector<const molecule *> selectedMolecules =
-            const_cast<const World &>(World::getInstance()).getSelectedMolecules();
-        QItemSelection currently_selected = selectionModel()->selection();
-        QtMoleculeList *moleculelist = static_cast<QtMoleculeList *>(model());
-        QItemSelection selected;
-        QItemSelection deselected;
-        std::set<QModelIndex> already_selected_indices;
-        for (std::vector<const molecule *>::const_iterator iter = selectedMolecules.begin();
-            iter != selectedMolecules.end(); ++iter) {
-          if (moleculelist->isMoleculeItemPresent((*iter)->getId())) {
-            QtMoleculeItem *item = moleculelist->MoleculeIdToItem((*iter)->getId());
-            QModelIndex mol_index = item->index();
-            if (!currently_selected.contains(mol_index))
-                selected.select(mol_index, setIndexToLastColumn(mol_index));
-            else
-              already_selected_indices.insert(mol_index);
-          }
-        }
-        {
-          QModelIndex mol_index;
-          foreach(mol_index, currently_selected.indexes()) {
-            std::set<QModelIndex>::const_iterator iter =
-                already_selected_indices.find(mol_index);
-            if (iter == already_selected_indices.end())
-              deselected.select(mol_index, setIndexToLastColumn(mol_index));
-          }
-        }
-        selecting = true;
-        if (!selected.indexes().empty())
-          selectionModel()->select(selected, QItemSelectionModel::Select);
-        if (!deselected.indexes().empty())
-          selectionModel()->select(deselected, QItemSelectionModel::Deselect);
-        selecting = false;
-        break;
-      }
-      default:
-        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));
-  }
-}
-
-void QtMoleculeListView::subjectKilled(Observable *publisher)
-{}