Changeset d7cad1 for src/UIElements/Views/Qt4

Timestamp:

Jan 11, 2015, 4:42:43 PM (10 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:

596cfa

Parents:

b6d92e

git-author:

Frederik Heber <heber@…> (12/12/14 08:28:30)

git-committer:

Frederik Heber <heber@…> (01/11/15 16:42:43)

Message:

Extended selection action for Molecule ids to multiple ids.

Location:

src/UIElements/Views/Qt4

Files:

• Qt3D/GLWorldScene.cpp (modified) (2 diffs)
• QtMoleculeList.cpp (modified) (1 diff)

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

@@ -150 +150 @@
      const molecule *mol = Walker->getMolecule();
      ASSERT(mol, "Atom without molecule has been clicked.");
+     molids_t ids(1, mol->getId());
      if (!World::getInstance().isSelected(mol))
-       SelectionMoleculeById(mol->getId());
+       SelectionMoleculeById(ids);
      else
-       SelectionNotMoleculeById(mol->getId());
+       SelectionNotMoleculeById(ids);
    }
    emit clicked(no);
@@ -163 +164 @@
    const molecule *mol= World::getInstance().getMolecule(MoleculeById(no));
    ASSERT(mol, "Atom without molecule has been clicked.");
+   molids_t ids(1, mol->getId());
    if (!World::getInstance().isSelected(mol))
-     SelectionMoleculeById(mol->getId());
+     SelectionMoleculeById(ids);
    else
-     SelectionNotMoleculeById(mol->getId());
+     SelectionNotMoleculeById(ids);
    emit clicked(no);
 }

src/UIElements/Views/Qt4/QtMoleculeList.cpp

@@ -268 +268 @@
   // Select all molecules which belong to newly selected rows.
   QModelIndex index;
-  QModelIndexList items = selected.indexes();
-  foreach (index, items)
-    if (index.column() == 0){
-      int mol_id = model()->data(index, Qt::UserRole).toInt();
-      if (mol_id < 0)
-        continue;
-      //std::cout << "select molecule" << std::endl;
-      MoleCuilder::SelectionMoleculeById(mol_id);
-    }
+  {
+    QModelIndexList items = selected.indexes();
+    molids_t ids;
+    ids.reserve(items.size());
+    foreach (index, items)
+      if (index.column() == 0){
+        int mol_id = model()->data(index, Qt::UserRole).toInt();
+        if (mol_id < 0)
+          continue;
+        ids.push_back(mol_id);
+        //std::cout << "select molecule" << std::endl;
+      }
+    MoleCuilder::SelectionMoleculeById(ids);
+  }
 
   // Unselect all molecules which belong to newly unselected rows.
-  items = deselected.indexes();
-  foreach (index, items)
-    if (index.column() == 0){
-      int mol_id = model()->data(index, Qt::UserRole).toInt();
-      if (mol_id < 0)
-        continue;
-      //std::cout << "unselect molecule" << std::endl;
-      MoleCuilder::SelectionNotMoleculeById(mol_id);
-    }
+  {
+    QModelIndexList items = deselected.indexes();
+    molids_t ids;
+    ids.reserve(items.size());
+    foreach (index, items)
+      if (index.column() == 0){
+        int mol_id = model()->data(index, Qt::UserRole).toInt();
+        if (mol_id < 0)
+          continue;
+        //std::cout << "unselect molecule" << std::endl;
+        ids.push_back(mol_id);
+      }
+    MoleCuilder::SelectionNotMoleculeById(ids);
+  }
 
   selecting = false;