Changeset bca99d for src/UIElements/Views/Qt4

Timestamp:

Jul 17, 2012, 12:17:24 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

26ed25

Parents:

585f78

git-author:

Michael Ankele <ankele@…> (05/07/12 11:31:19)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:24)

Message:

GL: shared meshes

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.cpp (modified) (1 diff)
• GLMoleculeObject.hpp (modified) (1 diff)
• GLMoleculeObject_atom.cpp (modified) (2 diffs)
• GLMoleculeObject_atom.hpp (modified) (1 diff)
• GLMoleculeObject_bond.cpp (modified) (2 diffs)
• GLMoleculeObject_bond.hpp (modified) (1 diff)
• GLMoleculeObject_molecule.cpp (modified) (2 diffs)
• GLMoleculeObject_molecule.hpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (5 diffs)
• GLWorldScene.hpp (modified) (1 diff)

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

@@ -47 +47 @@
 
 
-GLMoleculeObject::GLMoleculeObject(QGLSceneNode *GLMoleculeObject, QObject *parent)
+GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
    : QObject(parent)
 {
-   m_mesh = GLMoleculeObject;
+   //mesh->setParent(this);
+   m_mesh = mesh;
    m_scale = 1.0f;
    m_scaleZ = 1.0f;

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

@@ -37 +37 @@
    friend class GLWorldScene;
 public:
-   explicit GLMoleculeObject(QGLSceneNode *GLMoleculeObject, QObject *parent=0);
+   explicit GLMoleculeObject(QGLSceneNode *mesh, QObject *parent=0);
    explicit GLMoleculeObject(QGLAbstractScene *scene, QObject *parent=0);
    virtual ~GLMoleculeObject();

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

@@ -20 +20 @@
 #include "GLMoleculeObject_atom.hpp"
 
-#include <Qt3D/qglbuilder.h>
 #include <Qt3D/qglscenenode.h>
-#include <Qt3D/qglsphere.h>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -38 +36 @@
 #include "World.hpp"
 
-static QGLSceneNode * createAtom(QObject *parent)
-{
-  QGLBuilder builder;
-  builder << QGLSphere(2.0);
-  QGLSceneNode *n = builder.finalizedSceneNode();
-  n->setParent(parent);
-  return n;
-}
-
-GLMoleculeObject_atom::GLMoleculeObject_atom(QObject *parent, const atom *atomref) :
-  GLMoleculeObject(createAtom(parent), parent),
+GLMoleculeObject_atom::GLMoleculeObject_atom(QGLSceneNode *mesh, QObject *parent, const atom *atomref) :
+  GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_atom")+toString(atomref->getId())),
   _atom(atomref)

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

@@ -27 +27 @@
   Q_OBJECT
 public:
-  GLMoleculeObject_atom(QObject *parent, const atom *atomref);
+  GLMoleculeObject_atom(QGLSceneNode *mesh, QObject *parent, const atom *atomref);
   virtual ~GLMoleculeObject_atom();
 

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

@@ -20 +20 @@
 #include "GLMoleculeObject_bond.hpp"
 
-#include <Qt3D/qglbuilder.h>
-#include <Qt3D/qglcylinder.h>
 #include <Qt3D/qglmaterial.h>
 #include <Qt3D/qglscenenode.h>
@@ -39 +37 @@
 #include "LinearAlgebra/Vector.hpp"
 
-static QGLSceneNode *createBond(QObject *parent)
-{
-   QGLBuilder builder;
-   QGLCylinder cylinder(.25,.25,1.0,16);
-   builder << cylinder;
-   QGLSceneNode *n = builder.finalizedSceneNode();
-   n->setParent(parent);
-   return n;
-}
-
-GLMoleculeObject_bond::GLMoleculeObject_bond(QObject *parent, const bond *bondref, const enum SideOfBond side) :
-  GLMoleculeObject(createBond(parent), parent),
+GLMoleculeObject_bond::GLMoleculeObject_bond(QGLSceneNode *mesh, QObject *parent, const bond *bondref, const enum SideOfBond side) :
+  GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_bond")
       +toString(bondref->leftatom->getId())

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

@@ -28 +28 @@
   enum SideOfBond { left, right };
 
-  GLMoleculeObject_bond(QObject *parent, const bond *bondref, const enum SideOfBond side);
+  GLMoleculeObject_bond(QGLSceneNode *mesh, QObject *parent, const bond *bondref, const enum SideOfBond side);
   virtual ~GLMoleculeObject_bond();
 

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

@@ -24 +24 @@
 #include "GLMoleculeObject_molecule.hpp"
 
-#include <Qt3D/qglbuilder.h>
 #include <Qt3D/qglscenenode.h>
-#include <Qt3D/qglsphere.h>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -41 +39 @@
 #include "World.hpp"
 
-static QGLSceneNode * createMolecule(QObject *parent)
-{
-  // create an empty mesh...
-  QGLBuilder builder;
-  QGLSceneNode *n = builder.finalizedSceneNode();
-  n->setParent(parent);
-  return n;
-}
-
-GLMoleculeObject_molecule::GLMoleculeObject_molecule(QObject *parent, const molecule *molref) :
-  GLMoleculeObject(createMolecule(parent), parent),
+GLMoleculeObject_molecule::GLMoleculeObject_molecule(QGLSceneNode *mesh, QObject *parent, const molecule *molref) :
+  GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_molecule")+toString(molref->getId())),
   _molecule(molref)

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

@@ -28 +28 @@
   Q_OBJECT
 public:
-  GLMoleculeObject_molecule(QObject *parent, const molecule *molref);
+  GLMoleculeObject_molecule(QGLSceneNode *mesh, QObject *parent, const molecule *molref);
   virtual ~GLMoleculeObject_molecule();
 

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

@@ -22 +22 @@
 #include "GLWorldScene.hpp"
 #include <Qt3D/qglview.h>
+#include <Qt3D/qglbuilder.h>
+#include <Qt3D/qglscenenode.h>
+#include <Qt3D/qglsphere.h>
+#include <Qt3D/qglcylinder.h>
 
 #include "GLMoleculeObject.hpp"
@@ -54 +58 @@
    : QObject(parent)
 {
+  QGLBuilder builder0;
+  meshEmpty = builder0.finalizedSceneNode();
+  QGLBuilder builder1;
+  builder1 << QGLSphere(2.0, 5);
+  meshSphereHi = builder1.finalizedSceneNode();
+  QGLBuilder builder2;
+  builder2 << QGLSphere(2.0, 1);
+  meshSphereLo = builder2.finalizedSceneNode();
+  QGLBuilder builder3;
+  builder3 << QGLCylinder(.25,.25,1.0,16);
+  meshCylinderHi = builder3.finalizedSceneNode();
+  QGLBuilder builder4;
+  builder4 << QGLCylinder(.25,.25,1.0,16);
+  meshCylinderLo = builder4.finalizedSceneNode();
+
   init();
 }
@@ -103 +122 @@
 {
   LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_atom->getId())+".");
