From dd6be02a7478225f19f02432919b64b96b733172 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 30 Mar 2007 22:32:07 +0000 Subject: Canvas auto-layout uses durations like graphviz diagrams. Learning fixes. Added duration spinbutton to MIDI Import dialog. git-svn-id: http://svn.drobilla.net/lad/machina@381 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/MachinaCanvas.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/gui/MachinaCanvas.cpp') diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index a6a565e..134b885 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -115,25 +115,25 @@ MachinaCanvas::canvas_event(GdkEvent* event) void MachinaCanvas::connect_node(boost::shared_ptr src, - boost::shared_ptr dst) + boost::shared_ptr head) { - SharedPtr edge(new Machina::Edge(src->node(), dst->node())); + SharedPtr edge(new Machina::Edge(src->node(), head->node())); src->node()->add_outgoing_edge(edge); boost::shared_ptr c(new EdgeView(shared_from_this(), - src, dst, edge)); + src, head, edge)); src->add_connection(c); - dst->add_connection(c); + head->add_connection(c); add_connection(c); } void MachinaCanvas::disconnect_node(boost::shared_ptr src, - boost::shared_ptr dst) + boost::shared_ptr head) { - src->node()->remove_outgoing_edges_to(dst->node()); - remove_connection(src, dst); + src->node()->remove_outgoing_edges_to(head->node()); + remove_connection(src, head); #if 0 boost::shared_ptr input @@ -213,16 +213,16 @@ MachinaCanvas::build(SharedPtr machine) for (Machina::Node::Edges::const_iterator e = view->node()->outgoing_edges().begin(); e != view->node()->outgoing_edges().end(); ++e) { - SharedPtr dst_view = views[(*e)->dst()]; - if (!dst_view) { + SharedPtr head_view = views[(*e)->head()]; + if (!head_view) { cerr << "WARNING: Edge to node with no view" << endl; continue; } boost::shared_ptr c(new EdgeView(shared_from_this(), - view, dst_view, (*e))); + view, head_view, (*e))); view->add_connection(c); - dst_view->add_connection(c); + head_view->add_connection(c); add_connection(c); } -- cgit v1.2.1