Ignore:
Timestamp:
Feb 12, 2016, 11:15:06 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:
0f7ffe
Parents:
47f0e4
git-author:
Frederik Heber <heber@…> (01/25/16 11:09:33)
git-committer:
Frederik Heber <heber@…> (02/12/16 23:15:06)
Message:

GLMoleculeObject_atom, _bond, _molecule all use QtInstanceInformationBoard passed via GLWorldScene.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

    r47f0e4 r8d5fbf1  
    9494    GLMoleculeObject::meshCylinder[i]->setOption(QGLSceneNode::CullBoundingBox, true);
    9595  }
    96   connect(board, SIGNAL(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)),
    97       this, SLOT(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)));
    9896  connect(board, SIGNAL(moleculeInserted(const moleculeId_t)),
    9997      this, SLOT(moleculeInserted(const moleculeId_t)));
    … …  
    102100  connect(board, SIGNAL(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)),
    103101      this, SLOT(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)));
     102  connect(board, SIGNAL(atomInserted(const moleculeId_t, const atomId_t)),
     103      this, SLOT(atomInserted(const moleculeId_t, const atomId_t)), Qt::DirectConnection);
     104  connect(board, SIGNAL(atomRemoved(const moleculeId_t, const atomId_t)),
     105      this, SLOT(atomRemoved(const moleculeId_t, const atomId_t)), Qt::DirectConnection);
    104106
    105107//  connect(this, SIGNAL(updated()), this, SLOT(update()));
    … …  
    199201
    200202  // check of molecule is already present
    201   if (MoleculesinSceneMap.count(_molid) != 0) {
     203  MoleculeNodeMap::iterator moliter = MoleculesinSceneMap.find(_molid);
     204  if (moliter != MoleculesinSceneMap.end()) {
    202205    // pass signal through
     206    GLMoleculeObject_molecule *molObject = moliter->second;
     207    QMetaObject::invokeMethod(molObject,        // pointer to a QObject
     208                              "atomInserted",       // member name (no parameters here)
     209                              Qt::QueuedConnection,     // connection type
     210                              Q_ARG(const atomId_t, _atomid));     // parameters
    203211  } else {
    204212    // store signal for when it is instantiated
    … …  
    221229
    222230  // check of molecule is already present
    223   if (MoleculesinSceneMap.count(_molid) != 0) {
     231  MoleculeNodeMap::iterator moliter = MoleculesinSceneMap.find(_molid);
     232  if (moliter != MoleculesinSceneMap.end()) {
    224233    // pass signal through
     234    GLMoleculeObject_molecule *molObject = moliter->second;
     235    QMetaObject::invokeMethod(molObject,        // pointer to a QObject
     236                              "atomRemoved",       // member name (no parameters here)
     237                              Qt::QueuedConnection,     // connection type
     238                              Q_ARG(const atomId_t, _atomid));     // parameters
    225239  } else {
    226240    // store signal for when it is instantiated
    … …  
    259273  GLMoleculeObject_molecule *molObject =
    260274      new GLMoleculeObject_molecule(
    261           GLMoleculeObject::meshEmpty, this, _id);
     275          GLMoleculeObject::meshEmpty,
     276          this,
     277          _id,
     278          board,
     279          board->getMoleculeObservedValues(_id));
    262280  ASSERT( molObject != NULL,
    263281      "GLWorldScene::moleculeInserted - could not create molecule object for "+toString(_id));
    … …  
    290308          QMetaObject::invokeMethod(molObject,        // pointer to a QObject
    291309                                    "atomInserted",       // member name (no parameters here)
    292                                     Qt::DirectConnection,     // connection type
     310                                    Qt::QueuedConnection,     // connection type
    293311                                    Q_ARG(const atomId_t, iter->first));     // parameters
    294312        } else {
    … …  
    307325            QMetaObject::invokeMethod(molObject,        // pointer to a QObject
    308326                                      "atomInserted",       // member name (no parameters here)
    309                                       Qt::DirectConnection,     // connection type
     327                                      Qt::QueuedConnection,     // connection type
    310328                                      Q_ARG(const atomId_t, iter->first));     // parameters
    311329            break;
    … …  
    323341  }
    324342
    325   // now let the molObject sign on to molecule
    326   molObject->activateObserver();
    327 
    328343  connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
    329344  connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
    … …  
    335350  connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
    336351  connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
     352  connect(board, SIGNAL(atomInserted(const atomId_t)),
     353      molObject, SLOT(atomInserted(const atomId_t)));
     354  connect(board, SIGNAL(atomRemoved(const atomId_t)),
     355      molObject, SLOT(atomRemoved(const atomId_t)));
    337356
    338357  emit changed();
Note: See TracChangeset for help on using the changeset viewer.