Changeset 4d6662 for src

Timestamp:

Sep 19, 2013, 8:24:28 PM (11 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:

52bb5a

Parents:

95c4e2

git-author:

Frederik Heber <heber@…> (08/31/13 01:54:14)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:24:28)

Message:

FIX: Using signal/slots to notify other thread of new or removed shapes.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -304 +304 @@
 /** Adds a shape to the scene.
  *
- * @param shape shape to be added
- */
-void GLWorldScene::addShape(Shape &shape)
-{
+ * 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());
@@ -315 +317 @@
 }
 
-void GLWorldScene::removeShape(Shape &shape)
-{
+void GLWorldScene::removeShape()
+{
+  Shape &shape = *ShapeRegistry::getInstance().lastChanged();
   ShapeNodeMap::iterator iter = ShapesinSceneMap.find(shape.getName());
   ASSERT(iter != ShapesinSceneMap.end(),

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

@@ -88 +88 @@
   void hoverChangedSignalled(GLMoleculeObject *ob);
   void changeAtomId(GLMoleculeObject_atom *ob, int oldId, int newOd);
+  void addShape();
+  void removeShape();
 
 public:
-  void addShape(Shape &shape);
-  void removeShape(Shape &shape);
   void updateSelectedShapes();
 

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

@@ -393 +393 @@
       case ShapeRegistry::ShapeInserted:
       {
-        worldscene->addShape(*ShapeRegistry::getInstance().lastChanged());
+        emit ShapeAdded();
         break;
       }
       case ShapeRegistry::ShapeRemoved:
       {
-        worldscene->removeShape(*ShapeRegistry::getInstance().lastChanged());
+        emit ShapeRemoved();
         break;
       }

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

@@ -61 +61 @@
   void worldSelectionChanged();
   void hoverChanged(const atom *_atom);
+  void ShapeAdded();
+  void ShapeRemoved();
 
 protected: