Changeset b3a33d for src

Timestamp:

Aug 5, 2015, 5:32: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:

534374

Parents:

574d377

git-author:

Frederik Heber <heber@…> (06/21/15 12:16:57)

git-committer:

Frederik Heber <heber@…> (08/05/15 17:32:07)

Message:

Removed init() and signal WorldSelectionChanged() from GLWorldScene.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -90 +90 @@
 
   connect(this, SIGNAL(updated()), this, SLOT(update()));
-
-  init();
 }
 
@@ -98 +96 @@
   // remove all elements
   GLMoleculeObject::cleanMaterialMap();
-}
-
-/** Initialise the WorldScene with molecules and atoms from World.
- *
- */
-void GLWorldScene::init()
-{
-//  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++) {
-//    // create molecule objects in scene
-//    moleculeInserted((*moliter)->getId());
-//  }
 }
 
@@ -187 +169 @@
 }
 
-/** ....
- *
- */
-void GLWorldScene::worldSelectionChanged()
-{
-  LOG(3, "INFO: GLWorldScene: Received signal selectionChanged.");
-
-  const std::vector<const molecule*> &molecules =
-      const_cast<const World &>(World::getInstance()).getAllMolecules();
-
-  if (molecules.size() > 0) {
-    for (std::vector<const molecule*>::const_iterator Runner = molecules.begin();
-        Runner != molecules.end();
-        Runner++) {
-
-      // molecule selected but not in scene?
-      const bool isSelected =
-          const_cast<const World &>(World::getInstance()).isSelected(*Runner);
-      if (isSelected){
-        MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find((*Runner)->getId());
-        ASSERT( iter != MoleculesinSceneMap.end(),
-            "GLWorldScene::worldSelectionChanged() - selected molecule is unknown.");
-        GLMoleculeObject_molecule *molObject = iter->second;
-        // inform molecule object
-        molObject->selected(isSelected);
-      }
-    }
-  }
-}
-
 /** Inserts an atom into the scene before molecule is present.
  *
@@ -273 +225 @@
 
   // add new object
-  GLMoleculeObject_molecule *molObject = new GLMoleculeObject_molecule(GLMoleculeObject::meshEmpty, this, _id);
+  GLMoleculeObject_molecule *molObject =
+      new GLMoleculeObject_molecule(GLMoleculeObject::meshEmpty, this, _id);
   ASSERT( molObject != NULL,
       "GLWorldScene::moleculeInserted - could not create molecule object for "+toString(_id));
   MoleculesinSceneMap.insert( make_pair(_id, molObject) );
 
-  // now handle all state changes that came up before the instantiation7
+  // now handle all state changes that came up before the instantiation
   while (MoleculeMissedStateMap.count(_id) != 0) {
     ASSERT( !MoleculeMissedStateMap[_id].empty(),

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

@@ -87 +87 @@
   void atomRemoved(const moleculeId_t _molid, const atomId_t _atomid);
   void atomInserted(const moleculeId_t _molid, const atomId_t _atomid);
-  void worldSelectionChanged();
   void setSelectionModeAtom();
   void setSelectionModeMolecule();
@@ -97 +96 @@
 public:
   void updateSelectedShapes();
-
-private:
-  void init();
 
 private:

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

@@ -90 +90 @@
   connect(worldscene, SIGNAL(hoverChanged(const atomId_t)), this, SLOT(sceneHoverSignalled(const atomId_t)));
   connect(worldscene, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SLOT(sceneHoverSignalled(const moleculeId_t, int)));
-  connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
   connect(this, SIGNAL(atomRemoved(const moleculeId_t, const atomId_t)), worldscene, SLOT(atomRemoved(const moleculeId_t, const atomId_t)), Qt::DirectConnection);
   connect(this, SIGNAL(atomInserted(const moleculeId_t, const atomId_t)), worldscene, SLOT(atomInserted(const moleculeId_t, const atomId_t)), Qt::DirectConnection);