Changeset 097da7 for src/UIElements
- Timestamp:
- Apr 25, 2016, 7:06:12 AM (9 years ago)
- 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:
- abb115
- Parents:
- 006f6a
- git-author:
- Frederik Heber <heber@…> (04/24/16 14:15:37)
- git-committer:
- Frederik Heber <heber@…> (04/25/16 07:06:12)
- Location:
- src/UIElements/Views/Qt4/MoleculeList
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp
r006f6a r097da7 71 71 QStandardItemModel(_parent), 72 72 board(_board), 73 observer(_board) 73 observer(_board), 74 nameIsChanged(false) 74 75 { 75 76 setColumnCount(QtMoleculeItemFactory::COLUMNCOUNT); … … 436 437 void QtMoleculeList::moleculeNameChanged(QStandardItem* item) 437 438 { 439 // check whether name change came from outside 440 if (nameIsChanged) 441 return; 442 438 443 // obtain molecule id 439 444 if ( item->index().column() == QtMoleculeItem::NAME) { … … 448 453 const QtObservedMolecule::ptr mol = board->getObservedMolecule(index); 449 454 if (cellValue != mol->getMolName()) { 450 // if unequal change came from outside, if equal then we caused the itemchanged signal451 455 if (!cellValue.empty()) { 452 456 // create actions such that we may undo … … 459 463 } else { 460 464 if (mol) { 465 LOG(2, "WARNING: Not setting changing molecule " << mol->getMolName() 466 << " to empty."); 461 467 QtMoleculeItem * const molitem = assert_cast<QtMoleculeItem *>(item); 462 468 molitem->updateState(mol); … … 584 590 void QtMoleculeList::nameChanged(const QtObservedMolecule::ptr _mol) 585 591 { 592 nameIsChanged = true; 586 593 // we need the id as identifier to the items 587 594 const ObservedValue_Index_t molid = _mol->getIndex(); … … 593 600 "QtMoleculeList::nameChanged() - could not item for NAME."); 594 601 nameitem->updateState(_mol); 595 } 602 nameIsChanged = false; 603 } -
src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp
r006f6a r097da7 117 117 //!> listens to all QtObservedMolecule and relays important events to us 118 118 QtObservedMoleculeObserver observer; 119 120 //!> flag to indicate name change cam from outside 121 bool nameIsChanged; 119 122 }; 120 123
Note:
See TracChangeset
for help on using the changeset viewer.