Changeset 2b596f for src/UIElements/Views/Qt4/Qt3D

Timestamp:

Jan 10, 2015, 5:14:32 PM (10 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:

9a7ef9

Parents:

7b5984

git-author:

Frederik Heber <heber@…> (11/12/14 22:26:05)

git-committer:

Frederik Heber <heber@…> (01/10/15 17:14:32)

Message:

Hovering over molecules is working including update of QtInfoBox.

• SelectionBox is drawn again when molecule is fully shown.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -166 +166 @@
    painter->modelViewMatrix().push();
    painter->modelViewMatrix().translate(m_position);
+   if ((m_scaleX != 1.0f) || (m_scaleY != 1.0f) || (m_scaleZ != 1.0f))
+     painter->modelViewMatrix().scale(m_scaleX, m_scaleY, m_scaleZ);
    if (m_rotationAngle != 0.0f)
      painter->modelViewMatrix().rotate(m_rotationAngle, m_rotationVector);
-   painter->modelViewMatrix().scale(m_scaleX, m_scaleY, m_scaleZ);
 
    // Apply the material and effect to the painter.

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

@@ -133 +133 @@
   GLMoleculeObject(createMoleculeMesh(molref, parent), parent),
   Observer(std::string("GLMoleculeObject_molecule")+toString(molref->getId())),
+  isBoundingBoxUptodate(true),
   isSignedOn(false),
   _molecule(molref),
@@ -155 +156 @@
 
   init();
+
+  connect (this, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
+  connect (this, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SIGNAL(changed()));
 }
 
@@ -160 +164 @@
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_molecule")+toString(molref->getId())),
+  isBoundingBoxUptodate(true),
   isSignedOn(false),
   _molecule(molref),
@@ -182 +187 @@
 
   init();
+
+  connect (this, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
+  connect (this, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SIGNAL(changed()));
 }
 
@@ -204 +212 @@
 {
   if (_molecule->begin() != _molecule->end()) {
+    int atomicid = -1;
     for (molecule::const_iterator atomiter = _molecule->begin();
         atomiter != _molecule->end();
         atomiter++) {
       // create atom objects in scene
-      atomInserted((*atomiter)->getId());
+      atomicid = (*atomiter)->getId();
+      atomInserted(atomicid);
 
       // create bond objects in scene
@@ -221 +231 @@
       }
     }
+    // set id to one of the atom's as either mol or atoms is present at the same time
+    setObjectId(atomicid);
   }
 }
@@ -287 +299 @@
 void GLMoleculeObject_molecule::updateBoundingBox()
 {
+  isBoundingBoxUptodate = true;
   Shape shape = _molecule->getBoundingSphere();
   Vector v = shape.getCenter();
@@ -323 +336 @@
   #endif
         TesselationHullUptodate = false;
+        isBoundingBoxUptodate = false;
         atomInserted(_id);
         break;
@@ -333 +347 @@
   #endif
         TesselationHullUptodate = false;
+        isBoundingBoxUptodate = false;
         atomRemoved(_id);
         break;
@@ -338 +353 @@
       case molecule::AtomMoved:
       {
+  #ifdef LOG_OBSERVER
         const atomId_t _id = _molecule->lastChanged()->getId();
-  #ifdef LOG_OBSERVER
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
   #endif
         TesselationHullUptodate = false;
+        isBoundingBoxUptodate = false;
         break;
       }
@@ -368 +384 @@
 {
   // Initialize all of the mesh objects that we have as children.
-  GLMoleculeObject::initialize(view, painter);
+  if (m_visible) {
+    GLMoleculeObject::initialize(view, painter);
+  } else {
    foreach (QObject *obj, children()) {
      GLMoleculeObject *meshobj = qobject_cast<GLMoleculeObject *>(obj);
@@ -374 +392 @@
          meshobj->initialize(view, painter);
    }
+  }
 }
 
@@ -409 +428 @@
     m_mesh[0]->draw(painter);
 
-    // Draw a box around the mesh, if selected.
-    if (m_selected)
-      drawSelectionBox(painter);
-
     // Turn off the user effect, if present.
     if (m_effect)
@@ -431 +446 @@
         meshobj->draw(painter, cameraPlane);
     }
+
+    // update bounding box prior to selection
+    if (!isBoundingBoxUptodate)
+      updateBoundingBox();
+
+    painter->modelViewMatrix().push();
+    painter->modelViewMatrix().translate(m_position);
+    if ((m_scaleX != 1.0f) || (m_scaleY != 1.0f) || (m_scaleZ != 1.0f))
+      painter->modelViewMatrix().scale(m_scaleX, m_scaleY, m_scaleZ);
+    if (m_rotationAngle != 0.0f)
+      painter->modelViewMatrix().rotate(m_rotationAngle, m_rotationVector);
+
+    // Draw a box around the mesh, if selected.
+    if (m_selected)
+      drawSelectionBox(painter);
+
+    // Restore the modelview matrix.
+    painter->modelViewMatrix().pop();
   }
 }
