Changeset 0a558d for src/UIElements

Timestamp:

Apr 20, 2016, 8:52:03 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:

f91ef6

Parents:

3054f4a

git-author:

Frederik Heber <heber@…> (03/29/16 14:56:56)

git-committer:

Frederik Heber <heber@…> (04/20/16 08:52:03)

Message:

MoleculeList discerns between internal and external name change.

File:

• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (1 diff)

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

@@ -443 +443 @@
     const moleculeId_t molid = board->getMoleculeIdToIndex(index);
     // change the name
-    std::string cellValue = item->text().toStdString();
-    if (!cellValue.empty()) {
-      // create actions such that we may undo
-      static MoleCuilder::ActionSequence sequence;
-      MoleCuilder::MakroAction *makroaction =
-          constructMakroRenameAction(sequence, cellValue, molid);
-      MoleCuilder::ActionQueue &AQ = MoleCuilder::ActionQueue::getInstance();
-      AQ.registerAction(makroaction);
-      AQ.queueAction("change-single-molecule-name", MoleCuilder::Action::NonInteractive);
-    } else {
-      const QtObservedMolecule::ptr mol = board->getObservedMolecule(index);
-      if (mol) {
-        QtMoleculeItem * const molitem = assert_cast<QtMoleculeItem *>(item);
-        molitem->updateState(mol);
+    const std::string cellValue = item->text().toStdString();
+    const QtObservedMolecule::ptr mol = board->getObservedMolecule(index);
+    if (cellValue != mol->getMolName()) {
+      // if unequal change came from outside, if equal then we caused the itemchanged signal
+      if (!cellValue.empty()) {
+        // create actions such that we may undo
+        static MoleCuilder::ActionSequence sequence;
+        MoleCuilder::MakroAction *makroaction =
+            constructMakroRenameAction(sequence, cellValue, molid);
+        MoleCuilder::ActionQueue &AQ = MoleCuilder::ActionQueue::getInstance();
+        AQ.registerAction(makroaction);
+        AQ.queueAction("change-single-molecule-name", MoleCuilder::Action::NonInteractive);
+      } else {
+        if (mol) {
+          QtMoleculeItem * const molitem = assert_cast<QtMoleculeItem *>(item);
+          molitem->updateState(mol);
+        }
       }
     }