Changeset 5a2a06 for src/UIElements/Views

Timestamp:

Apr 6, 2012, 11:57:22 AM (13 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:

42c6a47

Parents:

d53902

git-author:

Michael Ankele <ankele@…> (03/30/12 10:51:02)

git-committer:

Frederik Heber <heber@…> (04/06/12 11:57:22)

Message:

GL: sending more signals to redraw

• atoms send changed() to scene when element or position changed
• atoms send selectionChanged() to scene when (un)selected
• bonds send changed() to scene when an atom changes its position

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.hpp (modified) (1 diff)
• GLMoleculeObject_atom.cpp (modified) (3 diffs)
• GLMoleculeObject_bond.cpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (2 diffs)

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

@@ -84 +84 @@
    void doubleClicked();
    void hoverChanged();
+   void selectionChanged();
+   void changed();
 
 protected:

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

@@ -162 +162 @@
       case AtomObservable::ElementChanged:
         resetElement();
+        emit changed();
         break;
       case AtomObservable::IndexChanged:
@@ -168 +169 @@
       case AtomObservable::PositionChanged:
         resetPosition();
+        emit changed();
         break;
       case AtomObservable::BondsAdded:
@@ -193 +195 @@
       case World::SelectionChanged:
         setSelected(World::getInstance().isSelected(_atom));
+        emit selectionChanged();
         break;
       default:

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

@@ -162 +162 @@
         LOG(2, "INFO: Received notification of PositionChanged.");
         resetPosition();
+        emit changed();
     }
   }

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

@@ -109 +109 @@
   AtomsinSceneMap.insert( make_pair(_atom->getId(), atomObject) );
   connect (atomObject, SIGNAL(clicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
+  connect (atomObject, SIGNAL(changed()), this, SIGNAL(changed()));
   connect (atomObject, SIGNAL(hoverChanged()), this, SIGNAL(changed()));
+  connect (atomObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
   connect (atomObject, SIGNAL(BondsInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)));
   //bondsChanged(_atom);
@@ -163 +165 @@
       bondObject, SIGNAL(BondRemoved(const atomId_t, const atomId_t)),
       this, SLOT(bondRemoved(const atomId_t, const atomId_t)));
+  connect (bondObject, SIGNAL(changed()), this, SIGNAL(changed()));
   BondsinSceneMap.insert( make_pair(ids, bondObject) );
 //    BondIdsinSceneMap.insert( Leftids );