Changeset f115cc

Timestamp:

Jan 11, 2015, 4:42:43 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:

b6d92e

Parents:

a7aebd

git-author:

Frederik Heber <heber@…> (12/03/14 22:15:42)

git-committer:

Frederik Heber <heber@…> (01/11/15 16:42:43)

Message:

For GLMoleculeObject_atom element and position are only reset..() on hook'ed in draw().

• similarly as with GLMoleculeObject_molecule, we check in draw() when need to reset..() and do it before the actual drawing. This speeds up a lot.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (7 diffs)
• GLMoleculeObject_atom.hpp (modified) (2 diffs)

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

@@ -56 +56 @@
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_atom")+toString(_id)),
-  atomicid(_id)
+  atomicid(_id),
+  uptodatePosition(false),
+  uptodateElement(false)
 {
   // sign on as observer (obtain non-const instance before)
@@ -108 +110 @@
     ELOG(2, "Atom with id "+toString(atomicid)+" is already gone.");
   }
+  uptodatePosition = true;
 }
 
@@ -141 +144 @@
   }
   setScale( radius / 4. );
+
+  uptodateElement = true;
 }
 
@@ -165 +170 @@
   // selected?
   setSelected(World::getInstance().isAtomSelected(atomicid));
+}
+
+void GLMoleculeObject_atom::draw(QGLPainter *painter, const QVector4D &cameraPlane)
+{
+  // hook to update prior to painting
+  if (!uptodatePosition)
+    resetPosition();
+  if (!uptodateElement)
+    resetElement();
+
+  // call old hook to do the actual paining
+  GLMoleculeObject::draw(painter, cameraPlane);
 }
 
@@ -185 +202 @@
     switch (notification->getChannelNo()) {
       case AtomObservable::ElementChanged:
-        resetElement();
-        emit changed();
+        uptodateElement = false;
         break;
       case AtomObservable::IndexChanged:
@@ -192 +208 @@
         break;
       case AtomObservable::PositionChanged:
-        resetPosition();
-        emit changed();
+        uptodatePosition = false;
         break;
       case AtomObservable::BondsAdded:
@@ -199 +214 @@
         const atom *_atom = World::getInstance().getAtom(AtomById(atomicid));
         if (_atom != NULL) {
+          // make sure position is up-to-date
+          if (!uptodatePosition)
+            resetPosition();
           ASSERT(!_atom->getListOfBonds().empty(),
               "GLMoleculeObject_atom::recieveNotification() - received BondsAdded but ListOfBonds is empty.");

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

@@ -31 +31 @@
   virtual ~GLMoleculeObject_atom();
 
+  void draw(QGLPainter *painter, const QVector4D &cameraPlane);
+
   // Observer functions
   void update(Observable *publisher);
@@ -56 +58 @@
 
   const atomId_t atomicid;
+
+  bool uptodatePosition;
+  bool uptodateElement;
 };