From git at ins.uni-bonn.de Fri Dec 18 08:22:56 2015 From: git at ins.uni-bonn.de (git at ins.uni-bonn.de) Date: Fri, 18 Dec 2015 08:22:56 +0100 (CET) Subject: [Molecuilder-devel] [SCM] branch Fix_QtGui_Testmode_not_showing_atoms updated. v1.5.0-165-ga35ec4c Message-ID: <20151218072257.06DA15FD6F@saturn.ins.uni-bonn.de> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, Fix_QtGui_Testmode_not_showing_atoms has been updated via a35ec4c8e5faf96b7ba725efe7b25ad23853df09 (commit) via cc163a44c3213da4172f9eac182a2c4b77bb5226 (commit) via 6a366d88afe5d51f42e39e081d50d1ec7d62f442 (commit) via 9bdf8f710bd3dee90258ea0c6be46f9f82019da0 (commit) via 66af5c7f14336bb1bf7843eb9d2d058e05db3402 (commit) via 3789e5d955cbaf2a86326e41a3e54348b9cdc57a (commit) via fbe233acd73d4ac19771827a192112c7c0762cbf (commit) via 909b3019f6d522d645d5b5db7768a9c4274e6f19 (commit) via ec10453d494606aa5bc3c427760d44e3c563ef66 (commit) via dd2912c01d2770a1765d392c822480ed5c29ce42 (commit) via 2d2e8b0da3370a1f5f651826d4036bf0ae396df4 (commit) via 8c00fadd6b2922050417f3542335475c30f6e425 (commit) via d19c12eb09c6037d099d3a65e707db0070ad8597 (commit) via d640e59ff241b76b4166fc9f82aa877899d3bec3 (commit) via 6d21ce0aa38039fbc7559e86c69aab704600ebe5 (commit) via e4b7df4922b60b752fca67cf2a0fbb1a45c77482 (commit) from 65a73184853e7894f8c1ba485eb4be5aeadc8673 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a35ec4c8e5faf96b7ba725efe7b25ad23853df09 Author: Frederik Heber Date: Mon Dec 14 10:57:37 2015 +0100 MODIFYME: World's ObservedContainer no longer observe. - TODO: This requires CodePatterns 1.3.1 but we haven't changed the version there, yet. - I had misunderstood what Till had planed with these ObservedContainers for a long time: I though they would cause an OBSERVE signal for every iterator step but this is not the case. Rather they accumulate all OBSERVE signals to have them fire AFTER the loop is done. This is achieved through the depth count of the observer protectors. - Sadly, this runs against what we do with the lastchangedatom. We need the information right away as we the Observer/Observable stuff does not transport any information and always updating all is way too costly. - Hence, in CodePatterns we have implemented an UnobservedIterator which is used in ObservedContainer and does not cause any OBSERVE signals. - The source of the problem was createAtom() in a loop over selectedAtoms and these atoms not getting created (w.r.t QtInstanceBoard) before the molecule's got note of it (cause they are at depth 1). commit cc163a44c3213da4172f9eac182a2c4b77bb5226 Author: Frederik Heber Date: Sun Dec 13 17:06:18 2015 +0100 FIX: QtObservedInstanceBoard needs to allow delayed atomInserted from World. - we may get the notification from molecule before we get the insertion from the World. Hence, we store any ids obtained from molecule insertion if the set of the new atom's observed values have not been generated yet. commit 6a366d88afe5d51f42e39e081d50d1ec7d62f442 Author: Frederik Heber Date: Sun Dec 13 16:19:00 2015 +0100 tempcommit: Merge with b775b7ab commit 9bdf8f710bd3dee90258ea0c6be46f9f82019da0 Author: Frederik Heber Date: Sun Dec 13 16:18:44 2015 +0100 tempcommit: Merge with 8c00fadd commit 66af5c7f14336bb1bf7843eb9d2d058e05db3402 Author: Frederik Heber Date: Sun Dec 13 16:18:06 2015 +0100 tempcommit: Merge with d19c12eb commit 3789e5d955cbaf2a86326e41a3e54348b9cdc57a Author: Frederik Heber Date: Sun Dec 13 16:17:54 2015 +0100 tempcommit: Merge with 08f75432 commit fbe233acd73d4ac19771827a192112c7c0762cbf Author: Frederik Heber Date: Sun Dec 13 16:16:32 2015 +0100 tempcommit: Merge with 6d21ce0 commit 909b3019f6d522d645d5b5db7768a9c4274e6f19 Author: Frederik Heber Date: Sun Dec 13 16:16:25 2015 +0100 tempcommit: Merge with 2f158c56 commit ec10453d494606aa5bc3c427760d44e3c563ef66 Author: Frederik Heber Date: Sun Dec 13 16:14:13 2015 +0100 tempcommit: Merge with 6d21ce0 commit dd2912c01d2770a1765d392c822480ed5c29ce42 Author: Frederik Heber Date: Sun Dec 13 15:22:39 2015 +0100 tempcommit: QtInfoBox disconnects signals. commit 2d2e8b0da3370a1f5f651826d4036bf0ae396df4 Author: Frederik Heber Date: Sun Dec 13 15:22:16 2015 +0100 TEMP: Decreased waiting times in QtGUI's test mode. commit 8c00fadd6b2922050417f3542335475c30f6e425 Author: Frederik Heber Date: Sun Dec 13 15:22:06 2015 +0100 tempcommit: Merge with ad571e28 commit d19c12eb09c6037d099d3a65e707db0070ad8597 Author: Frederik Heber Date: Sun Dec 13 15:21:45 2015 +0100 tempcommit: Merge with 5a7b4a23 commit d640e59ff241b76b4166fc9f82aa877899d3bec3 Author: Frederik Heber Date: Sun Dec 13 15:19:45 2015 +0100 tempcommit: QtObservedAtom::recieveNotification wrongly checked cast to atom. Merge with 92a780aa commit 6d21ce0aa38039fbc7559e86c69aab704600ebe5 Author: Frederik Heber Date: Sun Dec 13 15:15:58 2015 +0100 FIX: ObservedValue need to be removed with a bit of delay. - ObservedValue has higher priority than e.g. QtObservedAtom. Hence, will also receive subjectKilled() before QtObservedAtom does. But right after all of these are received(), ObservedValueContainer will remove the instance which drops the shared ptr's count to zero (because Observer/Observables do not store shared_ptr but only ptrs!) and its dstor is called. Therefore, QtObservedAtom cannot access the ObservedValue any longer and this is against how the design was meant to be (ObservedValue lives at least as long as respective side in Qt needs access to its information). commit e4b7df4922b60b752fca67cf2a0fbb1a45c77482 Author: Frederik Heber Date: Sat Dec 12 09:05:38 2015 +0100 Revert "Revert "DROPME: Removed logging into QtLogBox for debugging."" This reverts commit 73fcc4d0eb85a7339453cb79a5421a0bd595b392. ----------------------------------------------------------------------- Summary of changes: .../Qt4/InstanceBoard/ObservedValuesContainer.hpp | 25 +++++++- .../InstanceBoard/ObservedValuesContainer_impl.hpp | 62 +++++++++++++++++--- .../Qt4/InstanceBoard/QtObservedAtom.cpp | 66 +++++++++++----------- .../Qt4/InstanceBoard/QtObservedInstanceBoard.cpp | 39 +++++++++++-- .../Qt4/InstanceBoard/QtObservedInstanceBoard.hpp | 6 ++ .../Qt4/InstanceBoard/QtObservedMolecule.cpp | 12 ++-- src/UIElements/Qt4/QtUIFactory.cpp | 6 +- src/UIElements/Views/Qt4/QtInfoBox.cpp | 2 + src/UIElements/Views/Qt4/QtInfoBox.hpp | 6 ++ src/UIElements/Views/Qt4/QtLogBox.cpp | 4 +- src/UIElements/Views/Qt4/QtLogBox.hpp | 2 +- src/World.cpp | 4 +- src/World.hpp | 4 +- 13 files changed, 173 insertions(+), 65 deletions(-) hooks/post-receive --