Changeset 0ac85c3 for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Jan 29, 2015, 7:37:57 AM (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, Candidate_v1.7.0, Candidate_v1.7.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:

27e464

Parents:

7b38d3 (diff), 4f2895 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GUI_TesselatedLargeMolecules' into Candidate_v1.4.10

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (8 diffs)

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

@@ -71 +71 @@
   setOption(QGLView::ObjectPicking, true);
   setOption(QGLView::CameraNavigation, false);
+  setFocusPolicy(Qt::StrongFocus);
   setCameraControlMode(Rotate);
   defaultEyeSeparation = 4.0;
@@ -78 +79 @@
   //changeMaterials(false);
 
-  qRegisterMetaType<atomicNumber_t>("atomicNumber_t");
+  qRegisterMetaType<atomId_t>("atomId_t");
+  qRegisterMetaType<moleculeId_t>("moleculeId_t");
 
   connect(this, SIGNAL(ShapeAdded()), worldscene, SLOT(addShape()));
@@ -85 +87 @@
   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(this, SIGNAL(atomInserted(const atomicNumber_t)), worldscene, SLOT(atomInserted(const atomicNumber_t)));
-  connect(this, SIGNAL(atomRemoved(const atomicNumber_t)), worldscene, SLOT(atomRemoved(const atomicNumber_t)));
+  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 molecule *)), worldscene, SLOT(moleculeRemoved(const molecule *)));
-  //connect(this, SIGNAL(moleculeInserted(const molecule *)), worldscene, SLOT(moleculeInserted(const molecule *)));
+  connect(this, SIGNAL(moleculeRemoved(const moleculeId_t)), worldscene, SLOT(moleculeRemoved(const moleculeId_t)));
+  connect(this, SIGNAL(moleculeInserted(const molecule *)), worldscene, SLOT(moleculeInserted(const molecule *)));
   //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
   connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
+  connect(this, SIGNAL(moleculesVisibilityChanged(const moleculeId_t,bool)), worldscene, SLOT(moleculesVisibilityChanged(const moleculeId_t,bool)));
 
   // sign on to changes in the world
   World::getInstance().signOn(this);
-  World::getInstance().signOn(this, World::AtomInserted);
-  World::getInstance().signOn(this, World::AtomRemoved);
   World::getInstance().signOn(this, World::MoleculeInserted);
   World::getInstance().signOn(this, World::MoleculeRemoved);
@@ -338 +338 @@
   if (static_cast<World *>(publisher) == World::getPointer()) {
     switch (notification->getChannelNo()) {
-      case World::AtomInserted:
-      {
-        const atomicNumber_t _id = World::getInstance().lastChanged<atom>()->getId();
-  #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
-  #endif
-        emit atomInserted(_id);
-        break;
-      }
-      case World::AtomRemoved:
-      {
-        const atomicNumber_t _id = World::getInstance().lastChanged<atom>()->getId();
-  #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been removed.";
-  #endif
-        emit atomRemoved(_id);
-        break;
-      }
       case World::SelectionChanged:
       {
@@ -366 +348 @@
       case World::MoleculeInserted:
       {
-        const molecule *_molecule = World::getInstance().lastChanged<molecule>();
+        const molecule * _mol = World::getInstance().lastChanged<molecule>();
   #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_molecule->getId())+" has been removed.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_mol->getId())+" has been removed.";
   #endif
-        emit moleculeInserted(_molecule);
+        emit moleculeInserted(_mol);
         break;
       }
       case World::MoleculeRemoved:
       {
-        const molecule *_molecule = World::getInstance().lastChanged<molecule>();
+        const moleculeId_t _id = World::getInstance().lastChanged<molecule>()->getId();
   #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_molecule->getId())+" has been removed.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_id)+" has been removed.";
   #endif
-        emit moleculeRemoved(_molecule);
+        emit moleculeRemoved(_id);
         break;
       }
@@ -518 +500 @@
 void GLWorldView::keyPressEvent(QKeyEvent *e)
 {
+  // Find the distance between the eye and focus point.
+  QVector3D d = camera()->eye() - camera()->center();
+//  LOG(1, "Distance vector eye and center is "
+//      << d.x() << "," << d.y() << "," << d.z());
+  // scale the move unit by the eye <-> domain center distance
+  const double key_move_unit = 0.04*(d.length()/50.);
+
   if (e->key() == Qt::Key_Tab) {
     // The Tab key turns the ShowPicking option on and off,
@@ -523 +512 @@
     setOption(QGLView::ShowPicking, ((options() & QGLView::ShowPicking) == 0));
     updateGL();
+  } else if ((e->key() == Qt::Key_Minus) || (e->key() == Qt::Key_Plus)) {
+    // Scale the distance.
+    if (e->key() == Qt::Key_Minus)
+      d *= 1.2;
+    else if (e->key() == Qt::Key_Plus)
+      d /= 1.2;
+    // Set new eye position.
+    camera()->setEye(camera()->center() + d);
+  } else if ((e->key() == Qt::Key_Left) || (e->key() == Qt::Key_Right)) {
+    // Translate the camera.
+    const double d = (e->key() == Qt::Key_Left) ? -key_move_unit : key_move_unit;
+    camera()->translateCenter( d, 0., 0);
+    camera()->translateEye( d, 0., 0);
+  } else if ((e->key() == Qt::Key_Up) || (e->key() == Qt::Key_Down)) {
+    // Translate the camera.
+    const double d = (e->key() == Qt::Key_Up) ? -key_move_unit : key_move_unit;
+    camera()->translateCenter( 0., d, 0);
+    camera()->translateEye( 0., d, 0);
+  } else if ((e->key() == Qt::Key_PageUp) || (e->key() == Qt::Key_PageDown)) {
+    // Translate the camera.
+    const double d = (e->key() == Qt::Key_PageUp) ? -key_move_unit : key_move_unit;
+    camera()->translateCenter( 0., 0., d);
+    camera()->translateEye( 0., 0., d);
   }
   QGLView::keyPressEvent(e);
@@ -750 +762 @@
 }
 
-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);
+}