Changeset b2eeaf for src

Timestamp:

Apr 25, 2016, 7:02:56 AM (9 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:

375bc3f

Parents:

a13f2b

git-author:

Frederik Heber <heber@…> (04/12/16 19:21:00)

git-committer:

Frederik Heber <heber@…> (04/25/16 07:02:56)

Message:

FIX: MoleculeList crashed when selected molecule changed its place.

Location:

src/UIElements/Views/Qt4/MoleculeList

Files:

• QtMoleculeList.cpp (modified) (2 diffs)
• QtMoleculeList.hpp (modified) (1 diff)
• QtMoleculeListView.cpp (modified) (2 diffs)
• QtMoleculeListView.hpp (modified) (1 diff)

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

@@ -501 +501 @@
 {
   QStandardItem *groupitem = NULL;
+  // prohibit starting of selection actions
+  emit MayNotStartSelections();
   // use takeRows of molecule ..
   const QList<QStandardItem *> mol_row = _molitem->parent()->takeRow(_molitem->index().row());
@@ -514 +516 @@
   // finally add again
   groupitem->appendRow(mol_row);
+  emit MayStartSelections();
 }
 

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

@@ -57 +57 @@
 signals:
   void moleculesVisibilityChanged(ObservedValue_Index_t, bool);
+  void MayStartSelections();
+  void MayNotStartSelections();
 
 private slots:

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

@@ -67 +67 @@
       selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
       this, SLOT(rowsSelected(const QItemSelection &, const QItemSelection &)), Qt::DirectConnection);
+  connect(_moleculelist, SIGNAL(MayStartSelections()),
+      this, SLOT(activateSelections()), Qt::DirectConnection);
+  connect(_moleculelist, SIGNAL(MayNotStartSelections()),
+      this, SLOT(deactivateSelections()), Qt::DirectConnection);
 
   connect(&_moleculelist->observer, SIGNAL(SelectionChanged(QtObservedMolecule::ptr)),
@@ -149 +153 @@
 }
 
+void QtMoleculeListView::activateSelections()
+{
+  selecting = false;
+}
+
+void QtMoleculeListView::deactivateSelections()
+{
+  selecting = true;
+}
+
 void QtMoleculeListView::selectionChanged(const QtObservedMolecule::ptr _molecule)
 {

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

@@ -37 +37 @@
   void rowsSelected(const QItemSelection&, const QItemSelection&);
   void selectionChanged(const QtObservedMolecule::ptr _molecule);
+  void activateSelections();
+  void deactivateSelections();
 
 private: