Changeset 615eee for src/UIElements/Views

Timestamp:

Nov 16, 2012, 11:10:27 AM (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:

afd3d2

Parents:

f20da5

git-author:

Michael Ankele <ankele@…> (08/06/12 13:15:55)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:27)

Message:

GLMoleculeObject: prepare for deriving shape class

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -81 +81 @@
 }
 
+GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
+   : QObject(parent)
+{
+   //mesh->setParent(this);
+   for (int i=0;i<DETAILTYPES_MAX;i++)
+     m_mesh[i] = mesh;
+   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;
+   initStaticMaterials();
+}
+
 GLMoleculeObject::GLMoleculeObject(QGLAbstractScene *scene, QObject *parent)
    : QObject(parent)
 {
    scene->setParent(this);
-   m_mesh[0] = scene->mainNode();
-   m_mesh[1] = scene->mainNode();
-   m_mesh[2] = scene->mainNode();
+   for (int i=0;i<DETAILTYPES_MAX;i++)
+     m_mesh[i] = scene->mainNode();
    m_scale = 1.0f;
    m_scaleZ = 1.0f;

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

@@ -38 +38 @@
 public:
    explicit GLMoleculeObject(QGLSceneNode *mesh[], QObject *parent=0);
+   explicit GLMoleculeObject(QGLSceneNode *mesh, QObject *parent=0);
    explicit GLMoleculeObject(QGLAbstractScene *scene, QObject *parent=0);
    virtual ~GLMoleculeObject();
@@ -70 +71 @@
    void initStaticMaterials();
    void initialize(QGLView *view, QGLPainter *painter);
-   void draw(QGLPainter *painter, const QVector4D &cameraPlane);
+   virtual void draw(QGLPainter *painter, const QVector4D &cameraPlane);
    void drawSelectionBox(QGLPainter *painter);
 
@@ -94 +95 @@
    enum{DETAIL_HIGHEST, DETAIL_HIGH, DETAIL_MEDIUM, DETAIL_LOW, DETAILTYPES_MAX} DetailType;
 
-private:
+protected:
 
    static double detailMinDistance[DETAILTYPES_MAX];