Changeset 07136a for src

Timestamp:

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

a9161d

Parents:

369cb1

git-author:

Frederik Heber <heber@…> (07/20/15 09:16:27)

git-committer:

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

Message:

FIX: Fixing display of shapes in GLWorldView.

• we propagate shape name via S/S system such that we may lookup the name in ShapeRegistry and do not have to rely on probably already deallocated lastchanged() shape. This affects ShapeAdded() and ShapeRemoved().
• GLMoleculeObject_shape now copies the shape, ensuring that its present while its surface is tesselated.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -50 +50 @@
 #include "CodePatterns/Log.hpp"
 
-#include "Shapes/Shape.hpp"
 #include "Shapes/ShapeFactory.hpp"
 #include "LinearAlgebra/Vector.hpp"

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

@@ -23 +23 @@
 #include "GLMoleculeObject.hpp"
 
-class Shape;
+#include "Shapes/Shape.hpp"
 
 /** This class represents a triangulated Shape.
@@ -41 +41 @@
 private:
 
-   Shape &m_shape;
+   Shape m_shape;
    bool m_enabled;
 };

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

@@ -362 +362 @@
 /** Adds a shape to the scene.
  *
- * uses ShapeRegistry::lastChanged()
- *
- */
-void GLWorldScene::addShape()
-{
-  Shape &shape = *ShapeRegistry::getInstance().lastChanged();
-  GLMoleculeObject_shape *shapeObject = new GLMoleculeObject_shape(shape, this);
-  ShapeNodeMap::iterator iter = ShapesinSceneMap.find(shape.getName());
-  ASSERT(iter == ShapesinSceneMap.end(),
-      "GLWorldScene::addShape() - same shape "+shape.getName()+" added again.");
-  ShapesinSceneMap.insert( make_pair(shape.getName(), shapeObject) );
-}
-
-void GLWorldScene::removeShape()
-{
-  Shape &shape = *ShapeRegistry::getInstance().lastChanged();
-  ShapeNodeMap::iterator iter = ShapesinSceneMap.find(shape.getName());
+ */
+void GLWorldScene::addShape(const std::string &_name)
+{
+  Shape * const shape = ShapeRegistry::getInstance().getByName(_name);
+  if (shape != NULL) {
+    GLMoleculeObject_shape *shapeObject = new GLMoleculeObject_shape(*shape, this);
+    ShapeNodeMap::iterator iter = ShapesinSceneMap.find(_name);
+    ASSERT(iter == ShapesinSceneMap.end(),
+        "GLWorldScene::addShape() - same shape "+_name+" added again.");
+    ShapesinSceneMap.insert( make_pair(_name, shapeObject) );
+  } else
+    ELOG(2, "GLWorldScene::addShape() - shape disappeared before we could draw it.");
+
+  emit changed();
+}
+
+void GLWorldScene::removeShape(const std::string &_name)
+{
+  ShapeNodeMap::iterator iter = ShapesinSceneMap.find(_name);
   ASSERT(iter != ShapesinSceneMap.end(),
-      "GLWorldScene::removeShape() - shape "+shape.getName()+" not in scene.");
+      "GLWorldScene::removeShape() - shape "+_name+" not in scene.");
   ShapesinSceneMap.erase(iter);
   delete(iter->second);
+
+  emit changed();
 }
 
@@ -393 +397 @@
       }
   }
+
+  emit changed();
 }
 

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

@@ -92 +92 @@
   void setSelectionModeAtom();
   void setSelectionModeMolecule();
-  void addShape();
-  void removeShape();
+  void addShape(const std::string &_name);
+  void removeShape(const std::string &_name);
 //  void update();
   void moleculesVisibilityChanged(const moleculeId_t _id, bool _visible);

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

@@ -83 +83 @@
   qRegisterMetaType<moleculeId_t>("moleculeId_t");
 
-  connect(this, SIGNAL(ShapeAdded()), worldscene, SLOT(addShape()));
-  connect(this, SIGNAL(ShapeRemoved()), worldscene, SLOT(removeShape()));
+  connect(this, SIGNAL(ShapeAdded(const std::string &)), worldscene, SLOT(addShape(const std::string &)));
+  connect(this, SIGNAL(ShapeRemoved(const std::string &)), worldscene, SLOT(removeShape(const std::string &)));
 //  connect(this, SIGNAL(TimeChanged()), worldscene, SIGNAL(updated()));
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
@@ -477 +477 @@
       case ShapeRegistry::ShapeInserted:
       {
-        emit ShapeAdded();
+        emit ShapeAdded(ShapeRegistry::getInstance().lastChanged()->getName());
         break;
       }
       case ShapeRegistry::ShapeRemoved:
       {
-        emit ShapeRemoved();
+        emit ShapeRemoved(ShapeRegistry::getInstance().lastChanged()->getName());
         break;
       }

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

@@ -69 +69 @@
   void hoverChanged(const atomId_t _id);
   void hoverChanged(const moleculeId_t _id, int);
-  void ShapeAdded();
-  void ShapeRemoved();
+  void ShapeAdded(const std::string &);
+  void ShapeRemoved(const std::string &);
   void moleculesVisibilityChanged(const moleculeId_t,bool);