Changeset 015f8c for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp

Timestamp:

Aug 5, 2015, 5:32:11 PM (10 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.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp (modified) (8 diffs)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp

@@ -75 +75 @@
 const Observable::channels_t
 GLMoleculeObject_atom::AtomBondsChannels(getAtomBondsChannels());
-const Observable::channels_t
-GLMoleculeObject_atom::AtomSelectionStatusChannels(World::SelectionChanged);
 
 GLMoleculeObject_atom::GLMoleculeObject_atom(QGLSceneNode *mesh[], QObject *parent, const atomId_t _id) :
@@ -106 +104 @@
       updateBonds(),
       AtomBondsChannels),
-  AtomSelectionStatus(
-      World::getPointer(),
-      boost::bind(&GLMoleculeObject_atom::updateSelectionStatus, this),
-      "AtomSelectionStatus_"+toString(_id),
-      updateSelectionStatus(),
-      AtomSelectionStatusChannels),
   owner(NULL)
 {
@@ -129 +121 @@
   connect( this, SIGNAL(positionChanged()), this, SLOT(resetPosition()), Qt::QueuedConnection);
   connect( this, SIGNAL(bondsChanged()), this, SLOT(resetPosition()), Qt::QueuedConnection);
-  connect( this, SIGNAL(selectionstatusChanged()), this, SLOT(resetSelectionStatus()), Qt::QueuedConnection);
 }
 
@@ -141 +132 @@
     owner->signOn(this, AtomObservable::BondsAdded);
     owner->signOn(this, AtomObservable::BondsRemoved);
-    World::getInstance().signOn(this, World::SelectionChanged);
   }
 }
@@ -155 +145 @@
     owner->signOff(this, AtomObservable::BondsAdded);
     owner->signOff(this, AtomObservable::BondsRemoved);
-    World::getInstance().signOff(this, World::SelectionChanged);
     owner = NULL;
   }
@@ -241 +230 @@
 }
 
-void GLMoleculeObject_atom::resetSelectionStatus()
-{
-  setSelected(AtomSelectionStatus.get());
-}
+void GLMoleculeObject_atom::Selected()
+{
+  ASSERT( !m_selected,
+      "GLMoleculeObject_atom::Selected() - 3D rep of atom is already selected.");
+  m_selected = true;
+
+  emit changed();
+}
+
+void GLMoleculeObject_atom::Unselected()
+{
+  ASSERT( m_selected,
+      "GLMoleculeObject_atom::Unselected() - 3D rep of atom is already unselected.");
+  m_selected = false;
+
+  emit changed();
+}
+
 
 void GLMoleculeObject_atom::draw(QGLPainter *painter, const QVector4D &cameraPlane)
@@ -315 +318 @@
 }
 
-bool GLMoleculeObject_atom::updateSelectionStatus() const
-{
-  const atom * const _atom = getAtom(AtomIndex.get());
-  if (_atom != NULL) {
-    return const_cast<const World &>(World::getInstance()).isSelected(_atom);
-  }
-  return false;
-}
-
 void GLMoleculeObject_atom::update(Observable *publisher)
 {
@@ -358 +352 @@
         break;
     }
-  } else if (publisher == static_cast<World *>(World::getPointer())) {
-    switch (notification->getChannelNo()) {
-      case World::SelectionChanged:
-        emit selectionstatusChanged();
-        break;
-      default:
-        ASSERT(0, "GLMoleculeObject_atom::recieveNotification() - we are not signed on to channel "
-            +toString(notification->getChannelNo())+" of the World.");
-        break;
-    }
-  }
-}
+  } else
+    ASSERT(0, "GLMoleculeObject_atom::recieveNotification() - received notification from unexpected source.");
+}