Changeset 7b93f9

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:

a7aebd

Parents:

3eb91c

git-author:

Frederik Heber <heber@…> (11/18/14 19:52:44)

git-committer:

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

Message:

Added MeshFreeType to GLMoleculeObject.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.cpp (modified) (4 diffs)
• GLMoleculeObject.hpp (modified) (1 diff)

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

@@ -74 +74 @@
   for (int i=0;i<DETAILTYPES_MAX;i++)
     m_mesh[i] = mesh[i];
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -93 +94 @@
   for (int i=0;i<DETAILTYPES_MAX;i++)
     m_mesh[i] = mesh;
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -110 +112 @@
   for (int i=0;i<DETAILTYPES_MAX;i++)
     m_mesh[i] = scene->mainNode();
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -341 +344 @@
 {
   if (m_mesh[0] != NULL) {
-    if (m_mesh[0] != m_mesh[1]) {
+    switch(MeshFreeType) {
+    case free_all:
       for (int i=0;i<DETAILTYPES_MAX;i++)
         delete m_mesh[i];
-    } else {
+      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;

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

@@ -114 +114 @@
 
    QGLSceneNode *m_mesh[DETAILTYPES_MAX];
+   enum enum_MeshFreeType {
+     free_all,
+     free_single,
+     free_none
+   } MeshFreeType;
    QGLAbstractScene *m_scene;
    QVector3D m_position;