Changeset 53059e for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp

Timestamp:

Apr 11, 2012, 4:52:37 PM (13 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:

3e93332

Parents:

c0ed1e (diff), 3927ef (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.

git-author:

Frederik Heber <heber@…> (04/06/12 11:59:28)

git-committer:

Frederik Heber <heber@…> (04/11/12 16:52:37)

Message:

Merge branch 'michi-track-molecules' into stable

Conflicts:

src/World.hpp

• World had removed NotificationType MoleculeChange but added SelectionChanged.
• FIX: World::AtomPositionChanged is no more, GLWorldView listens to AtomObserver instead.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp (modified) (10 diffs)

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

@@ -42 +42 @@
 #include "CodePatterns/MemDebug.hpp"
 
+QGLMaterial *GLMoleculeObject::m_hoverMaterial = NULL;
+QGLMaterial *GLMoleculeObject::m_selectionMaterial = NULL;
+QGLMaterial *GLMoleculeObject::m_selectionBoxMaterial = NULL;
+
 
 GLMoleculeObject::GLMoleculeObject(QGLSceneNode *GLMoleculeObject, QObject *parent)
    : QObject(parent)
 {
-   m_mesh = 0;
-   m_GLMoleculeObject = GLMoleculeObject;
+   m_mesh = GLMoleculeObject;
    m_scale = 1.0f;
+   m_scaleZ = 1.0f;
    m_rotationAngle = 0.0f;
    m_effect = 0;
    m_objectId = -1;
    m_hovering = false;
+   m_selected = false;
    m_material = 0;
-   m_hoverMaterial = 0;
+   initStaticMaterials();
 }
 
@@ -61 +66 @@
 {
    scene->setParent(this);
-   m_mesh = 0;
-   m_GLMoleculeObject = scene->mainNode();
+   m_mesh = scene->mainNode();
    m_scale = 1.0f;
+   m_scaleZ = 1.0f;
    m_rotationAngle = 0.0f;
    m_effect = 0;
    m_objectId = -1;
    m_hovering = false;
+   m_selected = false;
    m_material = 0;
-   m_hoverMaterial = 0;
+   initStaticMaterials();
 }
 
 GLMoleculeObject::~GLMoleculeObject()
 {
-   delete m_mesh;
 }
 
@@ -82 +87 @@
    if (m_objectId != -1)
        view->registerObject(m_objectId, this);
+}
+
+
+/** Draws a box around the mesh.
+ *
+ */
+void GLMoleculeObject::drawSelectionBox(QGLPainter *painter)
+{
+  painter->setFaceMaterial(QGL::AllFaces, m_selectionBoxMaterial);
+  QVector3DArray array;
+  qreal radius = 1.0;
+  array.append(-radius, -radius, -radius); array.append( radius, -radius, -radius);
+  array.append( radius, -radius, -radius); array.append( radius,  radius, -radius);
+  array.append( radius,  radius, -radius); array.append(-radius,  radius, -radius);
+  array.append(-radius,  radius, -radius); array.append(-radius, -radius, -radius);
+
+  array.append(-radius, -radius,  radius); array.append( radius, -radius,  radius);
+  array.append( radius, -radius,  radius); array.append( radius,  radius,  radius);
+  array.append( radius,  radius,  radius); array.append(-radius,  radius,  radius);
+  array.append(-radius,  radius,  radius); array.append(-radius, -radius,  radius);
+
+  array.append(-radius, -radius, -radius); array.append(-radius, -radius,  radius);
+  array.append( radius, -radius, -radius); array.append( radius, -radius,  radius);
+  array.append(-radius,  radius, -radius); array.append(-radius,  radius,  radius);
+  array.append( radius,  radius, -radius); array.append( radius,  radius,  radius);
+  painter->clearAttributes();
+  painter->setVertexAttribute(QGL::Position, array);
+  painter->draw(QGL::Lines, 24);
 }
 
@@ -93 +126 @@
    if (m_rotationAngle != 0.0f)
        painter->modelViewMatrix().rotate(m_rotationAngle, m_rotationVector);
+   if (m_scaleZ != 1.0f)
+       painter->modelViewMatrix().scale(1.0f, 1.0f, m_scaleZ);
 
    // Apply the material and effect to the painter.
@@ -98 +133 @@
    if (m_hovering)
        material = m_hoverMaterial;
+   else if (m_selected)
+       material = m_selectionMaterial;
    else
        material = m_material;
+
+   ASSERT(material, "GLMoleculeObject::draw: chosen material is NULL");
+
    painter->setColor(material->diffuseColor());
    painter->setFaceMaterial(QGL::AllFaces, material);
@@ -113 +153 @@
 
    // Draw the geometry mesh.
-   if (m_GLMoleculeObject)
-       m_GLMoleculeObject->draw(painter);
-   else
-       m_mesh->draw(painter);
+   m_mesh->draw(painter);
+
+   // Draw a box around the mesh, if selected.
+   if (m_selected)
+     drawSelectionBox(painter);
 
    // Turn off the user effect, if present.
@@ -164 +205 @@
 QGLMaterial* GLMoleculeObject::getMaterial(size_t no)
 {
-  ASSERT( (no >= 0) && (no < MAX_ELEMENTS),
+  ASSERT( (no > 0) && (no < MAX_ELEMENTS),
       "GLMoleculeView::getMaterial() - Element no "+toString(no)+" is invalid.");
   if (ElementNoMaterialMap.find(no) != ElementNoMaterialMap.end()){
@@ -174 +215 @@
     QGLMaterial *newmaterial = new QGLMaterial(NULL);
 
-    if (no == 0) { // create hover material
-      newmaterial->setAmbientColor( QColor(0, 128, 128) );
-    } else { // create material for element
-      periodentafel *periode = World::getInstance().getPeriode();
-      const element *desiredelement = periode->FindElement(no);
-      ASSERT(desiredelement != NULL,
-          "GLMoleculeView::getMaterial() - desired element "+toString(no)+" not present in periodentafel.");
-      const unsigned char* color = desiredelement->getColor();
-      LOG(1, "Creating new material with color " << (int)color[0] << "," << (int)color[1] << "," << (int)color[2] << ".");
-      newmaterial->setAmbientColor( QColor((int)color[0], (int)color[1], (int)color[2]) );
-    }
+    // create material for element
+    periodentafel *periode = World::getInstance().getPeriode();
+    const element *desiredelement = periode->FindElement(no);
+    ASSERT(desiredelement != NULL,
+        "GLMoleculeView::getMaterial() - desired element "+toString(no)+" not present in periodentafel.");
+    const unsigned char* color = desiredelement->getColor();
+    LOG(1, "Creating new material with color " << (int)color[0] << "," << (int)color[1] << "," << (int)color[2] << ".");
+    newmaterial->setAmbientColor( QColor((int)color[0], (int)color[1], (int)color[2]) );
     newmaterial->setSpecularColor( QColor(60, 60, 60) );
     newmaterial->setShininess( 128 );
@@ -190 +228 @@
 
     return newmaterial;
+  }
+}
+
+/** Create the 3 materials shared by all objects.
+ *
+ */
+void GLMoleculeObject::initStaticMaterials()
+{
+  if (!m_hoverMaterial){
+    m_hoverMaterial = new QGLMaterial(NULL);
+    m_hoverMaterial->setAmbientColor( QColor(0, 128, 128) );
+    m_hoverMaterial->setSpecularColor( QColor(60, 60, 60) );
+    m_hoverMaterial->setShininess( 128 );
+  }
+  if (!m_selectionMaterial){
+    m_selectionMaterial = new QGLMaterial(NULL);
+    m_selectionMaterial->setAmbientColor( QColor(255, 50, 50) );
+    m_selectionMaterial->setSpecularColor( QColor(60, 60, 60) );
+    m_selectionMaterial->setShininess( 128 );
+  }
+  if (!m_selectionBoxMaterial){
+    m_selectionBoxMaterial = new QGLMaterial(NULL);
+    m_selectionBoxMaterial->setAmbientColor( QColor(0, 0, 0) );
+    m_selectionBoxMaterial->setDiffuseColor( QColor(0, 0, 0) );
+    m_selectionBoxMaterial->setEmittedLight( QColor(155, 50, 50) );
   }
 }
@@ -205 +268 @@
   }
 }
+
+
+void GLMoleculeObject::setSelected(bool value)
+{
+  if (value != m_selected){
+    m_selected = value;
+    emit selectionChanged();
+  }
+}