Changeset 0f7ffe for src/UIElements/Views

Timestamp:

Feb 12, 2016, 11:15:07 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:

2f7988

Parents:

8d5fbf1

git-author:

Frederik Heber <heber@…> (01/25/16 09:09:33)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:07)

Message:

Changed connections between GLWorldScene, GLWorldView and GLMoleculeObject_molecule.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_molecule.cpp (modified) (2 diffs)
• GLWorldScene.cpp (modified) (2 diffs)
• GLWorldView.cpp (modified) (7 diffs)
• GLWorldView.hpp (modified) (3 diffs)

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

@@ -183 +183 @@
   connect (this, SIGNAL(IdChanged()), this, SLOT(resetIndex()), Qt::QueuedConnection);
   connect (this, SIGNAL(AtomInserted(const atomId_t)), this, SLOT(atomInserted(const atomId_t)), Qt::QueuedConnection);
-  connect (this, SIGNAL(AtomInserted(const atomId_t)), this, SLOT(resetAtoms()), Qt::QueuedConnection);
-  connect (this, SIGNAL(AtomRemoved(const atomId_t)), this, SLOT(resetAtoms()), Qt::QueuedConnection);
   connect (this, SIGNAL(AtomRemoved(const atomId_t)), this, SLOT(atomRemoved(const atomId_t)), Qt::QueuedConnection);
+  if (board != NULL) {
+    connect(board, SIGNAL(atomInserted(const atomId_t)),
+        this, SLOT(atomInserted(const atomId_t)));
+    connect(board, SIGNAL(atomRemoved(const atomId_t)),
+        this, SLOT(atomRemoved(const atomId_t)));
+  }
 
   connect( this, SIGNAL(clicked()), this, SLOT(wasClicked()));
@@ -345 +349 @@
 void GLMoleculeObject_molecule::resetTesselationHull()
 {
-  if (!TesselationHull.isValid())
+  // only when Observable still lives so far, we may check on Cacheable::isValid
+  if ((owner != NULL) && (!TesselationHull.isValid()))
     updateMesh(createMoleculeMesh(*TesselationHull));
 }

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

@@ -113 +113 @@
   GLMoleculeObject::cleanMaterialMap();
 }
-
-///** Update the WorldScene with molecules and atomsfrom World.
-// *
-// * This function should be called after e.g. WorldTime::TimeChanged was
-// * received or after another molecule has been loaded.
-// *
-// */
-//void GLWorldScene::update()
-//{
-//  const std::vector<const molecule *> &molecules =
-//      const_cast<const World &>(World::getInstance()).getAllMolecules();
-//
-//  for (std::vector<const molecule*>::const_iterator moliter = molecules.begin();
-//      moliter != molecules.end();
-//      moliter++) {
-//    boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
-//    // check whether molecule already exists
-//    const moleculeId_t molid = (*moliter)->getId();
-//    const bool mol_present = MoleculesinSceneMap.count(molid);
-//    if (!mol_present)
-//      moleculeInserted((*moliter)->getId());
-//  }
-//
-//  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
-//  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.begin();
-//  for (;iter != MoleculesinSceneMap.end();) {
-//    const moleculeId_t molid = iter->first;
-//    const molecule * const mol = const_cast<const World &>(World::getInstance()).
-//        getMolecule(MoleculeById(molid));
-//    const bool mol_absent = (mol == NULL);
-//    // step on to next molecule before possibly removing entry and invalidating iter
-//    ++iter;
-//    if (mol_absent)
-//      moleculeRemoved(molid);
-//  }
-//
-//}
 
 void GLWorldScene::atomClicked(atomId_t no)
@@ -350 +313 @@
   connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
   connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
-  connect(board, SIGNAL(atomInserted(const atomId_t)),
-      molObject, SLOT(atomInserted(const atomId_t)));
-  connect(board, SIGNAL(atomRemoved(const atomId_t)),
-      molObject, SLOT(atomRemoved(const atomId_t)));
 
   emit changed();

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

@@ -102 +102 @@
   // sign on to changes in the world
   World::getInstance().signOn(this);
-  World::getInstance().signOn(this, World::MoleculeInserted);
   World::getInstance().signOn(this, World::SelectionChanged);
 //  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
@@ -117 +116 @@
 GLWorldView::~GLWorldView()
 {
-  // remove me from all observed molecules
-  for (ObservedMolecules_t::iterator iter = ObservedMolecules.begin();
-      !ObservedMolecules.empty();
-      iter = ObservedMolecules.begin())
-    signOffFromMolecule(*iter);
-
   QSettings settings;
   settings.beginGroup("WorldView");
@@ -131 +124 @@
 
   World::getInstance().signOff(this);
-  World::getInstance().signOff(this, World::MoleculeInserted);
   World::getInstance().signOff(this, World::SelectionChanged);
 //  WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
@@ -335 +327 @@
 }
 
