Ignore:
Timestamp:
Nov 16, 2012, 11:10:53 AM (12 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:
dc438c
Parents:
f75491
git-author:
Michael Ankele <ankele@…> (10/02/12 14:04:47)
git-committer:
Frederik Heber <heber@…> (11/16/12 11:10:53)
Message:

GLWorldView shows the selected shapes from ShapeRegistry

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp

    rf75491 r284551  
    3535class GLMoleculeObject_atom;
    3636class GLMoleculeObject_molecule;
     37class GLMoleculeObject_shape;
    3738
    3839/** This class contains a list of all molecules in the world.
     
    8687  void hoverChangedSignalled(GLMoleculeObject *ob);
    8788  void changeAtomId(GLMoleculeObject_atom *ob, int oldId, int newOd);
     89
     90public:
    8891  void addShape(const Shape &shape);
     92  void clearShapes();
    8993
    9094private:
     
    98102  typedef std::map< BondIds , GLMoleculeObject_bond* > BondNodeMap;
    99103  typedef std::map< moleculeId_t , GLMoleculeObject_molecule* > MoleculeNodeMap;
     104  typedef std::map< std::string , GLMoleculeObject_shape* > ShapeNodeMap;
    100105  AtomNodeMap AtomsinSceneMap;
    101106  BondNodeMap BondsinSceneMap;
    102107  MoleculeNodeMap MoleculesinSceneMap;
     108  ShapeNodeMap ShapesinSceneMap;
    103109
    104110  QGLSceneNode *meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];
Note: See TracChangeset for help on using the changeset viewer.