X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_grid.cc;h=77995489a313a407aea439a1112337d551877705;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=feaf6b1222dcd7d2bab8f82119eef960ca2a68b7;hpb=6da5dd6d41df9e3d05b9b8cceaf1b671b4e21141;p=ardour.git diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc index feaf6b1222..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,35 +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), _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_size (*i) * grid_spacing (); + 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_size (*i) * grid_spacing (); + if (_matrix->visible_rows()) { + _height = group_size (_matrix->visible_rows()) * grid_spacing (); + } else { + _height = 0; } } @@ -58,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_size (*r) * grid_spacing (); - } - - x += group_size (*c) * grid_spacing (); - } -} - -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(); + PortGroup::BundleList const & row_bundles = _matrix->visible_rows()->bundles(); + PortGroup::BundleList const & column_bundles = _matrix->visible_columns()->bundles(); - /* unfortunately we need to compute the height of the row group here */ - uint32_t height = group_size (row) * grid_spacing (); - - 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 += grid_spacing (); - 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 += grid_spacing (); - + + 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 += grid_spacing (); - 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 += grid_spacing (); + 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; @@ -174,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 += grid_spacing(); + + 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 += grid_spacing(); } - - by += j->bundle->nchannels () * grid_spacing(); + + by += _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()) * grid_spacing(); } - - bx += i->bundle->nchannels () * grid_spacing(); + + bx += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing(); } } } @@ -244,14 +266,31 @@ PortMatrixGrid::draw_association_indicator (cairo_t* cr, uint32_t x, uint32_t y, 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(), + 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(), @@ -263,119 +302,120 @@ PortMatrixGrid::draw_unknown_indicator (cairo_t* cr, uint32_t x, uint32_t y) } PortMatrixNode -PortMatrixGrid::position_to_node (uint32_t x, uint32_t y) const +PortMatrixGrid::position_to_node (double x, double y) const { return PortMatrixNode ( - position_to_group_and_channel (y, _matrix->rows()).second, - position_to_group_and_channel (x, _matrix->columns()).second + position_to_channel (y, x, _matrix->visible_rows()), + position_to_channel (x, y, _matrix->visible_columns()) ); } void -PortMatrixGrid::button_press (double x, double y, int b, uint32_t t) +PortMatrixGrid::button_press (double x, double y, GdkEventButton* ev) { - if (b == 1) { + ARDOUR::BundleChannel const px = position_to_channel (x, y, _matrix->visible_columns()); + ARDOUR::BundleChannel const py = position_to_channel (y, x, _matrix->visible_rows()); + + if (ev->button == 1) { _dragging = true; + _drag_valid = (px.bundle && py.bundle); + _moved = false; _drag_start_x = x / grid_spacing (); _drag_start_y = y / grid_spacing (); - } else if (b == 3) { + } else if (ev->button == 3) { - _matrix->popup_menu ( - position_to_group_and_channel (x / grid_spacing(), _matrix->columns()), - position_to_group_and_channel (y / grid_spacing(), _matrix->rows()), t); - - } -} + _matrix->popup_menu (px, py, ev->time); -void -PortMatrixGrid::set_association (PortMatrixNode node) -{ - if (_matrix->show_only_bundles()) { - - 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); - _matrix->set_state (c, true); - } - } - - } else { - - if (node.row.bundle && node.column.bundle) { - - ARDOUR::BundleChannel c[2]; - c[_matrix->row_index()] = node.row; - c[_matrix->column_index()] = node.column; - _matrix->set_state (c, true); - } } } void -PortMatrixGrid::toggle_association (PortMatrixNode node) +PortMatrixGrid::set_association (PortMatrixNode node, bool s) { 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) { - + + 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); - if (s == PortMatrixNode::NOT_ASSOCIATED || s == PortMatrixNode::PARTIAL) { - _matrix->set_state (c, i == j); - } else { - _matrix->set_state (c, false); - } + _matrix->set_state (c, s && (i == j)); } } - + } 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); - _matrix->set_state (c, n); - } - + + _matrix->set_state (c, s); } } } void -PortMatrixGrid::button_release (double x, double y, int b, uint32_t t) +PortMatrixGrid::button_release (double x, double y, GdkEventButton* ev) { - if (b == 1) { + if (ev->button == 1) { - if (_dragging && _moved) { + if (x != -1) { - list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); + if (_dragging && _moved) { - for (list::const_iterator i = p.begin(); i != p.end(); ++i) { - set_association (*i); - } + if (_drag_valid) { + list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); - } else { + 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)); + } + } + } + + } 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 (); + } + + } else { + + 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)); + } + } + } - toggle_association (position_to_node (x / grid_spacing(), y / grid_spacing())); + require_render (); } - require_render (); _body->queue_draw (); } @@ -389,33 +429,58 @@ 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_to_position (_body->mouseover().column, _matrix->columns()) * grid_spacing()) + grid_spacing() / 2; - double const y = component_to_parent_y (channel_to_position (_body->mouseover().row, _matrix->rows()) * grid_spacing()) + grid_spacing() / 2; - - if (_body->mouseover().row.bundle) { + list const m = _body->mouseover (); - 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); + 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) { + + list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); + + if (!p.empty()) { - 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)); + 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 ()) + ); + } + } } - cairo_stroke (cr); - } - if (_dragging && _moved) { - set_source_rgba (cr, association_colour (), 0.3); cairo_move_to ( @@ -423,29 +488,20 @@ PortMatrixGrid::draw_extra (cairo_t* 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); - list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); + cairo_stroke (cr); - for (list::const_iterator i = p.begin(); i != p.end(); ++i) { - draw_association_indicator ( - cr, - component_to_parent_x (channel_to_position (i->column, _matrix->columns()) * grid_spacing ()), - component_to_parent_y (channel_to_position (i->row, _matrix->rows()) * grid_spacing ()) - ); - } } } void -PortMatrixGrid::mouseover_changed (PortMatrixNode const& old) +PortMatrixGrid::mouseover_changed (list const & old) { queue_draw_for (old); queue_draw_for (_body->mouseover()); @@ -454,7 +510,7 @@ PortMatrixGrid::mouseover_changed (PortMatrixNode const& old) void PortMatrixGrid::motion (double x, double y) { - _body->set_mouseover (position_to_node (x / grid_spacing(), y / grid_spacing())); + _body->set_mouseover (position_to_node (x, y)); int const px = x / grid_spacing (); int const py = y / grid_spacing (); @@ -463,7 +519,7 @@ PortMatrixGrid::motion (double x, double y) _moved = true; } - if (_dragging && _moved) { + if (_dragging && _drag_valid && _moved) { _drag_x = px; _drag_y = py; _body->queue_draw (); @@ -471,29 +527,32 @@ PortMatrixGrid::motion (double x, double y) } void -PortMatrixGrid::queue_draw_for (PortMatrixNode const &n) +PortMatrixGrid::queue_draw_for (list const &n) { - if (n.row.bundle) { - - double const y = channel_to_position (n.row, _matrix->rows()) * grid_spacing (); - _body->queue_draw_area ( - _parent_rectangle.get_x(), - component_to_parent_y (y), - _parent_rectangle.get_width(), - grid_spacing() - ); - } + for (list::const_iterator i = n.begin(); i != n.end(); ++i) { - if (n.column.bundle) { + if (i->row.bundle) { - double const x = channel_to_position (n.column, _matrix->columns()) * grid_spacing (); - - _body->queue_draw_area ( - component_to_parent_x (x), - _parent_rectangle.get_y(), - grid_spacing(), - _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() + ); + } } } @@ -521,60 +580,6 @@ 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 -{ - 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; - - default: - break; - } - } - } - - 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; - } - - return PortMatrixNode::PARTIAL; -} - list PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const { @@ -603,7 +608,7 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const int dx = x1 - x0; int dy = abs (y1 - y0); - + double err = 0; double derr = double (dy) / dx; @@ -612,9 +617,15 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const for (int x = x0; x <= x1; ++x) { if (steep) { - p.push_back (position_to_node (y, x)); + PortMatrixNode n = position_to_node (y * grid_spacing (), x * grid_spacing ()); + if (n.row.bundle && n.column.bundle) { + p.push_back (n); + } } else { - p.push_back (position_to_node (x, y)); + PortMatrixNode n = position_to_node (x * grid_spacing (), y * grid_spacing ()); + if (n.row.bundle && n.column.bundle) { + p.push_back (n); + } } err += derr; @@ -627,3 +638,9 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const return p; } + +bool +PortMatrixGrid::toggle_state (PortMatrixNode::State s) const +{ + return (s == PortMatrixNode::NOT_ASSOCIATED || s == PortMatrixNode::PARTIAL); +}