Changeset 95f49f for src/UIElements/Views

Timestamp:

Aug 5, 2015, 5:32:08 PM (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:

fcdf05

Parents:

88846b

git-author:

Frederik Heber <heber@…> (07/07/15 01:10:10)

git-committer:

Frederik Heber <heber@…> (08/05/15 17:32:08)

Message:

QtMoleculeList::informDirtyState() does not need to lock refill_mutex anymore.

• we simply write the QtMoleculeItem to the ToBeMoved list and convert it to the very first item in the row in updateItemStates().

File:

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

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

@@ -490 +490 @@
     const QtMoleculeItem::MoveTypes _type)
 {
-  refill_mutex.lock();
-
   listAccessing_mutex.lock();
   dirtyItems.insert(_item);
   listAccessing_mutex.unlock();
+
   if (_type == QtMoleculeItem::NeedsMove) {
     // we have to convert whatever item raised the dirty signal to the first
     // item in the row as otherwise multiple items in the row are selected
     // as to be moved, i.e. the same row is moved multiple times
-    QStandardItem *group_item = _item->parent();
-    QtMoleculeItem *mol_item =
-        dynamic_cast<QtMoleculeItem *>(group_item->child(_item->row(), 0));
     listAccessing_mutex.lock();
-    toBeMovedItems.insert(mol_item);
+    toBeMovedItems.insert(_item);
     listAccessing_mutex.unlock();
 //    // add group item, too
@@ -509 +505 @@
   }
 
-  refill_mutex.unlock();
 }
 
 void QtMoleculeList::updateItemStates()
 {
-  // wait till initial refill has been executed
-  refill_mutex.lock();
-
   /// copy lists such that new signals for dirty/.. may come in right away
   // TODO: if we had move semantics ...
@@ -566 +558 @@
   addedremoved.clear();
 
+  // wait till initial refill has been executed
+  refill_mutex.lock();
+
+  // convert ToBeMoved items from any position to first position item
+  {
+    list_of_items_t toBeMovedItems_copy_fronts;
+    for (list_of_items_t::const_iterator moveiter = toBeMovedItems_copy.begin();
+        moveiter != toBeMovedItems_copy.end(); ++moveiter) {
+      QStandardItem *group_item = (*moveiter)->parent();
+      QtMoleculeItem *mol_item =
+          dynamic_cast<QtMoleculeItem *>(group_item->child((*moveiter)->row(), 0));
+      toBeMovedItems_copy_fronts.insert( mol_item );
+    }
+    toBeMovedItems_copy = toBeMovedItems_copy_fronts;
+  }
+
   for (std::vector<const molecule *>::iterator removeiter = toBeRemovedItems_copy.begin();
       removeiter != toBeRemovedItems_copy.end(); ++removeiter) {