-  GLMoleculeObject_atom *atomObject = new GLMoleculeObject_atom(this, _atom);
+  GLMoleculeObject_atom *atomObject = new GLMoleculeObject_atom(meshSphereHi, this, _atom);
   AtomNodeMap::iterator iter = AtomsinSceneMap.find(_atom->getId());
   ASSERT(iter == AtomsinSceneMap.end(),
@@ -156 +175 @@
       if (isSelected && (iter == MoleculesinSceneMap.end())){
         // -> create new mesh
-        GLMoleculeObject_molecule *molObject = new GLMoleculeObject_molecule(this, *Runner);
+        GLMoleculeObject_molecule *molObject = new GLMoleculeObject_molecule(meshEmpty, this, *Runner);
         MoleculesinSceneMap.insert( make_pair((*Runner)->getId(), molObject) );
         connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
@@ -221 +240 @@
 #endif
   GLMoleculeObject_bond *bondObject =
-      new GLMoleculeObject_bond(this, _bond, side);
+      new GLMoleculeObject_bond(meshCylinderHi, this, _bond, side);
   connect (
       bondObject, SIGNAL(BondRemoved(const atomId_t, const atomId_t)),

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

@@ -89 +89 @@
   BondNodeMap BondsinSceneMap;
   MoleculeNodeMap MoleculesinSceneMap;
+
+  QGLSceneNode *meshEmpty;
+  QGLSceneNode *meshSphereHi;
+  QGLSceneNode *meshSphereLo;
+  QGLSceneNode *meshCylinderHi;
+  QGLSceneNode *meshCylinderLo;
 };