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

Timestamp:

Apr 11, 2012, 4:52:37 PM (14 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, 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.hpp (modified) (5 diffs)

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

@@ -47 +47 @@
    void setScale(qreal value) { m_scale = value; }
 
+   qreal scaleZ() const { return m_scaleZ; }
+   void setScaleZ(qreal value) { m_scaleZ = value; }
+
    qreal rotationAngle() const { return m_rotationAngle; }
    void setRotationAngle(qreal value) { m_rotationAngle = value; }
@@ -54 +57 @@
 
    QGLMaterial *material() const { return m_material; }
-   void setMaterial(QGLMaterial *value)
-       { m_material = value; m_hoverMaterial = value; }
-
-   QGLMaterial *hoverMaterial() const { return m_hoverMaterial; }
-   void setHoverMaterial(QGLMaterial *value) { m_hoverMaterial = value; }
+   void setMaterial(QGLMaterial *value) { m_material = value; }
 
    QGLAbstractEffect *effect() const { return m_effect; }
@@ -66 +65 @@
    void setObjectId(int id) { m_objectId = id; }
 
+   bool selected() const { return m_selected; }
+   void setSelected(bool value);
+
+   void initStaticMaterials();
    void initialize(QGLView *view, QGLPainter *painter);
    void draw(QGLPainter *painter);
+   void drawSelectionBox(QGLPainter *painter);
 
 signals:
@@ -75 +79 @@
    void doubleClicked();
    void hoverChanged();
+   void selectionChanged();
+   void changed();
 
 protected:
@@ -88 +94 @@
 
    QGLSceneNode *m_mesh;
-   QGLSceneNode *m_GLMoleculeObject;
    QGLAbstractScene *m_scene;
    QVector3D m_position;
    qreal m_scale;
+   qreal m_scaleZ;
    qreal m_rotationAngle;
    QVector3D m_rotationVector;
    QGLMaterial *m_material;
-   QGLMaterial *m_hoverMaterial;
+   static QGLMaterial *m_hoverMaterial;
+   static QGLMaterial *m_selectionMaterial;
+   static QGLMaterial *m_selectionBoxMaterial;
    QGLAbstractEffect *m_effect;
    int m_objectId;
    bool m_hovering;
+   bool m_selected;
 };