@@ -458 +491 @@
   connect (atomObject, SIGNAL(indexChanged(GLMoleculeObject_atom*, int, int)), this, SIGNAL(changeAtomId(GLMoleculeObject_atom*, int, int)));
 
-  updateBoundingBox();
+  isBoundingBoxUptodate = false;
+
+  if (m_objectId  == -1)
+    setObjectId(_id);
 
   //bondsChanged(_atom);
@@ -474 +510 @@
   LOG(3, "INFO: GLWorldScene: Received signal atomRemoved for atom "+toString(_id)+".");
   // bonds are removed by signal coming from ~bond
+
+  if (m_objectId == _id)
+    setObjectId(-1);
+
   // remove atoms
   AtomNodeMap::iterator iter = AtomsinSceneMap.find(_id);
@@ -483 +523 @@
   delete atomObject;
 
-  updateBoundingBox();
+  isBoundingBoxUptodate = false;
 
   emit changeOccured();
@@ -498 +538 @@
         hoverAtom = World::getInstance().getAtom(AtomById(iter->first));
     }
-  }
-
-  // Propagate signal.
-  emit hoverChanged(hoverAtom);
+
+    // Propagate signal.
+    emit hoverChanged(*hoverAtom);
+  } else {
+    // Find the atom, ob corresponds to.
+    GLMoleculeObject_molecule *moleculeObject = dynamic_cast<GLMoleculeObject_molecule *>(ob);
+    if (moleculeObject == this){
+      // Propagate signal.
+      emit hoverChanged(*_molecule, 0);
+    }
+  }
 }
 

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

@@ -57 +57 @@
   void changed();
   void changeOccured();
-  void hoverChanged(const atom*);
+  void hoverChanged(const atom&);
+  void hoverChanged(const molecule&, int);
   void atomClicked(atomId_t no);
   void changeAtomId(GLMoleculeObject_atom *, int, int);
@@ -87 +88 @@
   //!> states whether selection box is additionally drawn or not
   bool isSelected;
+  bool isBoundingBoxUptodate;
 
   //!> whether we are signed on to the associated molecule

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

@@ -262 +262 @@
   connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
   connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(hoverChanged(const atom *)), this, SIGNAL(hoverChanged(const atom *)));
+  connect (molObject, SIGNAL(hoverChanged(const atom &)), this, SIGNAL(hoverChanged(const atom &)));
+  connect (molObject, SIGNAL(hoverChanged(const molecule &, int)), this, SIGNAL(hoverChanged(const molecule &, int)));
   emit changed();
   emit changeOccured();
@@ -460 +461 @@
   molObject->atomInserted(oldId);
 }
-

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

@@ -75 +75 @@
   void clicked(atomId_t);
   void doubleClicked();
-  void hoverChanged(const atom *);
+  void hoverChanged(const atom &);
+  void hoverChanged(const molecule &, int);
 
 private slots:

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

@@ -86 +86 @@
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
   connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect(worldscene, SIGNAL(hoverChanged(const atom *)), this, SLOT(sceneHoverSignalled(const atom *)));
+  connect(worldscene, SIGNAL(hoverChanged(const atom &)), this, SLOT(sceneHoverSignalled(const atom &)));
+  connect(worldscene, SIGNAL(hoverChanged(const molecule &, int)), this, SLOT(sceneHoverSignalled(const molecule &, int)));
   connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
   connect(this, SIGNAL(moleculeRemoved(const moleculeId_t)), worldscene, SLOT(moleculeRemoved(const moleculeId_t)));
@@ -730 +731 @@
 }
 
-void GLWorldView::sceneHoverSignalled(const atom *_atom)
+void GLWorldView::sceneHoverSignalled(const atom &_atom)
 {
   emit hoverChanged(_atom);
 }
+
+void GLWorldView::sceneHoverSignalled(const molecule &_mol, int _i)
+{
+  emit hoverChanged(_mol, _i);
+}

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

@@ -51 +51 @@
   void checkChanges();
   void sceneChangeSignalled();
-  void sceneHoverSignalled(const atom *_atom);
+  void sceneHoverSignalled(const atom &_atom);
+  void sceneHoverSignalled(const molecule &_mol, int);
   void changeDreiBein();
   void changeDomain();
@@ -61 +62 @@
   void moleculeRemoved(const moleculeId_t _id);
   void worldSelectionChanged();
-  void hoverChanged(const atom *_atom);
+  void hoverChanged(const atom &_atom);
+  void hoverChanged(const molecule &_mol, int);
   void ShapeAdded();
   void ShapeRemoved();