Changeset 6966b7 for src/UIElements/Views/Qt4

Timestamp:

Jul 17, 2012, 12:17:26 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

859a00

Parents:

41815a3

git-author:

Michael Ankele <ankele@…> (06/15/12 15:42:22)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:26)

Message:

GLWorldScene: added selection mode (atom/molecule)

• this controls whether atoms or molecules will get selected by clicking on an atom

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (3 diffs)
• GLWorldScene.hpp (modified) (3 diffs)

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

@@ -38 +38 @@
 #include "Actions/SelectionAction/Atoms/AtomByIdAction.hpp"
 #include "Actions/SelectionAction/Atoms/NotAtomByIdAction.hpp"
+#include "Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp"
+#include "Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp"
 #include "Atom/atom.hpp"
 #include "Bond/bond.hpp"
@@ -78 +80 @@
   meshCylinderLo->setOption(QGLSceneNode::CullBoundingBox, true);
 
+  setSelectionMode(SelectAtom);
+
   init();
 }
@@ -302 +306 @@
    LOG(3, "INFO: GLWorldScene - atom " << no << " has been clicked.");
    const atom *Walker = World::getInstance().getAtom(AtomById(no));
-   if (!World::getInstance().isSelected(Walker))
-   SelectionAtomById(no);
-   else
-     SelectionNotAtomById(no);
+   if (selectionMode == SelectAtom){
+     if (!World::getInstance().isSelected(Walker))
+       SelectionAtomById(no);
+     else
+       SelectionNotAtomById(no);
+   }else if (selectionMode == SelectMolecule){
+     const molecule *mol = Walker->getMolecule();
+     ASSERT(mol, "Atom without molecule has been clicked.");
+     if (!World::getInstance().isSelected(mol))
+       SelectionMoleculeById(mol->getId());
+     else
+       SelectionNotMoleculeById(mol->getId());
+   }
    emit clicked(no);
 }
 
+void GLWorldScene::setSelectionMode(SelectionModeType mode)
+{
+  selectionMode = mode;
+  // TODO send update to toolbar
+}
+
+void GLWorldScene::setSelectionModeAtom()
+{
+  setSelectionMode(SelectAtom);
+}
+
+void GLWorldScene::setSelectionModeMolecule()
+{
+  setSelectionMode(SelectMolecule);
+}
+

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

@@ -57 +57 @@
   void draw(QGLPainter *painter) const;
 
+  enum SelectionModeType{
+    SelectAtom,
+    SelectMolecule
+  };
+  void setSelectionMode(SelectionModeType mode);
+
 signals:
   void changed();
@@ -75 +81 @@
   void bondInserted(const bond *_bond, const GLMoleculeObject_bond::SideOfBond side);
   void bondRemoved(const atomId_t leftnr, const atomId_t rightnr);
+  void setSelectionModeAtom();
+  void setSelectionModeMolecule();
 
 private:
@@ -95 +103 @@
   QGLSceneNode *meshCylinderHi;
   QGLSceneNode *meshCylinderLo;
+
+  SelectionModeType selectionMode;
 };