Ignore:
Timestamp:
Mar 24, 2016, 2:58:04 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:
5771e6
Parents:
7993fe
git-author:
Frederik Heber <heber@…> (03/18/16 09:46:52)
git-committer:
Frederik Heber <heber@…> (03/24/16 14:58:04)
Message:

Removed QtMoleculeList::informDirtyState(), callback is not needed anymore.

  • this was the target of emitDirtyState() from QtMoleculeItem.
  • the event system will now run independently between the items and their list.
Location:
src/UIElements/Views/Qt4/MoleculeList
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.cpp

    r7993fe r24eb6b  
    4040
    4141QtMoleculeItem::QtMoleculeItem(
    42     QtObservedMolecule::ptr &_ObservedMolecule,
    43      const enum MoveTypes _movetype) :
     42    QtObservedMolecule::ptr &_ObservedMolecule) :
    4443  ObservedMolecule(_ObservedMolecule),
    45   movetype(_movetype),
    4644  dirty(true)
    4745{

  • src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp

    r7993fe r24eb6b  
    3838{
    3939public:
    40   //!> enum states whether an item's formula changed or not
    41   enum MoveTypes {
    42     NeedsMove,
    43     DoesNotMove
    44   };
    45 
    4640  //!> enumerates all different item types, coinciding with column in QtMoleculeList
    4741  enum COLUMNTYPES {NAME,VISIBILITY,ATOMCOUNT,FORMULA,OCCURRENCE,COLUMNTYPES_MAX};
    4842
    4943  QtMoleculeItem(
    50       QtObservedMolecule::ptr &_ObservedMolecule,
    51       const enum MoveTypes _movetype);
     44      QtObservedMolecule::ptr &_ObservedMolecule);
    5245  virtual ~QtMoleculeItem();
    5346
    … …  
    8780
    8881private:
    89   //!> move type for this specific item, set this when implementing
    90   const enum MoveTypes movetype;
    91 
    9282  //!> states that this item needs to be updated
    9383  bool dirty;

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

    r7993fe r24eb6b  
    641641
    642642  return molecule_formula;
    643 }
    644 
    645 void QtMoleculeList::informDirtyState(
    646     const moleculeId_t _id,
    647     const QtMoleculeItem::COLUMNTYPES _type,
    648     const QtMoleculeItem::MoveTypes _movetype)
    649 {
    650   listAccessing_mutex.lock();
    651   dirtyMolItems.insert( std::make_pair(_id, _type) );
    652   listAccessing_mutex.unlock();
    653 
    654   if (_movetype == QtMoleculeItem::NeedsMove) {
    655     // we have to convert whatever item raised the dirty signal to the first
    656     // item in the row as otherwise multiple items in the row are selected
    657     // as to be moved, i.e. the same row is moved multiple times
    658     listAccessing_mutex.lock();
    659     toBeMovedItems.insert(_id);
    660     listAccessing_mutex.unlock();
    661   }
    662643}
    663644

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

    r7993fe r24eb6b  
    111111  void setVisibilityForGroupItem(QStandardItem* _item);
    112112
    113   void informDirtyState(
    114       const moleculeId_t _id,
    115       const QtMoleculeItem::COLUMNTYPES _type,
    116       const QtMoleculeItem::MoveTypes _movetype);
    117 
    118113  void updateItemStates();
    119114

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_atomcount.hpp

    r7993fe r24eb6b  
    2828  QtMoleculeItem_atomcount(
    2929      QtObservedMolecule::ptr &_ObservedMolecule) :
    30         QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::NeedsMove)
     30        QtMoleculeItem(_ObservedMolecule)
    3131  {
    3232    // cannot call pure virtual function in QtMoleculeItem's cstor

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_formula.hpp

    r7993fe r24eb6b  
    3030  QtMoleculeItem_formula(
    3131      QtObservedMolecule::ptr &_ObservedMolecule) :
    32         QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::NeedsMove)
     32        QtMoleculeItem(_ObservedMolecule)
    3333  {
    3434    // cannot call pure virtual function in QtMoleculeItem's cstor

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_name.hpp

    r7993fe r24eb6b  
    2828  QtMoleculeItem_name(
    2929      QtObservedMolecule::ptr &_ObservedMolecule) :
    30         QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::DoesNotMove)
     30        QtMoleculeItem(_ObservedMolecule)
    3131  {
    3232    // cannot call pure virtual function in QtMoleculeItem's cstor

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_occurrence.hpp

    r7993fe r24eb6b  
    2828  QtMoleculeItem_occurrence(
    2929      QtObservedMolecule::ptr &_ObservedMolecule) :
    30         QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::DoesNotMove)
     30        QtMoleculeItem(_ObservedMolecule)
    3131  {
    3232    // cannot call pure virtual function in QtMoleculeItem's cstor

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_visibility.hpp

    r7993fe r24eb6b  
    2828  QtMoleculeItem_visibility(
    2929      QtObservedMolecule::ptr &_ObservedMolecule) :
    30         QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::DoesNotMove)
     30        QtMoleculeItem(_ObservedMolecule)
    3131  {
    3232    setFlags(flags() | Qt::ItemIsUserCheckable);
Note: See TracChangeset for help on using the changeset viewer.