benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: move the (planned) logic for virtual paths to ScopePath::navigate()

Browse source
This commit is contained in:
Fischlurch 2010-10-02 05:27:51 +02:00
parent d1d7f3bc58
commit 1fe76e33a2
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/proc/mobject/session/query-focus.hpp
View file

@ -122,14 +122,14 @@ namespace session {
*/
inline QueryFocus::operator Scope() const
{
return currPath().getLeaf();
return focus_->getLeaf();
}
/**@note returning a copy */
inline ScopePath
QueryFocus::currentPath() const
{
return currPath();
return *focus_;
}

17
src/proc/mobject/session/scope-path.cpp
View file

@ -107,8 +107,8 @@ namespace session {
{
if (!leaf.isValid()) return; // invalid leaf defines invalid path....
append_all (discoverScopePath(leaf), path_); /////////////////////////////TICKET #663 extension point for meta-clip support
reverse (path_.begin(), path_.end());
clear();
navigate (leaf);
}
@ -271,8 +271,17 @@ namespace session {
ScopePath::navigate (Scope const& target)
{
___check_notBottom (this, "Navigating");
*this = ScopePath(target); //////////////////////////////TICKET #424
///////////////////////////////TICKET #663 extension point for meta-clip support
std::vector<Scope> otherPath;
append_all (discoverScopePath(target), otherPath);
reverse (otherPath.begin(), otherPath.end());
////////////////////////////TICKET #663 extension point for meta-clip support
ASSERT (path_[0] == otherPath[0]); // sharing the root element
this->path_ = otherPath; // TODO really relate the two paths, including a treatment for meta-clips
// - if both are in the same sequence (same head element): just attach the tail of the other
// - if the other path points into a sequence which is attached as meta-clip to the current sequence,
// then attach the other path below that meta-clip
// - otherwise use the first timeline, to which the other path's sequence is attached
// - otherwise, if all else fails, use the raw otherPath
}