-void GLWorldView::signOnToMolecule(const molecule *_mol)
-{
-  ASSERT( _mol != NULL,
-      "GLWorldView::signOnToMolecule() - molecule ref is NULL.");
-  _mol->signOn(this, molecule::AtomInserted);
-  _mol->signOn(this, molecule::AtomRemoved);
-
-  ObservedMolecules.insert(const_cast<molecule *>(_mol));
-}
-
-void GLWorldView::signOffFromMolecule(const molecule *_mol)
-{
-  ObservedMolecules_t::const_iterator iter = ObservedMolecules.find(
-      const_cast<molecule *>(_mol));
-  ASSERT( iter != ObservedMolecules.end(),
-      "GLWorldView::signOffFromMolecule() - molecule "+toString(_mol)
-      +" gave subjectKilled we are not signed on.");
-//    LOG(1, "INFO: Erasing " << mol << " from ObservedMolecules.");
-  ObservedMolecules.erase(iter);
-
-  ASSERT( _mol != NULL,
-      "GLWorldView::signOffFromMolecule() - molecule ref is NULL.");
-  _mol->signOff(this, molecule::AtomInserted);
-  _mol->signOff(this, molecule::AtomRemoved);
-}
-
 /**
  * The observable can tell when it dies.
@@ -366 +332 @@
 void GLWorldView::subjectKilled(Observable *publisher)
 {
-  molecule * mol = static_cast<molecule *>(publisher);
-
-//  std::copy(ObservedMolecules.begin(), ObservedMolecules.end(),
-//      std::ostream_iterator<molecule *>(std::cout, "\n"));
-
-  if (mol != NULL) {
-    ObservedMolecules.erase(mol);
-//
-//    // sign off
-//    signOffFromMolecule(mol);
-
-    // emit removed signal
-    const moleculeId_t _id = mol->getId();
-    emit moleculeRemoved(_id);
-  }
+  // world never dies
 }
 
@@ -398 +350 @@
   #endif
         emit worldSelectionChanged();
-        break;
-      }
-      case World::MoleculeInserted:
-      {
-        const moleculeId_t _id = const_cast<const World &>(World::getInstance()).lastChangedMolId();
-  #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_id)+" has been inserted.";
-  #endif
-        const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
-            getMolecule(MoleculeById(_id));
-        if (_molecule != NULL) {
-          signOnToMolecule(_molecule);
-
-          emit moleculeInserted(_id);
-        }
         break;
       }
@@ -432 +369 @@
       default:
         ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for WorldTime.");
-        break;
-    }
-  } else if (dynamic_cast<molecule *>(publisher) != NULL) {
-    const molecule * mol = const_cast<const molecule * const>(dynamic_cast<molecule *>(publisher));
-    const moleculeId_t molid = mol->getId();
-    const atomId_t atomid = mol->lastChangedAtomId();
-    switch (notification->getChannelNo()) {
-      case molecule::AtomInserted:
-      {
-#ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this))
-            << " received notification that atom "+toString(atomid)+" has been inserted into molecule "+toString(molid)+".";
-#endif
-        emit atomInserted(molid, atomid);
-        break;
-      }
-      case World::AtomRemoved:
-      {
-#ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this))
-            << " received notification that atom "+toString(atomid)+" has been removed from molecule "+toString(molid)+".";
-#endif
-        emit atomRemoved(molid, atomid);
-        break;
-      }
-      default:
-        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for molecule.");
         break;
     }

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

@@ -66 +66 @@
   void changed();
   void TimeChanged();
-  void atomInserted(const moleculeId_t _molid, const atomId_t _atomid);
-  void atomRemoved(const moleculeId_t _molid, const atomId_t _atomid);
-  void moleculeInserted(const moleculeId_t _id);
-  void moleculeRemoved(const moleculeId_t _id);
   void worldSelectionChanged();
   void hoverChanged(const atomId_t _id);
@@ -116 +112 @@
   void setDomainStatus(const bool status);
 
-  void signOnToMolecule(const molecule *_mol);
-  void signOffFromMolecule(const molecule *_mol);
-
 private:
 
@@ -138 +131 @@
 
   double defaultEyeSeparation;
-
-  typedef std::multiset<molecule *> ObservedMolecules_t;
-  //!> sorted list of molecules we are sign on to
-  ObservedMolecules_t ObservedMolecules;
 };