X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_grid.cc;h=77995489a313a407aea439a1112337d551877705;hb=7701207123891b400c144db880b77dc698a202ea;hp=3ad9f66cbb88eec75c5f791e8ca6ace7cd2d72e6;hpb=50437bff22279473cd364d007d5e474af2a542bc;p=ardour.git diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc index 3ad9f66cbb..77995489a3 100644 --- a/gtk2_ardour/port_matrix_grid.cc +++ b/gtk2_ardour/port_matrix_grid.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2009 Paul Davis + Copyright (C) 2002-2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,32 +18,38 @@ */ #include -#include +#include #include "ardour/bundle.h" -#include "ardour/types.h" #include "port_matrix_grid.h" #include "port_matrix.h" #include "port_matrix_body.h" +#include "keyboard.h" using namespace std; +using Gtkmm2ext::Keyboard; PortMatrixGrid::PortMatrixGrid (PortMatrix* m, PortMatrixBody* b) - : PortMatrixComponent (m, b) + : PortMatrixComponent (m, b), + _dragging (false), + _drag_valid (false), + _moved (false) { - + } void PortMatrixGrid::compute_dimensions () { - _width = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { - _width += group_width (*i); + if (_matrix->visible_columns()) { + _width = group_size (_matrix->visible_columns()) * grid_spacing (); + } else { + _width = 0; } - _height = 0; - for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) { - _height += group_height (*i); + if (_matrix->visible_rows()) { + _height = group_size (_matrix->visible_rows()) * grid_spacing (); + } else { + _height = 0; } } @@ -55,113 +61,104 @@ PortMatrixGrid::render (cairo_t* cr) cairo_rectangle (cr, 0, 0, _width, _height); cairo_fill (cr); - uint32_t x = 0; - for (PortGroupList::List::const_iterator c = _matrix->columns()->begin(); c != _matrix->columns()->end(); ++c) { - - uint32_t y = 0; - for (PortGroupList::List::const_iterator r = _matrix->rows()->begin(); r != _matrix->rows()->end(); ++r) { - - if ((*c)->visible() && (*r)->visible()) { - render_group_pair (cr, *r, *c, x, y); - } - - y += group_height (*r); - } - - x += group_width (*c); - } -} + PortGroup::BundleList const & row_bundles = _matrix->visible_rows()->bundles(); + PortGroup::BundleList const & column_bundles = _matrix->visible_columns()->bundles(); -void -PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptr row, boost::shared_ptr column, uint32_t const x, uint32_t const y) -{ - PortGroup::BundleList const & row_bundles = row->bundles(); - PortGroup::BundleList const & column_bundles = column->bundles(); - - /* unfortunately we need to compute the height of the row group here */ - uint32_t height = group_height (row); - - uint32_t tx = x; + uint32_t x = 0; /* VERTICAL GRID LINES */ - + set_source_rgb (cr, grid_colour()); uint32_t N = 0; - + for (PortGroup::BundleList::const_iterator i = column_bundles.begin(); i != column_bundles.end(); ++i) { cairo_set_line_width (cr, thick_grid_line_width()); - cairo_move_to (cr, tx, y); - cairo_line_to (cr, tx, y + height); + cairo_move_to (cr, x, 0); + cairo_line_to (cr, x, _height); cairo_stroke (cr); - + if (!_matrix->show_only_bundles()) { cairo_set_line_width (cr, thin_grid_line_width()); - for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) { - tx += column_width (); - cairo_move_to (cr, tx, y); - cairo_line_to (cr, tx, y + height); + for (uint32_t j = 0; j < _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); ++j) { + x += grid_spacing (); + cairo_move_to (cr, x, 0); + cairo_line_to (cr, x, _height); cairo_stroke (cr); } - + } else { - - tx += column_width (); - + + x += grid_spacing (); + } - + ++N; } - uint32_t const width = tx - x; + if (_matrix->show_only_bundles ()) { + cairo_move_to (cr, x, 0); + cairo_line_to (cr, x, _height); + cairo_stroke (cr); + } + + uint32_t y = 0; - uint32_t ty = y; - /* HORIZONTAL GRID LINES */ - + N = 0; for (PortGroup::BundleList::const_iterator i = row_bundles.begin(); i != row_bundles.end(); ++i) { - + cairo_set_line_width (cr, thick_grid_line_width()); - cairo_move_to (cr, x, ty); - cairo_line_to (cr, x + width, ty); + cairo_move_to (cr, 0, y); + cairo_line_to (cr, _width, y); cairo_stroke (cr); - + if (!_matrix->show_only_bundles()) { cairo_set_line_width (cr, thin_grid_line_width()); - for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) { - ty += row_height (); - cairo_move_to (cr, x, ty); - cairo_line_to (cr, x + width, ty); + for (uint32_t j = 0; j < _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); ++j) { + y += grid_spacing (); + cairo_move_to (cr, 0, y); + cairo_line_to (cr, _width, y); cairo_stroke (cr); } } else { - ty += row_height (); + y += grid_spacing (); } - + ++N; } - - /* ASSOCIATION INDICATORS */ - uint32_t bx = x; - uint32_t by = y; + if (_matrix->show_only_bundles ()) { + cairo_move_to (cr, 0, y); + cairo_line_to (cr, _width, y); + cairo_stroke (cr); + } + + /* ASSOCIATION INDICATORS and NON-CONNECTABLE INDICATORS */ + + /* we draw a grey square in a matrix box if the two ports that intersect at that box + cannot be connected because they are of different types (MIDI vs. audio) + */ + + uint32_t bx = 0; + uint32_t by = 0; if (_matrix->show_only_bundles()) { for (PortGroup::BundleList::const_iterator i = column_bundles.begin(); i != column_bundles.end(); ++i) { - by = y; - + by = 0; + for (PortGroup::BundleList::const_iterator j = row_bundles.begin(); j != row_bundles.end(); ++j) { - - PortMatrixNode::State s = bundle_to_bundle_state (i->bundle, j->bundle); + + PortMatrixNode::State s = _matrix->get_association (PortMatrixNode ( + ARDOUR::BundleChannel ((*j)->bundle, 0), + ARDOUR::BundleChannel ((*i)->bundle, 0) + )); switch (s) { - case PortMatrixNode::UNKNOWN: - draw_unknown_indicator (cr, bx, by); - break; case PortMatrixNode::ASSOCIATED: draw_association_indicator (cr, bx, by); break; @@ -171,59 +168,87 @@ PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptrbundle->nchannels (); ++k) { - - ty = by; - for (uint32_t l = 0; l < j->bundle->nchannels (); ++l) { - + + x = bx; + for (uint32_t k = 0; k < _matrix->count_of_our_type ((*i)->bundle->nchannels()); ++k) { + + y = by; + for (uint32_t l = 0; l < _matrix->count_of_our_type ((*j)->bundle->nchannels()); ++l) { + ARDOUR::BundleChannel c[2]; - c[_matrix->column_index()] = ARDOUR::BundleChannel (i->bundle, k); - c[_matrix->row_index()] = ARDOUR::BundleChannel (j->bundle, l); - - PortMatrixNode::State const s = _matrix->get_state (c); - - switch (s) { - case PortMatrixNode::ASSOCIATED: - draw_association_indicator (cr, tx, ty); - break; - - case PortMatrixNode::UNKNOWN: - draw_unknown_indicator (cr, tx, ty); - break; - - case PortMatrixNode::NOT_ASSOCIATED: - break; - - default: - break; + + c[_matrix->column_index()] = ARDOUR::BundleChannel ( + (*i)->bundle, + (*i)->bundle->type_channel_to_overall (_matrix->type (), k) + ); + + c[_matrix->row_index()] = ARDOUR::BundleChannel ( + (*j)->bundle, + (*j)->bundle->type_channel_to_overall (_matrix->type (), l) + ); + + if (c[0].bundle->channel_type (c[0].channel) != c[1].bundle->channel_type (c[1].channel)) { + /* these two channels are of different types */ + draw_non_connectable_indicator (cr, x, y); + } else { + /* these two channels might be associated */ + PortMatrixNode::State const s = _matrix->get_state (c); + + switch (s) { + case PortMatrixNode::ASSOCIATED: + draw_association_indicator (cr, x, y); + break; + + case PortMatrixNode::NOT_ASSOCIATED: + break; + + default: + break; + } } - - ty += row_height(); + + y += grid_spacing(); + } + + if (_matrix->count_of_our_type ((*j)->bundle->nchannels()) == 0) { + /* the *j bundle has no channels of our type, so it will have a dummy + one which needs to be marked non-connectable. + */ + draw_non_connectable_indicator (cr, x, y); + } + + x += grid_spacing(); + } + + if (_matrix->count_of_our_type ((*i)->bundle->nchannels()) == 0) { + /* draw non-connectable indicators for the case where the *i bundle + has no channels of our type (and hence has 1 dummy channel) + */ + y = by; + for (uint32_t l = 0; l < _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()); ++l) { + draw_non_connectable_indicator (cr, x, y); + y += grid_spacing (); } - - tx += column_width(); } - - by += j->bundle->nchannels () * row_height(); + + by += _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()) * grid_spacing(); } - - bx += i->bundle->nchannels () * column_width(); + + bx += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing(); } } } @@ -232,28 +257,46 @@ void PortMatrixGrid::draw_association_indicator (cairo_t* cr, uint32_t x, uint32_t y, double p) { set_source_rgba (cr, association_colour(), 0.5); + cairo_arc ( cr, - x + column_width() / 2, - y + column_width() / 2, - (column_width() - (2 * connection_indicator_pad())) / 2, + x + grid_spacing() / 2, + y + grid_spacing() / 2, + (grid_spacing() - (2 * connection_indicator_pad())) / 2, 0, p * 2 * M_PI ); - + cairo_fill (cr); } void -PortMatrixGrid::draw_unknown_indicator (cairo_t* cr, uint32_t x, uint32_t y) +PortMatrixGrid::draw_empty_square (cairo_t* cr, uint32_t x, uint32_t y) { - set_source_rgba (cr, unknown_colour(), 0.5); + set_source_rgb (cr, background_colour()); cairo_rectangle ( cr, x + thick_grid_line_width(), y + thick_grid_line_width(), - column_width() - 2 * thick_grid_line_width(), - row_height() - 2 * thick_grid_line_width() + grid_spacing() - 2 * thick_grid_line_width(), + grid_spacing() - 2 * thick_grid_line_width() + ); + cairo_fill (cr); +} + +/** Draw a square to indicate that two channels in a matrix cannot be associated + * with each other. + */ +void +PortMatrixGrid::draw_non_connectable_indicator (cairo_t* cr, uint32_t x, uint32_t y) +{ + set_source_rgb (cr, non_connectable_colour ()); + cairo_rectangle ( + cr, + x + thick_grid_line_width(), + y + thick_grid_line_width(), + grid_spacing() - 2 * thick_grid_line_width(), + grid_spacing() - 2 * thick_grid_line_width() ); cairo_fill (cr); } @@ -262,225 +305,254 @@ PortMatrixNode PortMatrixGrid::position_to_node (double x, double y) const { return PortMatrixNode ( - y_position_to_group_and_channel (y).second, - x_position_to_group_and_channel (x).second + position_to_channel (y, x, _matrix->visible_rows()), + position_to_channel (x, y, _matrix->visible_columns()) ); } - -pair, ARDOUR::BundleChannel> -PortMatrixGrid::x_position_to_group_and_channel (double x) const +void +PortMatrixGrid::button_press (double x, double y, GdkEventButton* ev) { - PortGroupList::List::const_iterator i = _matrix->columns()->begin(); + ARDOUR::BundleChannel const px = position_to_channel (x, y, _matrix->visible_columns()); + ARDOUR::BundleChannel const py = position_to_channel (y, x, _matrix->visible_rows()); - while (i != _matrix->columns()->end()) { + if (ev->button == 1) { - uint32_t const gw = group_width (*i); + _dragging = true; + _drag_valid = (px.bundle && py.bundle); - if (x < gw) { + _moved = false; + _drag_start_x = x / grid_spacing (); + _drag_start_y = y / grid_spacing (); - /* it's in this group */ + } else if (ev->button == 3) { - PortGroup::BundleList const & bundles = (*i)->bundles (); - for (PortGroup::BundleList::const_iterator j = bundles.begin(); j != bundles.end(); ++j) { + _matrix->popup_menu (px, py, ev->time); - if (_matrix->show_only_bundles()) { - - if (x < column_width()) { - return make_pair (*i, ARDOUR::BundleChannel (j->bundle, 0)); - } else { - x -= column_width (); - } - - } else { + } +} - uint32_t const w = j->bundle->nchannels () * column_width (); - if (x < w) { - return make_pair (*i, ARDOUR::BundleChannel (j->bundle, x / column_width())); - } else { - x -= w; - } +void +PortMatrixGrid::set_association (PortMatrixNode node, bool s) +{ + if (_matrix->show_only_bundles()) { + for (uint32_t i = 0; i < node.column.bundle->nchannels().n_total(); ++i) { + for (uint32_t j = 0; j < node.row.bundle->nchannels().n_total(); ++j) { + + if (!_matrix->should_show (node.column.bundle->channel_type(i)) || !_matrix->should_show (node.row.bundle->channel_type(j))) { + continue; } + ARDOUR::BundleChannel c[2]; + c[_matrix->column_index()] = ARDOUR::BundleChannel (node.column.bundle, i); + c[_matrix->row_index()] = ARDOUR::BundleChannel (node.row.bundle, j); + _matrix->set_state (c, s && (i == j)); } + } - } else { + } else { - x -= gw; + if (node.row.bundle && node.column.bundle) { - } + ARDOUR::BundleChannel c[2]; + c[_matrix->row_index()] = node.row; + c[_matrix->column_index()] = node.column; - ++i; + _matrix->set_state (c, s); + } } - - return make_pair (boost::shared_ptr (), ARDOUR::BundleChannel (boost::shared_ptr (), 0)); } +void +PortMatrixGrid::button_release (double x, double y, GdkEventButton* ev) +{ + if (ev->button == 1) { + if (x != -1) { -double -PortMatrixGrid::channel_position ( - ARDOUR::BundleChannel bc, - PortGroup::BundleList const& bundles, - double inc) const -{ - double p = 0; - - PortGroup::BundleList::const_iterator i = bundles.begin (); - while (i != bundles.end() && i->bundle != bc.bundle) { + if (_dragging && _moved) { - if (_matrix->show_only_bundles()) { - p += inc; - } else { - p += inc * i->bundle->nchannels(); - } - - ++i; - } + if (_drag_valid) { + list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); - if (i == bundles.end()) { - return 0; - } + if (!p.empty()) { + PortMatrixNode::State const s = _matrix->get_association (p.front()); + for (list::const_iterator i = p.begin(); i != p.end(); ++i) { + set_association (*i, toggle_state (s)); + } + } + } - p += inc * bc.channel; + } else { + + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + /* associate/disassociate things diagonally down and right until we run out */ + PortMatrixNode::State s = (PortMatrixNode::State) 0; + while (1) { + PortMatrixNode const n = position_to_node (x, y); + if (n.row.bundle && n.column.bundle) { + if (s == (PortMatrixNode::State) 0) { + s = _matrix->get_association (n); + } + set_association (n, toggle_state (s)); + } else { + break; + } + x += grid_spacing (); + y += grid_spacing (); + } - return p; -} + } else { -void -PortMatrixGrid::button_press (double x, double y, int b, uint32_t t) -{ - if (b == 1) { - - PortMatrixNode const node = position_to_node (x, y); - - if (_matrix->show_only_bundles()) { - - PortMatrixNode::State const s = bundle_to_bundle_state (node.column.bundle, node.row.bundle); - - for (uint32_t i = 0; i < node.column.bundle->nchannels(); ++i) { - for (uint32_t j = 0; j < node.row.bundle->nchannels(); ++j) { - - ARDOUR::BundleChannel c[2]; - c[_matrix->column_index()] = ARDOUR::BundleChannel (node.column.bundle, i); - c[_matrix->row_index()] = ARDOUR::BundleChannel (node.row.bundle, j); - if (s == PortMatrixNode::NOT_ASSOCIATED || s == PortMatrixNode::PARTIAL) { - _matrix->set_state (c, i == j); - } else { - _matrix->set_state (c, false); + PortMatrixNode const n = position_to_node (x, y); + if (n.row.bundle && n.column.bundle) { + PortMatrixNode::State const s = _matrix->get_association (n); + set_association (n, toggle_state (s)); } } } - - } else { - - if (node.row.bundle && node.column.bundle) { - - ARDOUR::BundleChannel c[2]; - c[_matrix->row_index()] = node.row; - c[_matrix->column_index()] = node.column; - - PortMatrixNode::State const s = _matrix->get_state (c); - - if (s == PortMatrixNode::ASSOCIATED || s == PortMatrixNode::NOT_ASSOCIATED) { - - bool const n = !(s == PortMatrixNode::ASSOCIATED); - - ARDOUR::BundleChannel c[2]; - c[_matrix->row_index()] = node.row; - c[_matrix->column_index()] = node.column; - - _matrix->set_state (c, n); - } - - } - } - - require_render (); - _body->queue_draw (); - } else if (b == 3) { + require_render (); + } - _matrix->popup_menu (x_position_to_group_and_channel (x), y_position_to_group_and_channel (y), t); - + _body->queue_draw (); } + + _dragging = false; } + void PortMatrixGrid::draw_extra (cairo_t* cr) { set_source_rgba (cr, mouseover_line_colour(), 0.3); cairo_set_line_width (cr, mouseover_line_width()); - double const x = component_to_parent_x ( - channel_position (_body->mouseover().column, _matrix->columns()->bundles(), column_width()) + column_width() / 2 - ); - - double const y = component_to_parent_y ( - channel_position (_body->mouseover().row, _matrix->rows()->bundles(), row_height()) + row_height() / 2 - ); - - if (_body->mouseover().row.bundle) { - - cairo_move_to (cr, x, y); - if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - cairo_line_to (cr, component_to_parent_x (0), y); - } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - cairo_line_to (cr, _parent_rectangle.get_x() + _parent_rectangle.get_width(), y); + list const m = _body->mouseover (); + + for (list::const_iterator i = m.begin(); i != m.end(); ++i) { + + double const x = component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing()) + grid_spacing() / 2; + double const y = component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing()) + grid_spacing() / 2; + + if (PortMatrix::bundle_with_channels (i->row.bundle) && PortMatrix::bundle_with_channels (i->column.bundle)) { + + cairo_move_to (cr, x, y); + if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { + cairo_line_to (cr, component_to_parent_x (0), y); + } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { + cairo_line_to (cr, _parent_rectangle.get_x() + _parent_rectangle.get_width(), y); + } + cairo_stroke (cr); + + cairo_move_to (cr, x, y); + if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { + cairo_line_to (cr, x, _parent_rectangle.get_y() + _parent_rectangle.get_height()); + } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { + cairo_line_to (cr, x, component_to_parent_y (0)); + } + cairo_stroke (cr); } - cairo_stroke (cr); } - if (_body->mouseover().column.bundle) { + if (_dragging && _drag_valid && _moved) { - cairo_move_to (cr, x, y); - if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - cairo_line_to (cr, x, _parent_rectangle.get_y() + _parent_rectangle.get_height()); - } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - cairo_line_to (cr, x, component_to_parent_y (0)); + list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); + + if (!p.empty()) { + + bool const s = toggle_state (_matrix->get_association (p.front())); + + for (list::const_iterator i = p.begin(); i != p.end(); ++i) { + if (s) { + draw_association_indicator ( + cr, + component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing ()), + component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing ()) + ); + } else { + draw_empty_square ( + cr, + component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing ()), + component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing ()) + ); + } + } } + + set_source_rgba (cr, association_colour (), 0.3); + + cairo_move_to ( + cr, + component_to_parent_x (_drag_start_x * grid_spacing() + grid_spacing() / 2), + component_to_parent_y (_drag_start_y * grid_spacing() + grid_spacing() / 2) + ); + + cairo_line_to ( + cr, + component_to_parent_x (_drag_x * grid_spacing() + grid_spacing() / 2), + component_to_parent_y (_drag_y * grid_spacing() + grid_spacing() / 2) + ); + cairo_stroke (cr); + } } void -PortMatrixGrid::mouseover_changed (PortMatrixNode const& old) +PortMatrixGrid::mouseover_changed (list const & old) { queue_draw_for (old); queue_draw_for (_body->mouseover()); } void -PortMatrixGrid::mouseover_event (double x, double y) +PortMatrixGrid::motion (double x, double y) { _body->set_mouseover (position_to_node (x, y)); + + int const px = x / grid_spacing (); + int const py = y / grid_spacing (); + + if (_dragging && !_moved && ( (px != _drag_start_x || py != _drag_start_x) )) { + _moved = true; + } + + if (_dragging && _drag_valid && _moved) { + _drag_x = px; + _drag_y = py; + _body->queue_draw (); + } } void -PortMatrixGrid::queue_draw_for (PortMatrixNode const &n) +PortMatrixGrid::queue_draw_for (list const &n) { - if (n.row.bundle) { - - double const y = channel_position (n.row, _matrix->rows()->bundles(), row_height()); - _body->queue_draw_area ( - _parent_rectangle.get_x(), - component_to_parent_y (y), - _parent_rectangle.get_width(), - row_height() - ); - } + for (list::const_iterator i = n.begin(); i != n.end(); ++i) { - if (n.column.bundle) { + if (i->row.bundle) { - double const x = channel_position (n.column, _matrix->columns()->bundles(), column_width()); - - _body->queue_draw_area ( - component_to_parent_x (x), - _parent_rectangle.get_y(), - column_width(), - _parent_rectangle.get_height() - ); + double const y = channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing (); + _body->queue_draw_area ( + _parent_rectangle.get_x(), + component_to_parent_y (y), + _parent_rectangle.get_width(), + grid_spacing() + ); + } + + if (i->column.bundle) { + + double const x = channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing (); + + _body->queue_draw_area ( + component_to_parent_x (x), + _parent_rectangle.get_y(), + grid_spacing(), + _parent_rectangle.get_height() + ); + } } } @@ -508,58 +580,67 @@ PortMatrixGrid::parent_to_component_y (double y) const return y + _body->yoffset() - _parent_rectangle.get_y(); } -PortMatrixNode::State -PortMatrixGrid::bundle_to_bundle_state (boost::shared_ptr a, boost::shared_ptr b) const +list +PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const { - bool have_unknown = false; - bool have_off_diagonal_association = false; - bool have_diagonal_association = false; - bool have_diagonal_not_association = false; - - for (uint32_t i = 0; i < a->nchannels (); ++i) { - - for (uint32_t j = 0; j < b->nchannels (); ++j) { - - ARDOUR::BundleChannel c[2]; - c[_matrix->column_index()] = ARDOUR::BundleChannel (a, i); - c[_matrix->row_index()] = ARDOUR::BundleChannel (b, j); - - PortMatrixNode::State const s = _matrix->get_state (c); - - switch (s) { - case PortMatrixNode::ASSOCIATED: - if (i == j) { - have_diagonal_association = true; - } else { - have_off_diagonal_association = true; - } - break; - - case PortMatrixNode::UNKNOWN: - have_unknown = true; - break; - - case PortMatrixNode::NOT_ASSOCIATED: - if (i == j) { - have_diagonal_not_association = true; - } - break; + list p; + + bool const steep = abs (y1 - y0) > abs (x1 - x0); + if (steep) { + int tmp = x0; + x0 = y0; + y0 = tmp; + + tmp = y1; + y1 = x1; + x1 = tmp; + } + + if (x0 > x1) { + int tmp = x0; + x0 = x1; + x1 = tmp; + + tmp = y0; + y0 = y1; + y1 = tmp; + } + + int dx = x1 - x0; + int dy = abs (y1 - y0); - default: - break; + double err = 0; + double derr = double (dy) / dx; + + int y = y0; + int const ystep = y0 < y1 ? 1 : -1; + + for (int x = x0; x <= x1; ++x) { + if (steep) { + PortMatrixNode n = position_to_node (y * grid_spacing (), x * grid_spacing ()); + if (n.row.bundle && n.column.bundle) { + p.push_back (n); + } + } else { + PortMatrixNode n = position_to_node (x * grid_spacing (), y * grid_spacing ()); + if (n.row.bundle && n.column.bundle) { + p.push_back (n); } } - } - - if (have_unknown) { - return PortMatrixNode::UNKNOWN; - } else if (have_diagonal_association && !have_off_diagonal_association && !have_diagonal_not_association) { - return PortMatrixNode::ASSOCIATED; - } else if (!have_diagonal_association && !have_off_diagonal_association) { - return PortMatrixNode::NOT_ASSOCIATED; + + err += derr; + + if (err >= 0.5) { + y += ystep; + err -= 1; + } } - return PortMatrixNode::PARTIAL; + return p; } - +bool +PortMatrixGrid::toggle_state (PortMatrixNode::State s) const +{ + return (s == PortMatrixNode::NOT_ASSOCIATED || s == PortMatrixNode::PARTIAL); +}