Changeset 225cf5 for src


Ignore:
Timestamp:
Apr 6, 2012, 11:57:23 AM (13 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:
25b3559
Parents:
3b229e
git-author:
Michael Ankele <ankele@…> (04/02/12 10:57:45)
git-committer:
Frederik Heber <heber@…> (04/06/12 11:57:23)
Message:

REFACTOR: GL: made drawSelectionBox its own function

Location:
src/UIElements/Views/Qt4/Qt3D
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r3b229e r225cf5  
    8989}
    9090
     91
     92/** Draws a box around the mesh.
     93 *
     94 */
     95void GLMoleculeObject::drawSelectionBox(QGLPainter *painter)
     96{
     97  painter->setFaceMaterial(QGL::AllFaces, m_selectionBoxMaterial);
     98  QVector3DArray array;
     99  qreal radius = 0.3f;
     100  array.append(-radius, -radius, -radius); array.append( radius, -radius, -radius);
     101  array.append( radius, -radius, -radius); array.append( radius,  radius, -radius);
     102  array.append( radius,  radius, -radius); array.append(-radius,  radius, -radius);
     103  array.append(-radius,  radius, -radius); array.append(-radius, -radius, -radius);
     104
     105  array.append(-radius, -radius,  radius); array.append( radius, -radius,  radius);
     106  array.append( radius, -radius,  radius); array.append( radius,  radius,  radius);
     107  array.append( radius,  radius,  radius); array.append(-radius,  radius,  radius);
     108  array.append(-radius,  radius,  radius); array.append(-radius, -radius,  radius);
     109
     110  array.append(-radius, -radius, -radius); array.append(-radius, -radius,  radius);
     111  array.append( radius, -radius, -radius); array.append( radius, -radius,  radius);
     112  array.append(-radius,  radius, -radius); array.append(-radius,  radius,  radius);
     113  array.append( radius,  radius, -radius); array.append( radius,  radius,  radius);
     114  painter->clearAttributes();
     115  painter->setVertexAttribute(QGL::Position, array);
     116  painter->draw(QGL::Lines, 24);
     117}
     118
    91119void GLMoleculeObject::draw(QGLPainter *painter)
    92120{
    … …  
    127155   m_mesh->draw(painter);
    128156
    129    if (m_selected){
    130      painter->setFaceMaterial(QGL::AllFaces, m_selectionBoxMaterial);
    131      QVector3DArray array;
    132      qreal radius = 0.3f;
    133      array.append(-radius, -radius, -radius); array.append( radius, -radius, -radius);
    134      array.append( radius, -radius, -radius); array.append( radius,  radius, -radius);
    135      array.append( radius,  radius, -radius); array.append(-radius,  radius, -radius);
    136      array.append(-radius,  radius, -radius); array.append(-radius, -radius, -radius);
    137 
    138      array.append(-radius, -radius,  radius); array.append( radius, -radius,  radius);
    139      array.append( radius, -radius,  radius); array.append( radius,  radius,  radius);
    140      array.append( radius,  radius,  radius); array.append(-radius,  radius,  radius);
    141      array.append(-radius,  radius,  radius); array.append(-radius, -radius,  radius);
    142 
    143      array.append(-radius, -radius, -radius); array.append(-radius, -radius,  radius);
    144      array.append( radius, -radius, -radius); array.append( radius, -radius,  radius);
    145      array.append(-radius,  radius, -radius); array.append(-radius,  radius,  radius);
    146      array.append( radius,  radius, -radius); array.append( radius,  radius,  radius);
    147      painter->clearAttributes();
    148      painter->setVertexAttribute(QGL::Position, array);
    149      painter->draw(QGL::Lines, 24);
    150    }
     157   // Draw a box around the mesh, if selected.
     158   if (m_selected)
     159     drawSelectionBox(painter);
    151160
    152161   // Turn off the user effect, if present.

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

    r3b229e r225cf5  
    7171   void initialize(QGLView *view, QGLPainter *painter);
    7272   void draw(QGLPainter *painter);
     73   void drawSelectionBox(QGLPainter *painter);
    7374
    7475signals:
Note: See TracChangeset for help on using the changeset viewer.