Changeset 3fe318 for src/UIElements

Timestamp:

Feb 14, 2016, 12:34:27 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:

7ded1c

Parents:

aa41a3

git-author:

Frederik Heber <heber@…> (01/05/16 22:20:13)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:34:27)

Message:

CHECK: tempcommit: Removed Cacheable of TesselationHull for GLMoleculeObject_molecule.

• this may cause hiccups with the observed instances with the O/O system and makes no sense anyway as it gets updated all the time?

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_molecule.cpp (modified) (3 diffs)
• GLMoleculeObject_molecule.hpp (modified) (1 diff)

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

@@ -88 +88 @@
   owner(NULL),
   molref(QtObservedMolecule::getMolecule(_ObservedMolecule->getMolIndex())),
-  /* We must not use boost::cref(this) as "this" has not been properly constructed and seemingly
-   * boost::cref tries to do some magic to grasp the inheritance hierarchy which fails because
-   * the class has not been fully constructed yet. "This" itself seems to be working fine.
-   */
-  TesselationHullUpdater(
-      boost::bind(&GLMoleculeObject_molecule::updateTesselationHull, this)
-      ),
-  TesselationHull(
-      molref,
-      TesselationHullUpdater,
-      "MoleculeTesselationHull_"+toString(_ObservedMolecule->getMolIndex()),
-      HullChannels),
   hoverAtomId(-1),
   board(_board),
@@ -115 +103 @@
   owner(NULL),
   molref(QtObservedMolecule::getMolecule(_ObservedMolecule->getMolIndex())),
-  /* We must not use boost::cref(this) as "this" has not been properly constructed and seemingly
-   * boost::cref tries to do some magic to grasp the inheritance hierarchy which fails because
-   * the class has not been fully constructed yet. "This" itself seems to be working fine.
-   */
-  TesselationHullUpdater(
-      boost::bind(&GLMoleculeObject_molecule::updateTesselationHull, this)
-      ),
-  TesselationHull(
-      molref,
-      TesselationHullUpdater,
-      "MoleculeTesselationHull_"+toString(_ObservedMolecule->getMolIndex()),
-      HullChannels),
   hoverAtomId(-1),
   board(_board),
@@ -257 +233 @@
 void GLMoleculeObject_molecule::resetTesselationHull()
 {
-  // only when Observable still lives so far, we may check on Cacheable::isValid
-  if ((owner != NULL) && (!TesselationHull.isValid()))
-    updateMesh(createMoleculeMesh(*TesselationHull));
+  if (owner != NULL) {
+    TesselationHull = updateTesselationHull();
+    updateMesh(createMoleculeMesh(TesselationHull));
+  }
 }
 

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

@@ -122 +122 @@
   const molecule * const molref;
 
-  boost::function<QGeometryData ()> TesselationHullUpdater;
-
   //!> contains current version of the tesselation hull on request
-  Cacheable<QGeometryData> TesselationHull;
+  QGeometryData TesselationHull;
 
   //!> contains the set of atoms displayed