Changeset cc2976 for src/UIElements


Ignore:
Timestamp:
Aug 5, 2015, 5:32:10 PM (10 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:
e5a477
Parents:
b9680b
git-author:
Frederik Heber <heber@…> (07/19/15 06:30:51)
git-committer:
Frederik Heber <heber@…> (08/05/15 17:32:10)
Message:

QtMoleculeItem_.. now shout when they receive subjectKilled().

  • this way we do not have this double system of both QtMoleculeList (in a lazy fashion) and each QtMoleculeList listens for moleculeRemoved (one through the Observer channel, the other through subjectKilled()).
  • we simply count the number of QtMoleculeItems that received subjectKilled() and if max is reached, the row is removed.
  • to prevent molecule id clash, insertion (of same id) after removal is ok. This works cause we first remove and then insert new item. Hence, having the same id is possible.
Location:
src/UIElements/Views/Qt4
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    rb9680b rcc2976  
    4848#include <algorithm>
    4949
     50#include <boost/thread/locks.hpp>
     51
    5052#include "Descriptors/MoleculeIdDescriptor.hpp"
    5153#include "molecule.hpp"
    … …  
    5658     const channellist_t &_channellist,
    5759     const enum MoveTypes _movetype,
    58      const emitDirtyState_t _emitDirtyState) :
     60     const emitDirtyState_t _emitDirtyState,
     61     const emitSubjectKilledState_t _emitSubjectKilledState) :
    5962  Observer("QtMoleculeItem"),
    6063  molid(_molid),
    … …  
    6366  owner(NULL),
    6467  dirty(true),
    65   emitDirtyState(_emitDirtyState)
     68  emitDirtyState(_emitDirtyState),
     69  emitSubjectKilledState(_emitSubjectKilledState)
    6670{
    6771  // BUG: We cannot sign on here as then and again we catch "pure virtual function called"
    … …  
    7478void QtMoleculeItem::signOnToMolecule()
    7579{
     80  // count the number of threads entering the function
     81  std::cout << "QtMoleculeItem::signOnToMolecule() called for " << this << std::endl;
    7682  const molecule * const mol = const_cast<const World &>(World::getInstance()).
    7783      getMolecule(MoleculeById(molid));
    7884  if (mol != NULL) {
    79     owner = static_cast<const Observable *>(mol);
    80     for (channellist_t::const_iterator channeliter = channellist.begin();
    81         channeliter != channellist.end(); ++channeliter)
    82       owner->signOn(this, *channeliter);
     85    owner_mutex.lock();
     86    if (owner == NULL) {
     87      owner_mutex.unlock();
     88      const Observable *owner_copy = static_cast<const Observable *>(mol);
     89      for (channellist_t::const_iterator channeliter = channellist.begin();
     90          channeliter != channellist.end(); ++channeliter)
     91        owner_copy->signOn(this, *channeliter);
     92      owner_mutex.lock();
     93      owner = owner_copy;
     94      owner_mutex.unlock();
     95      std::cout << "QtMoleculeItem " << this << " has signed on to " << owner << std::endl;
     96    } else
     97      owner_mutex.unlock();
    8398  }
    8499}
    … …  
    86101void QtMoleculeItem::signOffFromMolecule()
    87102{
    88   if (owner != NULL) {
     103  // prevent via owner that another thread enters the function again
     104  // (re-entrancy)
     105  const Observable *owner_copy = NULL;
     106  {
     107    boost::recursive_mutex::scoped_lock lock(owner_mutex);
     108    if (owner != NULL) {
     109      owner_copy = owner;
     110      owner = NULL;
     111    }
     112  }
     113  std::cout << "QtMoleculeItem::signOffFromMolecule() called for " << this << std::endl;
     114  if (owner_copy != NULL) {
    89115    for (channellist_t::const_iterator channeliter = channellist.begin();
    90116        channeliter != channellist.end(); ++channeliter)
    91       owner->signOff(this, *channeliter);
    92     owner = NULL;
     117      owner_copy->signOff(this, *channeliter);
     118    std::cout << "QtMoleculeItem " << this << " has signed off from " << owner_copy << std::endl;
    93119  }
    94120}
    … …  
    140166  signOffFromMolecule();
    141167  dirty = false;
     168  emitSubjectKilledState(getMoleculeId());
    142169}
    143170

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

    rb9680b rcc2976  
    2020
    2121#include <boost/function.hpp>
     22#include <boost/thread/recursive_mutex.hpp>
    2223#include <list>
    2324#include <string>
    … …  
    5758      const enum MoveTypes)> emitDirtyState_t;
    5859
     60  //!> typedef for callback function to model to inform when our subjectKilled() was called
     61  typedef const boost::function<void (const moleculeId_t _id)> emitSubjectKilledState_t;
     62
    5963  QtMoleculeItem(
    6064      const moleculeId_t _molid,
    6165      const channellist_t &_channellist,
    6266      const enum MoveTypes _movetype,
    63       const emitDirtyState_t _emitDirtyState);
     67      const emitDirtyState_t _emitDirtyState,
     68      const emitSubjectKilledState_t _emitSubjectKilledState);
    6469  virtual ~QtMoleculeItem();
    6570
    … …  
    121126  //!> bound callback function to inform model about change
    122127  const emitDirtyState_t emitDirtyState;
     128
     129  //!> bound callback function to inform model about change
     130  const emitSubjectKilledState_t emitSubjectKilledState;
     131
     132  //!> this protects the signing on and off
     133  mutable boost::recursive_mutex owner_mutex;
    123134};
    124135

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

    rb9680b rcc2976  
    9191QtMoleculeItemFactory::createMoleculeItems(
    9292    const moleculeId_t _molid,
    93     const QtMoleculeItem::emitDirtyState_t &_emitDirtyState)
     93    const QtMoleculeItem::emitDirtyState_t &_emitDirtyState,
     94    const QtMoleculeItem::emitSubjectKilledState_t &_emitSubjectKilledState)
    9495{
    9596  QList<QStandardItem *> molItems;
    96   molItems << new QtMoleculeItem_name(_molid, _emitDirtyState);
    97   molItems << new QtMoleculeItem_visibility(_molid, _emitDirtyState);
    98   molItems << new QtMoleculeItem_atomcount(_molid, _emitDirtyState);
    99   molItems << new QtMoleculeItem_formula(_molid, _emitDirtyState);
    100   molItems << new QtMoleculeItem_occurrence(_molid, _emitDirtyState);
     97  molItems << new QtMoleculeItem_name(_molid, _emitDirtyState, _emitSubjectKilledState);
     98  molItems << new QtMoleculeItem_visibility(_molid, _emitDirtyState, _emitSubjectKilledState);
     99  molItems << new QtMoleculeItem_atomcount(_molid, _emitDirtyState, _emitSubjectKilledState);
     100  molItems << new QtMoleculeItem_formula(_molid, _emitDirtyState, _emitSubjectKilledState);
     101  molItems << new QtMoleculeItem_occurrence(_molid, _emitDirtyState, _emitSubjectKilledState);
    101102  return molItems;
    102103}

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

    rb9680b rcc2976  
    4747   * \param _molid id of molecule
    4848   * \param _emitDirtyState callback function to model to inform about required state update
     49   * \param _emitSubjectKilledState callback function to model to inform about called subjectKilled()
    4950   * \return list of prepared items to be appended to a group item
    5051   */
    5152  QList<QStandardItem *> createMoleculeItems(
    5253      const moleculeId_t _molid,
    53       const QtMoleculeItem::emitDirtyState_t &_emitDirtyState);
     54      const QtMoleculeItem::emitDirtyState_t &_emitDirtyState,
     55      const QtMoleculeItem::emitSubjectKilledState_t &_emitSubjectKilledState);
    5456
    5557  /** Creates all QtMoleculeItem's that make up a row of a group item.

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

    rb9680b rcc2976  
    6464  ChangingChildrensVisibility(false),
    6565  update_timer(NULL),
    66   callback_DirtyItems(boost::bind(&QtMoleculeList::informDirtyState, this, _1, _2, _3))
     66  callback_DirtyItems(boost::bind(&QtMoleculeList::informDirtyState, this, _1, _2, _3)),
     67  callback_subjectKilledItems(boost::bind(&QtMoleculeList::receiveSubjectKilled, this, _1))
    6768{
    6869  setColumnCount(QtMoleculeItemFactory::COLUMNCOUNT);
    6970
    7071  World::getInstance().signOn(this, World::MoleculeInserted);
    71   World::getInstance().signOn(this, World::MoleculeRemoved);
    7272
    7373  refill();
    … …  
    8282{
    8383  World::getInstance().signOff(this, World::MoleculeInserted);
    84   World::getInstance().signOff(this, World::MoleculeRemoved);
    8584}
    8685
    … …  
    188187  else
    189188    return ItemToMoleculeId(item);
     189}
     190
     191void QtMoleculeList::receiveSubjectKilled(const moleculeId_t _id)
     192{
     193  boost::recursive_mutex::scoped_lock lock(map_mutex);
     194  KilledItemsPerMolecule_t::iterator iter = KilledItemsPerMolecule.find(_id);
     195  if (iter == KilledItemsPerMolecule.end())
     196    KilledItemsPerMolecule.insert( std::make_pair(_id, 1));
     197  else
     198    ++(iter->second);
     199  if (iter->second == QtMoleculeItem::COLUMNTYPES_MAX) {
     200    boost::recursive_mutex::scoped_lock lock(listAccessing_mutex);
     201    removedMolecules.push_back( _id );
     202  }
    190203}
    191204
    … …  
    202215        break;
    203216      }
    204       case World::MoleculeRemoved:
    205       {
    206         boost::recursive_mutex::scoped_lock lock(listAccessing_mutex);
    207         const moleculeId_t molid = const_cast<const World &>(World::getInstance()).lastChangedMolId();
    208         if (molid != (unsigned int )-1)
    209           removedMolecules.push_back( molid ); // remove in any case, as we also got insert
    210         break;
    211       }
    212217      default:
    213218        ASSERT(0, "QtMoleculeList::recieveNotification() - cannot get here, not subscribed to channel "
    … …  
    238243{
    239244  QList<QStandardItem *> molItems =
    240       QtMoleculeItemFactory::getInstance().createMoleculeItems(_molid, callback_DirtyItems);
     245      QtMoleculeItemFactory::getInstance().createMoleculeItems(
     246          _molid,
     247          callback_DirtyItems,
     248          callback_subjectKilledItems);
    241249  QtMoleculeItem *mol_item = dynamic_cast<QtMoleculeItem *>(molItems.front());
    242250  ASSERT( mol_item != NULL,
    … …  
    336344      MoleculeFormulaMap.clear();
    337345      MoleculeItemBiMap.clear();
     346      KilledItemsPerMolecule.clear();
    338347    }
    339348    dirtyMolItems.clear();
    … …  
    599608  listAccessing_mutex.unlock();
    600609
    601   /// first check consistency among the sets:
    602   /// -# if we remove an item, we don't have to update it before anymore
    603   /// -# if we remove an item, we don't have to move it before anymore
    604   /// -# if we remove an item, we don't have to change its visibility
    605   /// -# don't add molecule that are also removed
    606 
    607   // remove molecules added and removed immediately in both lists
    608   // note that newMolecules are all those where a moleculeInserted callback
    609   // has been received but not action has been taken (i.e. it is not contained
    610   // in any other list so far), toBeRemoved is inserted on moleculeRemoved
    611   // and other lists (toBeSetOccurrenceItems) are only filled if the molecule
    612   // item has already been instantiated.
    613   {
    614     std::vector<moleculeId_t> addedremoved;
    615     std::sort(newMolecules_copy.begin(), newMolecules_copy.end());
    616     std::sort(removedMolecules_copy.begin(), removedMolecules_copy.end());
    617     std::set_intersection(
    618         newMolecules_copy.begin(), newMolecules_copy.end(),
    619         removedMolecules_copy.begin(), removedMolecules_copy.end(),
    620         std::back_inserter(addedremoved));
    621     {
    622       std::vector<moleculeId_t>::iterator removeiter = std::set_difference(
    623           newMolecules_copy.begin(), newMolecules_copy.end(),
    624           addedremoved.begin(), addedremoved.end(),
    625           newMolecules_copy.begin());
    626       newMolecules_copy.erase(removeiter, newMolecules_copy.end());
    627     }
    628     {
    629       std::vector<moleculeId_t>::iterator removeiter = std::set_difference(
    630           removedMolecules_copy.begin(), removedMolecules_copy.end(),
    631           addedremoved.begin(), addedremoved.end(),
    632           removedMolecules_copy.begin());
    633       removedMolecules_copy.erase(removeiter, removedMolecules_copy.end());
    634     }
    635   }
    636 
    637610  // wait till initial refill has been executed
    638611  boost::recursive_mutex::scoped_lock lock(refill_mutex);
    … …  
    694667    LOG(1, "Moving item " << molitem);
    695668    const molecule *mol = molitem->getMolecule();
    696     if (mol == NULL) {
    697       // removeMolecule will remove also from formula<->molecule bimap
    698       removeMoleculeItem(molitem);
    699     } else {
     669    if (mol != NULL) {
    700670      // remove from formula<->molecule bimap with old formula
    701671      LOG(1, "Removing " << formulaiter->second << " for " << formulaiter->first << " from MoleculeFormulaMap.");
    … …  
    709679    }
    710680  }
    711 
    712   // throw out items that we added by an update() while we are in this function
    713   listAccessing_mutex.lock();
    714   for (std::vector<moleculeId_t>::const_iterator removeiter = removedMolecules_copy.begin();
    715       removeiter != removedMolecules_copy.end(); ++removeiter) {
    716     for (unsigned int i=0;i< QtMoleculeItem::COLUMNTYPES_MAX; ++i)
    717         dirtyMolItems.erase( std::make_pair(*removeiter,(QtMoleculeItem::COLUMNTYPES)i) );
    718     toBeMovedItems.erase(*removeiter);
    719     visibilityMolItems.erase(*removeiter);
    720   }
    721   listAccessing_mutex.unlock();
    722   // after that it is not a problem as items have been removed (hence signOff() was called)
    723681
    724682  /// 3. remove all items whose molecules have been removed
    … …  
    734692      toBeSetOccurrence.insert( formula );
    735693      removeMoleculeItem(item);
    736     }
    737   }
     694      KilledItemsPerMolecule.erase( *removeiter );
     695    }
     696  }
     697
     698  // throw out items that we added by an update() while we are in this function
     699  listAccessing_mutex.lock();
     700  for (std::vector<moleculeId_t>::const_iterator removeiter = removedMolecules_copy.begin();
     701      removeiter != removedMolecules_copy.end(); ++removeiter) {
     702    for (unsigned int i=0;i< QtMoleculeItem::COLUMNTYPES_MAX; ++i)
     703        dirtyMolItems.erase( std::make_pair(*removeiter,(QtMoleculeItem::COLUMNTYPES)i) );
     704    toBeMovedItems.erase(*removeiter);
     705    visibilityMolItems.erase(*removeiter);
     706  }
     707  listAccessing_mutex.unlock();
     708  // after that it is not a problem as items have been removed (hence signOff() was called)
    738709
    739710  /// 4. instantiate all new items

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

    rb9680b rcc2976  
    112112      const QtMoleculeItem::MoveTypes _movetype);
    113113
     114  void receiveSubjectKilled(const moleculeId_t _id);
     115
    114116  void updateItemStates();
    115117
    … …  
    130132  //!> callback function to hand over to items that inform about requiring update
    131133  const QtMoleculeItem::emitDirtyState_t callback_DirtyItems;
     134
     135  //!> callback function to hand over to items that inform about called subjectKilled()
     136  const QtMoleculeItem::emitSubjectKilledState_t callback_subjectKilledItems;
     137
     138  typedef std::map<moleculeId_t, unsigned int> KilledItemsPerMolecule_t;
     139  //!> takes note of how many items have already been killed for a specific row/molecule
     140  KilledItemsPerMolecule_t KilledItemsPerMolecule;
    132141
    133142  typedef std::set< moleculeId_t > list_of_molecules_t;

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

    rb9680b rcc2976  
    3434  QtMoleculeItem_atomcount(
    3535      const moleculeId_t _molid,
    36       emitDirtyState_t _emitDirtyState) :
    37         QtMoleculeItem(_molid, channellist_atomcount, QtMoleculeItem::NeedsMove, _emitDirtyState),
     36      const emitDirtyState_t &_emitDirtyState,
     37      const emitSubjectKilledState_t &_emitSubjectKilledState) :
     38        QtMoleculeItem(_molid, channellist_atomcount, QtMoleculeItem::NeedsMove, _emitDirtyState, _emitSubjectKilledState),
    3839        molref(getMolecule()),
    3940        atomcount(

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

    rb9680b rcc2976  
    3737  QtMoleculeItem_formula(
    3838      const moleculeId_t _molid,
    39       emitDirtyState_t _emitDirtyState) :
    40         QtMoleculeItem(_molid, channellist_formula, QtMoleculeItem::NeedsMove, _emitDirtyState),
     39      const emitDirtyState_t &_emitDirtyState,
     40      const emitSubjectKilledState_t &_emitSubjectKilledState) :
     41        QtMoleculeItem(_molid, channellist_formula, QtMoleculeItem::NeedsMove, _emitDirtyState, _emitSubjectKilledState),
    4142        molref(getMolecule()),
    4243        formula(

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

    rb9680b rcc2976  
    3434  QtMoleculeItem_name(
    3535      const moleculeId_t _molid,
    36       emitDirtyState_t _emitDirtyState) :
    37         QtMoleculeItem(_molid, channellist_name, QtMoleculeItem::DoesNotMove, _emitDirtyState),
     36      const emitDirtyState_t &_emitDirtyState,
     37      const emitSubjectKilledState_t &_emitSubjectKilledState) :
     38        QtMoleculeItem(_molid, channellist_name, QtMoleculeItem::DoesNotMove, _emitDirtyState, _emitSubjectKilledState),
    3839        molref(getMolecule()),
    3940        name(

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

    rb9680b rcc2976  
    2828  QtMoleculeItem_occurrence(
    2929      const moleculeId_t _molid,
    30       emitDirtyState_t _emitDirtyState) :
    31         QtMoleculeItem(_molid, channellist_occurrence, QtMoleculeItem::DoesNotMove, _emitDirtyState)
     30      const emitDirtyState_t &_emitDirtyState,
     31      const emitSubjectKilledState_t &_emitSubjectKilledState) :
     32        QtMoleculeItem(_molid, channellist_occurrence, QtMoleculeItem::DoesNotMove, _emitDirtyState, _emitSubjectKilledState)
    3233  {
    3334    signOnToMolecule();

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

    rb9680b rcc2976  
    2828  QtMoleculeItem_visibility(
    2929      const moleculeId_t _molid,
    30       emitDirtyState_t _emitDirtyState) :
    31         QtMoleculeItem(_molid, channellist_visibility, QtMoleculeItem::DoesNotMove, _emitDirtyState)
     30      const emitDirtyState_t &_emitDirtyState,
     31      const emitSubjectKilledState_t &_emitSubjectKilledState) :
     32        QtMoleculeItem(_molid, channellist_visibility, QtMoleculeItem::DoesNotMove, _emitDirtyState, _emitSubjectKilledState)
    3233  {
    3334    signOnToMolecule();

  • src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.cpp

    rb9680b rcc2976  
    514514{
    515515  const molecule * const _molecule = getMolecule(MolIndex.get());
     516  // when molecule is NULL we will soon get destroyed anyway
     517  if (_molecule == NULL)
     518    return;
    516519  if (publisher == dynamic_cast<const Observable*>(_molecule)){
    517520    // notofication from atom
Note: See TracChangeset for help on using the changeset viewer.