Changeset 65487f for src

Timestamp:

Oct 6, 2011, 4:06:10 PM (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:

838cd0

Parents:

a099d3

git-author:

Frederik Heber <heber@…> (09/02/11 08:42:34)

git-committer:

Frederik Heber <heber@…> (10/06/11 16:06:10)

Message:

FIX: hoverChanged() and ..Clicked() now also works for loaded molecules.

• introduced signal WorldScene::changeOccured() which triggers a private flag changesPresent in GLWorldView to call initialize() on next paintGL() event.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (4 diffs)
• GLWorldScene.hpp (modified) (1 diff)
• GLWorldView.cpp (modified) (2 diffs)
• GLWorldView.hpp (modified) (2 diffs)

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

@@ -92 +92 @@
   connect (atomObject, SIGNAL(BondsChanged(const atom *)), this, SLOT(bondsChanged(const atom *)));
   bondsChanged(_atom);
-  emit changed();
+  emit changeOccured();
 }
 
@@ -116 +116 @@
   AtomsinSceneMap.erase(iter);
   delete atomObject;
-  emit changed();
+  emit changeOccured();
 }
 
@@ -205 +205 @@
     BondIdsinSceneMap.insert( Rightids );
   }
-  emit changed();
+  emit changeOccured();
 }
 
@@ -239 +239 @@
       "GLWorldScene::bondRemoved() - could not find ("
       +toString(leftnr)+"-"+toString(rightnr)+" in BondIdsinSceneMap.");
-  emit changed();
+  emit changeOccured();
 }
 

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

@@ -53 +53 @@
 signals:
   void changed();
+  void changeOccured();
   void pressed();
   void released();

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

@@ -31 +31 @@
 
 GLWorldView::GLWorldView(QWidget *parent)
-   : QGLView(parent), Observer("GLWorldView"), worldscene(NULL)
+  : QGLView(parent), Observer("GLWorldView"), worldscene(NULL), changesPresent(false)
 {
-   worldscene = new GLWorldScene(this);
-
-   setOption(QGLView::ObjectPicking, true);
-
-   connect(worldscene, SIGNAL(changed()), this, SLOT(updateGL()));
-   connect(this, SIGNAL(atomInserted(const atom *)), worldscene, SLOT(atomInserted(const atom *)));
-   connect(this, SIGNAL(atomRemoved(const atom *)), worldscene, SLOT(atomRemoved(const atom *)));
-   connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
-
-   // sign on to changes in the world
-   World::getInstance().signOn(this);
-   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
-   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomRemoved));
+  worldscene = new GLWorldScene(this);
+
+  setOption(QGLView::ObjectPicking, true);
+
+  connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
+  connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
+  connect(this, SIGNAL(atomInserted(const atom *)), worldscene, SLOT(atomInserted(const atom *)));
+  connect(this, SIGNAL(atomRemoved(const atom *)), worldscene, SLOT(atomRemoved(const atom *)));
+  connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
+
+  // sign on to changes in the world
+  World::getInstance().signOn(this);
+  World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
+  World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomRemoved));
 }
 
@@ -100 +101 @@
 void GLWorldView::initializeGL(QGLPainter *painter)
 {
-   worldscene->initialize(this, painter);
+  worldscene->initialize(this, painter);
+  changesPresent = false;
 }
 
 void GLWorldView::paintGL(QGLPainter *painter)
 {
-   worldscene->draw(painter);
+  if (changesPresent) {
+    initializeGL(painter);
+    changesPresent = false;
+  }
+  worldscene->draw(painter);
 }
 
 void GLWorldView::keyPressEvent(QKeyEvent *e)
 {
-   if (e->key() == Qt::Key_Tab) {
-       // The Tab key turns the ShowPicking option on and off,
-       // which helps show what the pick buffer looks like.
-       setOption(QGLView::ShowPicking, ((options() & QGLView::ShowPicking) == 0));
-       updateGL();
-   }
-   QGLView::keyPressEvent(e);
+  if (e->key() == Qt::Key_Tab) {
+    // The Tab key turns the ShowPicking option on and off,
+    // which helps show what the pick buffer looks like.
+    setOption(QGLView::ShowPicking, ((options() & QGLView::ShowPicking) == 0));
+    updateGL();
+  }
+  QGLView::keyPressEvent(e);
+}
+
+void GLWorldView::changeSignalled()
+{
+  changesPresent = true;
 }
 

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

@@ -41 +41 @@
 
 public slots:
+  void changeSignalled();
 
 signals:
@@ -54 +55 @@
 private:
   GLWorldScene *worldscene;
+
+  bool changesPresent;
 };