Changeset 2d5137

Timestamp:

Apr 17, 2013, 6:56:54 PM (12 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:

4b62d3

Parents:

1f693d

git-author:

Frederik Heber <heber@…> (03/19/13 11:03:17)

git-committer:

Frederik Heber <heber@…> (04/17/13 18:56:54)

Message:

GLMoleculeObject may set scale independently for each component.

• this will allow changing of the width of the cylinder representing a bond.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.cpp (modified) (4 diffs)
• GLMoleculeObject.hpp (modified) (2 diffs)

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

@@ -70 +70 @@
    for (int i=0;i<DETAILTYPES_MAX;i++)
      m_mesh[i] = mesh[i];
-   m_scale = 1.0f;
+   m_scaleX = 1.0f;
+   m_scaleY = 1.0f;
    m_scaleZ = 1.0f;
    m_rotationAngle = 0.0f;
@@ -87 +88 @@
    for (int i=0;i<DETAILTYPES_MAX;i++)
      m_mesh[i] = mesh;
-   m_scale = 1.0f;
+   m_scaleX = 1.0f;
+   m_scaleY = 1.0f;
    m_scaleZ = 1.0f;
    m_rotationAngle = 0.0f;
@@ -104 +106 @@
    for (int i=0;i<DETAILTYPES_MAX;i++)
      m_mesh[i] = scene->mainNode();
-   m_scale = 1.0f;
+   m_scaleX = 1.0f;
+   m_scaleY = 1.0f;
    m_scaleZ = 1.0f;
    m_rotationAngle = 0.0f;
@@ -159 +162 @@
    painter->modelViewMatrix().push();
    painter->modelViewMatrix().translate(m_position);
-   if (m_scale != 1.0f)
-       painter->modelViewMatrix().scale(m_scale);
    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);
+     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.hpp

@@ -45 +45 @@
    void setPosition(const QVector3D& value) { m_position = value; }
 
-   qreal scale() const { return m_scale; }
-   void setScale(qreal value) { m_scale = value; }
+   void setScale(qreal value) { m_scaleX = m_scaleY = m_scaleZ = value; }
+
+   qreal scaleX() const { return m_scaleX; }
+   void setScaleX(qreal value) { m_scaleX = value; }
+
+   qreal scaleY() const { return m_scaleY; }
+   void setScaleY(qreal value) { m_scaleY = value; }
 
    qreal scaleZ() const { return m_scaleZ; }
@@ -102 +107 @@
    QGLAbstractScene *m_scene;
    QVector3D m_position;
-   qreal m_scale;
+   qreal m_scaleX;
+   qreal m_scaleY;
    qreal m_scaleZ;
    qreal m_rotationAngle;