Changes in src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp [9a7ef9:ce4126]

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp (modified) (3 diffs)

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

@@ -75 +75 @@
   void clicked(atomId_t);
   void doubleClicked();
-  void hoverChanged(const atom &);
-  void hoverChanged(const molecule &, int);
+  void hoverChanged(const atom*);
 
 private slots:
   void atomClicked(atomId_t no);
-  void atomInserted(const atomId_t _id);
-  void atomRemoved(const atomId_t _id);
-  void moleculeClicked(moleculeId_t no);
-  void moleculeRemoved(const moleculeId_t _id);
-  void moleculeInserted(const molecule * _mol);
+  void atomInserted(const atomicNumber_t _id);
+  void atomRemoved(const atomicNumber_t _id);
+  void moleculeRemoved(const molecule *_molecule);
   void worldSelectionChanged();
   void bondInserted(const bond::ptr _bond, const GLMoleculeObject_bond::SideOfBond side);
@@ -90 +87 @@
   void setSelectionModeAtom();
   void setSelectionModeMolecule();
+  void hoverChangedSignalled(GLMoleculeObject *ob);
   void changeAtomId(GLMoleculeObject_atom *ob, int oldId, int newOd);
   void addShape();
   void removeShape();
   void update();
-  void moleculesVisibilityChanged(const moleculeId_t _id, bool _visible);
 
 public:
@@ -103 +100 @@
 
 private:
+  typedef std::pair< atomId_t, atomId_t> BondIds;
+  friend std::ostream &operator<<(std::ostream &ost, const BondIds &t);
 
-  typedef std::map< atomId_t, GLMoleculeObject_molecule* > AtomMoleculeMap;
-  typedef std::map< GLMoleculeObject_molecule::BondIds , GLMoleculeObject_molecule* > BondMoleculeMap;
+  BondIds getBondIds(
+      const bond::ptr _bond,
+      const enum GLMoleculeObject_bond::SideOfBond side) const;
+
+  typedef std::map< atomId_t, GLMoleculeObject_atom* > AtomNodeMap;
+  typedef std::map< BondIds , GLMoleculeObject_bond* > BondNodeMap;
   typedef std::map< moleculeId_t , GLMoleculeObject_molecule* > MoleculeNodeMap;
   typedef std::map< std::string , GLMoleculeObject_shape* > ShapeNodeMap;
-  AtomMoleculeMap AtomsinSceneMap;
-  BondMoleculeMap BondsinSceneMap;
+  AtomNodeMap AtomsinSceneMap;
+  BondNodeMap BondsinSceneMap;
   MoleculeNodeMap MoleculesinSceneMap;
   ShapeNodeMap ShapesinSceneMap;
 
+  QGLSceneNode *meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];
+  QGLSceneNode *meshSphere[GLMoleculeObject::DETAILTYPES_MAX];
+  QGLSceneNode *meshCylinder[GLMoleculeObject::DETAILTYPES_MAX];
+
   SelectionModeType selectionMode;
+  const atom *hoverAtom;
 };
 
+std::ostream &operator<<(std::ostream &ost, const GLWorldScene::BondIds &t);
+
 #endif /* GLWORLDSCENE_HPP_ */