Changeset 7b5984 for src/UIElements/Views/Qt4

Timestamp:

Jan 10, 2015, 5:14:32 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:

2b596f

Parents:

c32d21

git-author:

Frederik Heber <heber@…> (11/12/14 19:01:33)

git-committer:

Frederik Heber <heber@…> (01/10/15 17:14:32)

Message:

GLMoleculeObject_molecule listens to AtomMoved signal to update hull only when necessary.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_molecule.cpp (modified) (9 diffs)
• GLMoleculeObject_molecule.hpp (modified) (2 diffs)

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

@@ -135 +135 @@
   isSignedOn(false),
   _molecule(molref),
+  TesselationHullUptodate(true),
   hoverAtom(NULL)
 {
@@ -140 +141 @@
   _molecule->signOn(this, molecule::AtomInserted);
   _molecule->signOn(this, molecule::AtomRemoved);
+  _molecule->signOn(this, molecule::AtomMoved);
   isSignedOn = true;
   /*molref->signOn(this, AtomObservable::IndexChanged);
@@ -160 +162 @@
   isSignedOn(false),
   _molecule(molref),
+  TesselationHullUptodate(true),
   hoverAtom(NULL)
 {
@@ -165 +168 @@
   _molecule->signOn(this, molecule::AtomInserted);
   _molecule->signOn(this, molecule::AtomRemoved);
+  _molecule->signOn(this, molecule::AtomMoved);
   isSignedOn = true;
   /*molref->signOn(this, AtomObservable::IndexChanged);
@@ -185 +189 @@
     _molecule->signOff(this, molecule::AtomInserted);
     _molecule->signOff(this, molecule::AtomRemoved);
+    _molecule->signOff(this, molecule::AtomMoved);
   }
   /*_atom->signOff(this, AtomObservable::IndexChanged);
@@ -317 +322 @@
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
   #endif
+        TesselationHullUptodate = false;
         atomInserted(_id);
         break;
@@ -326 +332 @@
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been removed.";
   #endif
+        TesselationHullUptodate = false;
         atomRemoved(_id);
+        break;
+      }
+      case molecule::AtomMoved:
+      {
+        const atomId_t _id = _molecule->lastChanged()->getId();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
+  #endif
+        TesselationHullUptodate = false;
         break;
       }
@@ -364 +380 @@
   // draw either molecule's mesh or all atoms and bonds
   if (m_visible) {
+    updateTesselationHull();
+
     painter->modelViewMatrix().push();
 
@@ -563 +581 @@
   // first update the mesh if we are going to be visible now
   if (value)
-    updateMesh(createMoleculeMesh(_molecule, parent()));
+    updateTesselationHull();
   // then emit onward
   GLMoleculeObject::setVisible(value);
 }
 
+void GLMoleculeObject_molecule::updateTesselationHull()
+{
+  if (!TesselationHullUptodate) {
+    updateMesh(createMoleculeMesh(_molecule, parent()));
+    TesselationHullUptodate = true;
+  }
+}
+
 std::ostream &operator<<(std::ostream &ost, const GLMoleculeObject_molecule::BondIds &t)
 {

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

@@ -83 +83 @@
   void addAtomBonds(const atom *_atom);
 
+  void updateTesselationHull();
+
   //!> states whether selection box is additionally drawn or not
   bool isSelected;
@@ -90 +92 @@
 
   const molecule *_molecule;
+
+  bool TesselationHullUptodate;
 
   typedef std::map< atomId_t, GLMoleculeObject_atom* > AtomNodeMap;