Changeset d2dbb5d for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.cpp

Timestamp:

Jan 28, 2015, 7:07:03 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:

2696b1

Parents:

53c1ff

git-author:

Frederik Heber <heber@…> (01/18/15 20:01:55)

git-committer:

Frederik Heber <heber@…> (01/28/15 19:07:03)

Message:

Moved rowsSelected() over to QtMoleculeListView.

File:

• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.cpp (modified) (5 diffs)

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.cpp

@@ -36 +36 @@
 
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp"
+#include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -41 +42 @@
 #include "CodePatterns/Observer/Notification.hpp"
 
+#include "Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp"
+#include "Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp"
+
 #include "World.hpp"
 
 QtMoleculeListView::QtMoleculeListView(QWidget * _parent) :
-QTreeView(_parent),
-  Observer("QtMoleculeListView")
+  QTreeView(_parent),
+  Observer("QtMoleculeListView"),
+  selecting(false)
 {
   setSelectionMode(QAbstractItemView::MultiSelection);
@@ -60 +65 @@
 {
   QTreeView::setModel(_moleculelist);
+  // clicking a molecule means calling SelectionAction
   connect(
       selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
-      _moleculelist, SLOT(rowsSelected(const QItemSelection &, const QItemSelection &)));
+      this, SLOT(rowsSelected(const QItemSelection &, const QItemSelection &)));
 }
 
 void QtMoleculeListView::update(Observable *publisher)
 {}
+
+QModelIndex QtMoleculeListView::setIndexToLastColumn(const QModelIndex &_index) const
+{
+  QModelIndex return_index;
+  QModelIndex parent_index = _index.parent();
+  ASSERT (parent_index.isValid(),
+      "QtMoleculeListView::setIndexToLastColumn() - _index has no valid parent.");
+    return_index = parent_index.child(_index.row(), QtMoleculeItemFactory::OCCURRENCE);
+//    return_index =
+//        model()->invisibleRootItem()->child(
+//            _index.row(),
+//            QtMoleculeItemFactory::OCCURRENCE)->index();
+  return return_index;
+}
+
+void QtMoleculeListView::rowsSelected(
+    const QItemSelection& selected, const QItemSelection& deselected)
+{
+  if (selecting)
+    return;
+
+  selecting = true;
+
+  // Select all molecules which belong to newly selected rows.
+  QtMoleculeList *moleculelist = dynamic_cast<QtMoleculeList *>(model());
+  QModelIndex index;
+  {
+    QModelIndexList items = selected.indexes();
+    molids_t ids;
+    ids.reserve(items.size());
+    foreach (index, items)
+      if ((index.column() == 0) && (selectionModel()->isSelected(index))) {
+        const molecule *mol = moleculelist->IndexToMolecule(index);
+        if (mol == NULL) // means we are looking at deselection because of removal
+          continue;
+        int mol_id = mol->getId();
+        // check for invalid molecule
+        if (mol_id < 0)
+          continue;
+        // means we are looking at deselection because of removal (in World)
+        if (World::getInstance().getMolecule(MoleculeById(mol_id)) != mol)
+          continue;
+        if (!World::getInstance().isSelected(mol))
+            ids.push_back(mol_id);
+        //std::cout << "select molecule" << std::endl;
+      }
+    if (!ids.empty())
+      MoleCuilder::SelectionMoleculeById(ids);
+  }
+
+  // Unselect all molecules which belong to newly unselected rows.
+  {
+    QModelIndexList items = deselected.indexes();
+    molids_t ids;
+    ids.reserve(items.size());
+    foreach (index, items)
+    if ((index.column() == 0) && (!selectionModel()->isSelected(index))) {
+        const molecule *mol = moleculelist->IndexToMolecule(index);
+        if (mol == NULL) // means we are looking at deselection because of removal
+          continue;
+        int mol_id = mol->getId();
+        // check for invalid molecule
+        if (mol_id < 0)
+          continue;
+        // means we are looking at deselection because of removal (in World)
+        if (World::getInstance().getMolecule(MoleculeById(mol_id)) != mol)
+          continue;
+        if (World::getInstance().isSelected(mol))
+            ids.push_back(mol_id);
+        //std::cout << "unselect molecule" << std::endl;
+      }
+    if (!ids.empty())
+      MoleCuilder::SelectionNotMoleculeById(ids);
+  }
+
+  selecting = false;
+}
 
 void QtMoleculeListView::recieveNotification(Observable *publisher, Notification_ptr notification)
@@ -83 +166 @@
         std::set<QModelIndex> already_selected_indices;
         for (std::vector<molecule *>::const_iterator iter = selectedMolecules.begin();
-            iter != selectedMolecules.begin(); ++iter) {
+            iter != selectedMolecules.end(); ++iter) {
           QModelIndex mol_index = moleculelist->MoleculeToItem(*iter)->index();
           if (!currently_selected.contains(mol_index))
-              selected.select(mol_index, mol_index);
+              selected.select(mol_index, setIndexToLastColumn(mol_index));
           else
             already_selected_indices.insert(mol_index);
@@ -96 +179 @@
                 already_selected_indices.find(mol_index);
             if (iter == already_selected_indices.end())
-              deselected.select(mol_index, mol_index);
+              deselected.select(mol_index, setIndexToLastColumn(mol_index));
           }
         }
-        selectionChanged(selected, deselected);
+        selecting = true;
+        if (!selected.indexes().empty())
+          selectionModel()->select(selected, QItemSelectionModel::Select);
+        if (!deselected.indexes().empty())
+          selectionModel()->select(deselected, QItemSelectionModel::Deselect);
+        selecting = false;
         break;
       }