Changeset 284551 for src/UIElements/Views/Qt4/Qt3D

Timestamp:

Nov 16, 2012, 11:10:53 AM (12 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:

dc438c

Parents:

f75491

git-author:

Michael Ankele <ankele@…> (10/02/12 14:04:47)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:53)

Message:

GLWorldView shows the selected shapes from ShapeRegistry

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -303 +303 @@
 {
   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::clearShapes()
+{
+  foreach (QObject *obj, children()) {
+    GLMoleculeObject_shape *shapeobj = qobject_cast<GLMoleculeObject_shape *>(obj);
+      if (shapeobj)
+        delete(shapeobj);
+  }
+  ShapesinSceneMap.clear();
 }
 

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

@@ -35 +35 @@
 class GLMoleculeObject_atom;
 class GLMoleculeObject_molecule;
+class GLMoleculeObject_shape;
 
 /** This class contains a list of all molecules in the world.
@@ -86 +87 @@
   void hoverChangedSignalled(GLMoleculeObject *ob);
   void changeAtomId(GLMoleculeObject_atom *ob, int oldId, int newOd);
+
+public:
   void addShape(const Shape &shape);
+  void clearShapes();
 
 private:
@@ -98 +102 @@
   typedef std::map< BondIds , GLMoleculeObject_bond* > BondNodeMap;
   typedef std::map< moleculeId_t , GLMoleculeObject_molecule* > MoleculeNodeMap;
+  typedef std::map< std::string , GLMoleculeObject_shape* > ShapeNodeMap;
   AtomNodeMap AtomsinSceneMap;
   BondNodeMap BondsinSceneMap;
   MoleculeNodeMap MoleculesinSceneMap;
+  ShapeNodeMap ShapesinSceneMap;
 
   QGLSceneNode *meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];

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

@@ -57 +57 @@
 #include "CodePatterns/Observer/Notification.hpp"
 #include "CodePatterns/Observer/ObserverLog.hpp"
+#include "Shapes/ShapeRegistry.hpp"
 #include "World.hpp"
 #include "Box.hpp"
@@ -94 +95 @@
   AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
 
+  ShapeRegistry::getInstance().signOn(this);
+  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::ShapeRemoved);
+  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::SelectionChanged);
+
   redrawTimer = new QTimer(this);
 }
@@ -106 +111 @@
   World::getInstance().signOff(this, World::SelectionChanged);
   AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
+  ShapeRegistry::getInstance().signOff(this);
+  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeRemoved);
+  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::SelectionChanged);
   delete worldscene;
 
@@ -357 +365 @@
         break;
     }
+  } else if (static_cast<ShapeRegistry*>(publisher) == ShapeRegistry::getPointer()) {
+    switch (notification->getChannelNo()) {
+      case ShapeRegistry::ShapeRemoved:
+      {
+        updateSelectedShapes();
+        break;
+      }
+      case ShapeRegistry::SelectionChanged:
+      {
+        updateSelectedShapes();
+        break;
+      }
+      default:
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+        break;
+    }
   } else
     ASSERT(0, "GLWorldView::recieveNotification() - received notification from unknown source.");
@@ -635 +659 @@
 {
   emit hoverChanged(_atom);
+}
+
+void GLWorldView::updateSelectedShapes()
+{
+  worldscene->clearShapes();
+  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
+  for (unsigned int i=0; i<selectedShapes.size(); i++)
+    worldscene->addShape(*selectedShapes[i]);
 }
 

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

@@ -98 +98 @@
 
 private:
+  void updateSelectedShapes();
+
   GLWorldScene *worldscene;