Changeset f1b5ca for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

Timestamp:

Apr 20, 2016, 11:07:46 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:

7f185f9

Parents:

785d89

git-author:

Frederik Heber <heber@…> (04/12/16 08:51:06)

git-committer:

Frederik Heber <heber@…> (04/20/16 23:07:46)

Message:

Only GLWorldScene creates stuff, GLMoleculeObject_.. are just visual reps.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp (modified) (3 diffs)

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

@@ -41 +41 @@
   GLMoleculeObject_molecule(
       QObject *parent,
-      QtObservedInstanceBoard &_board,
       QtObservedMolecule::ptr &_ObservedMolecule);
   GLMoleculeObject_molecule(
       QGLSceneNode *mesh[],
       QObject *parent,
-      QtObservedInstanceBoard &_board,
       QtObservedMolecule::ptr &_ObservedMolecule);
   virtual ~GLMoleculeObject_molecule();
@@ -59 +57 @@
   void changed();
   void changeOccured();
-  void hoverChanged(const atomId_t);
-  void hoverChanged(const moleculeId_t, int);
-  void atomClicked(atomId_t);
-  void moleculeClicked(moleculeId_t);
-  void moleculeEmptied(QtObservedMolecule::ptr);
-  void IsSelectedChanged();
 
 private slots:
   //!> grant GLWorldScene access to private slots
   friend class GLWorldScene;
-
-  void wasClicked();
-  void atomInserted(QtObservedAtom::ptr _atom);
-  void atomRemoved(ObservedValue_Index_t _id);
-  void bondInserted(QtObservedBond::ptr _bond);
-  void bondRemoved(ObservedValue_Index_t _id);
-  void hoverChangedSignalled(GLMoleculeObject *ob);
 
   void setVisible(bool value);
@@ -90 +75 @@
 private:
 
-  //!> the Observable we are signed on, also indicates whether we are sign on (not NULL)
-  const Observable * owner;
-
   QGeometryData updateTesselationHull() const;
-
-  //!> list of channels when tesselation hull needs to update
-  static const Observable::channels_t HullChannels;
 
   //!> contains current version of the tesselation hull on request
   QGeometryData TesselationHull;
 
-  typedef std::map< ObservedValue_Index_t, GLMoleculeObject_atom* > AtomNodeMap;
-  typedef std::multimap< ObservedValue_Index_t, GLMoleculeObject_bond* > BondNodeMap;
-  AtomNodeMap AtomsinSceneMap;
-  BondNodeMap BondsinSceneMap;
 
   atomId_t hoverAtomId;
-
-  QtObservedInstanceBoard &board;
 
   QtObservedMolecule::ptr ObservedMolecule;