Changeset 015f8c for src/UIElements/Views/Qt4/MoleculeList

Timestamp:

Aug 5, 2015, 5:32:11 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:

a39d72

Parents:

e5a477

git-author:

Frederik Heber <heber@…> (07/19/15 07:08:38)

git-committer:

Frederik Heber <heber@…> (08/05/15 17:32:11)

Message:

QtMainWindow uses QtSelectionChangedAgent.

• QtMoleculeListView and GLWorldView receive its signals. The latter passes it on to GLWorldScene.
• QtMoleculeList has new MoleculeIdToIndex to allow QtMoleculeListView to (un)select specific rows on a given index.
• GLWorldScene passes atom and molecule selection to GLMoleculeObject_molecule.
• GLMoleculeObject_molecule passes atom selection to respective GLMoleculeObject_atom.

Location:

src/UIElements/Views/Qt4/MoleculeList

Files:

• QtMoleculeList.cpp (modified) (1 diff)
• QtMoleculeList.hpp (modified) (1 diff)
• QtMoleculeListView.cpp (modified) (4 diffs)
• QtMoleculeListView.hpp (modified) (2 diffs)

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

@@ -178 +178 @@
 }
 
+const QModelIndex QtMoleculeList::MoleculeIdToIndex(const moleculeId_t _id) const
+{
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+  QtMoleculeItem * const item = MoleculeIdToItem(_id);
+  ASSERT(item != NULL,
+      "QtMoleculeList::MoleculeIdToIndex() - could not find item to "
+      +toString(_id));
+  return indexFromItem(item);
+}
 
 const moleculeId_t QtMoleculeList::IndexToMoleculeId(const QModelIndex &_index) const

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

@@ -86 +86 @@
   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;
-  const moleculeId_t ItemToMoleculeId(const QtMoleculeItem * const _item) const;
   QtMoleculeItem * getSpecificMoleculeItem(
       const QtMoleculeItem * const _item,

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

@@ -37 +37 @@
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp"
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
+#include "UIElements/Views/Qt4/QtSelectionChangedAgent.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -53 +54 @@
 {
   setSelectionMode(QAbstractItemView::MultiSelection);
-
-  World::getInstance().signOn(this, World::SelectionChanged);
 }
 
 QtMoleculeListView::~QtMoleculeListView()
-{
-  World::getInstance().signOff(this, World::SelectionChanged);
-}
+{}
 
 void QtMoleculeListView::setModel(QtMoleculeList *_moleculelist)
@@ -69 +66 @@
       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)));
 }
 
@@ -148 +154 @@
   selecting = false;
 }
+
+void QtMoleculeListView::MoleculeSelected(const moleculeId_t _id)
+{
+  if (selecting)
+    return;
+
+  selecting = true;
+
+  const QtMoleculeList *moleculelist = dynamic_cast<const QtMoleculeList *>(model());
+  QModelIndex index = moleculelist->MoleculeIdToIndex(_id);
+  ASSERT( !selectionModel()->isSelected(index),
+      "QtMoleculeListView::MoleculeSelected() - row to molecule "
+      +toString(_id)+" is already selected.");
+
+  // select the full row
+  expand(index);
+  selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows);
+
+  selecting = false;
+}
+
+void QtMoleculeListView::MoleculeUnselected(const moleculeId_t _id)
+{
+  if (selecting)
+    return;
+
+  selecting = true;
+
+  const QtMoleculeList *moleculelist = dynamic_cast<const QtMoleculeList *>(model());
+  QModelIndex index = moleculelist->MoleculeIdToIndex(_id);
+  ASSERT( selectionModel()->isSelected(index),
+      "QtMoleculeListView::MoleculeSelected() - row to molecule "
+      +toString(_id)+" is already unselected.");
+
+  // unselect the full row
+  expand(index);
+  selectionModel()->select(index, QItemSelectionModel::Deselect | QItemSelectionModel::Rows);
+
+  selecting = false;
+}
+
 
 void QtMoleculeListView::recieveNotification(Observable *publisher, Notification_ptr notification)

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

@@ -19 +19 @@
 #include "CodePatterns/Observer/Observer.hpp"
 
+#include "types.hpp"
+
 class QtMoleculeList;
+class QtSelectionChangedAgent;
 
 class QtMoleculeListView : public QTreeView, public Observer
@@ -31 +34 @@
   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: