Changeset 0ac85c3 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.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/GLMoleculeObject.cpp (modified) (6 diffs)

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

@@ -62 +62 @@
 QGLMaterial *GLMoleculeObject::m_selectionBoxMaterial = NULL;
 
+QGLSceneNode *GLMoleculeObject::meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];
+QGLSceneNode *GLMoleculeObject::meshSphere[GLMoleculeObject::DETAILTYPES_MAX];
+QGLSceneNode *GLMoleculeObject::meshCylinder[GLMoleculeObject::DETAILTYPES_MAX];
 
 double GLMoleculeObject::detailMinDistance[GLMoleculeObject::DETAILTYPES_MAX] = {0, 15, 30, 42};
@@ -69 +72 @@
 {
    //mesh->setParent(this);
-   for (int i=0;i<DETAILTYPES_MAX;i++)
-     m_mesh[i] = mesh[i];
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = mesh[i];
+  MeshFreeType = free_none;
+   m_scaleX = 1.0f;
+   m_scaleY = 1.0f;
+   m_scaleZ = 1.0f;
+   m_rotationAngle = 0.0f;
+   m_effect = 0;
+   m_objectId = -1;
+   m_hovering = false;
+   m_selected = false;
+   m_visible = true;
+   m_material = 0;
+   initStaticMaterials();
+}
+
+GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
+   : QObject(parent)
+{
+   //mesh->setParent(this);
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = mesh;
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -83 +107 @@
 }
 
-GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
+GLMoleculeObject::GLMoleculeObject(QGLAbstractScene *scene, QObject *parent)
    : QObject(parent)
 {
-   //mesh->setParent(this);
-   for (int i=0;i<DETAILTYPES_MAX;i++)
-     m_mesh[i] = mesh;
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = scene->mainNode();
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -101 +125 @@
 }
 
-GLMoleculeObject::GLMoleculeObject(QGLAbstractScene *scene, QObject *parent)
-   : QObject(parent)
-{
-   scene->setParent(this);
-   for (int i=0;i<DETAILTYPES_MAX;i++)
-     m_mesh[i] = scene->mainNode();
-   m_scaleX = 1.0f;
-   m_scaleY = 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;
-   initStaticMaterials();
-}
-
 GLMoleculeObject::~GLMoleculeObject()
 {
@@ -163 +169 @@
    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.
@@ -325 +332 @@
   }
 }
+
+void GLMoleculeObject::setVisible(bool value)
+{
+  if (value != m_visible){
+    m_visible = value;
+    emit changed();
+  }
+}
+
+void GLMoleculeObject::updateMesh(QGLSceneNode *mesh)
+{
+  if (m_mesh[0] != NULL) {
+    switch(MeshFreeType) {
+    case free_all:
+      for (int i=0;i<DETAILTYPES_MAX;i++)
+        delete m_mesh[i];
+      break;
+    case free_single:
+      delete m_mesh[0];
+      break;
+    default:
+    case free_none:
+      break;
+    }
+  }
+  MeshFreeType = free_single;
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = mesh;
+}