Changeset 546f7d

Timestamp:

Sep 9, 2016, 10:09:47 AM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, 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_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

9bdbc7

Parents:

d88397

git-author:

Frederik Heber <heber@…> (09/04/16 15:39:00)

git-committer:

Frederik Heber <heber@…> (09/09/16 10:09:47)

Message:

FIX: Selections in QtFragmentList works even under resorting.

File:

• src/UIElements/Views/Qt4/QtFragmentList.cpp (modified) (3 diffs)

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -37 +37 @@
 
 #include <QAbstractItemView>
+
+#include <iterator>
+#include <iostream>
+
+#include <boost/lexical_cast.hpp>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -209 +214 @@
     QTreeWidgetItem *item = topLevelItem(i);
     bool newSelection = item->isSelected();
-    if (newSelection != FragmentSelection[i]){
+    const int itemno = boost::lexical_cast<int>(item->text(NUMBER).toStdString());
+    if (newSelection != FragmentSelection[itemno]){
+//      LOG(1, "INFO: selection changed for item #" << itemno);
       // get the keyset and select the specific atoms
-      if (!newSelection)
-        for (IndexSet::const_iterator iter = indexsets[i].begin();
-            iter != indexsets[i].end();
+      if (!newSelection) {
+//        LOG(2, "INFO: Seeing unselection for item #" << itemno);
+        for (IndexSet::const_iterator iter = indexsets[itemno].begin();
+            iter != indexsets[itemno].end();
             ++iter)
           World::getInstance().unselectAtom(*iter);
+      }
     }
   }
@@ -222 +231 @@
     QTreeWidgetItem *item = topLevelItem(i);
     bool newSelection = item->isSelected();
-    if (newSelection != FragmentSelection[i]){
-      FragmentSelection[i] = newSelection;
+    const int itemno = boost::lexical_cast<int>(item->text(NUMBER).toStdString());
+    if (newSelection != FragmentSelection[itemno]){
+      FragmentSelection[itemno] = newSelection;
       // get the keyset and select the specific atoms
-      if (newSelection)
-        for (IndexSet::const_iterator iter = indexsets[i].begin();
-            iter != indexsets[i].end();
+      if (newSelection) {
+//        LOG(2, "INFO: Seeing selection for item #" << itemno);
+        for (IndexSet::const_iterator iter = indexsets[itemno].begin();
+            iter != indexsets[itemno].end();
             ++iter)
           World::getInstance().selectAtom(*iter);
+      }
     }
   }