Changeset 585f78 for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Jul 17, 2012, 12:17:23 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

bca99d

Parents:

e8c636

git-author:

Michael Ankele <ankele@…> (05/07/12 09:33:55)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:23)

Message:

GL: redraw only once during loading

• uses a QTimer with interval 0, so the redraw gets handled as soon as the program idles

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (5 diffs)

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

@@ -23 +23 @@
 #include <Qt/qaction.h>
 #include <QtGui/QToolBar>
+#include <Qt/qtimer.h>
 
 #include "GLWorldScene.hpp"
@@ -36 +37 @@
 
 GLWorldView::GLWorldView(QWidget *parent)
-  : QGLView(parent), Observer("GLWorldView"), worldscene(NULL), changesPresent(false)
+  : QGLView(parent), Observer("GLWorldView"), worldscene(NULL), changesPresent(false), needsRedraw(false)
 {
   worldscene = new GLWorldScene(this);
@@ -63 +64 @@
   connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
   connect(this, SIGNAL(moleculeRemoved(const molecule *)), worldscene, SLOT(moleculeRemoved(const molecule *)));
-  connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
+  //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
+  connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
 
   // sign on to changes in the world
@@ -73 +75 @@
   World::getInstance().signOn(this, World::SelectionChanged);
   AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
+
+  redrawTimer = new QTimer(this);
 }
 
@@ -201 +205 @@
 }
 
+void GLWorldView::checkChanges()
+{
+  updateGL();
+  needsRedraw = false;
+}
+
+void GLWorldView::sceneChangeSignalled()
+{
+  if (!needsRedraw){
+    redrawTimer->singleShot(0, this, SLOT(checkChanges()));
+    needsRedraw = true;
+    redrawTimer->start();
+  }
+}
+
 void GLWorldView::initializeGL(QGLPainter *painter)
 {