X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=522015548f5b35a967130fdd37cf54c823b0607a;hb=129ace60e24aa7b5297563d389edbae1d70a3a80;hp=5dcb710e7e83b0764f63a74b359f72abb322642c;hpb=9dbecd0fa1a977da1643977487a5485f4bf74267;p=ardour.git diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index 5dcb710e7e..522015548f 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -45,51 +45,47 @@ PortMatrixColumnLabels::compute_dimensions () _longest_bundle_name = 0; /* width of the longest channel name */ _longest_channel_name = 0; - /* height of highest bit of text (apart from group names) */ - _highest_text = 0; - /* width of the whole thing */ - _width = 0; - _highest_group_name = 0; + + /* Compute dimensions using all port groups, so that we allow for the largest and hence + we can change between visible groups without the size of the labels jumping around. + */ for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { PortGroup::BundleList const c = _matrix->columns()->bundles(); for (PortGroup::BundleList::const_iterator j = c.begin (); j != c.end(); ++j) { cairo_text_extents_t ext; - cairo_text_extents (cr, j->bundle->name().c_str(), &ext); + cairo_text_extents (cr, (*j)->bundle->name().c_str(), &ext); if (ext.width > _longest_bundle_name) { _longest_bundle_name = ext.width; } - if (ext.height > _highest_text) { - _highest_text = ext.height; - } - - for (uint32_t k = 0; k < j->bundle->nchannels (); ++k) { + for (uint32_t k = 0; k < (*j)->bundle->nchannels (); ++k) { cairo_text_extents ( cr, - j->bundle->channel_name (k).c_str(), + (*j)->bundle->channel_name (k).c_str(), &ext ); if (ext.width > _longest_channel_name) { _longest_channel_name = ext.width; } - - if (ext.height > _highest_text) { - _highest_text = ext.height; - } } } + } - _width += group_size (*i) * grid_spacing (); + /* height metrics */ + cairo_text_extents_t ext; + cairo_text_extents (cr, X_("AQRjpy"), &ext); + _text_height = ext.height; + _descender_height = ext.height + ext.y_bearing; - cairo_text_extents_t ext; - cairo_text_extents (cr, (*i)->name.c_str(), &ext); - if (ext.height > _highest_group_name) { - _highest_group_name = ext.height; - } + /* width of the whole thing */ + if (_matrix->visible_columns()) { + _width = group_size (_matrix->visible_columns()) * grid_spacing (); + } else { + _width = 0; } cairo_destroy (cr); @@ -102,11 +98,8 @@ PortMatrixColumnLabels::compute_dimensions () a += _longest_channel_name; } - double const parallelogram_height = a * sin (angle()) + _highest_text * cos (angle()); - - _height = parallelogram_height + _highest_group_name + 2 * name_pad(); - - _overhang = parallelogram_height / tan (angle ()); + _height = a * sin (angle()) + _text_height * cos (angle()); + _overhang = _height / tan (angle ()); _width += _overhang; } @@ -114,7 +107,7 @@ double PortMatrixColumnLabels::basic_text_x_pos (int) const { return grid_spacing() / 2 + - _highest_text / (2 * sin (angle ())); + _text_height / (2 * sin (angle ())); } void @@ -131,59 +124,36 @@ PortMatrixColumnLabels::render (cairo_t* cr) double x = 0; int N = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { - - if ((*i)->visible ()) { - - PortGroup::BundleList const & bundles = (*i)->bundles (); - for (PortGroup::BundleList::const_iterator j = bundles.begin (); j != bundles.end(); ++j) { + PortGroup::BundleList const & bundles = _matrix->visible_columns()->bundles (); + for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) { - Gdk::Color c = j->has_colour ? j->colour : get_a_bundle_colour (N); - render_bundle_name (cr, background_colour (), c, x, 0, j->bundle); - - if (_matrix->show_only_bundles()) { - x += grid_spacing(); - } else { - x += j->bundle->nchannels () * grid_spacing(); - } - - ++N; - } + Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N); + render_bundle_name (cr, background_colour (), c, x, 0, (*i)->bundle); + if (_matrix->show_only_bundles()) { + x += grid_spacing(); } else { - - x += grid_spacing (); - + x += (*i)->bundle->nchannels () * grid_spacing(); } + + ++N; } - /* PORT NAMES */ if (!_matrix->show_only_bundles()) { x = 0; N = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { - - if ((*i)->visible ()) { - - PortGroup::BundleList const & bundles = (*i)->bundles (); - for (PortGroup::BundleList::const_iterator j = bundles.begin (); j != bundles.end(); ++j) { - - for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) { - Gdk::Color c = j->has_colour ? j->colour : get_a_bundle_colour (N); - render_channel_name (cr, background_colour (), c, x, 0, ARDOUR::BundleChannel (j->bundle, k)); - x += grid_spacing(); - } - - ++N; - } - } else { - - x += grid_spacing (); + for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) { + for (uint32_t j = 0; j < (*i)->bundle->nchannels(); ++j) { + Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N); + render_channel_name (cr, background_colour (), c, x, 0, ARDOUR::BundleChannel ((*i)->bundle, j)); + x += grid_spacing(); } + + ++N; } } } @@ -215,11 +185,19 @@ PortMatrixColumnLabels::parent_to_component_y (double y) const } void -PortMatrixColumnLabels::mouseover_changed (PortMatrixNode const &) +PortMatrixColumnLabels::mouseover_changed (list const &) { - clear_channel_highlights (); - if (_body->mouseover().column.bundle && _body->mouseover().row.bundle) { - add_channel_highlight (_body->mouseover().column); + list const m = _body->mouseover (); + for (list::const_iterator i = m.begin(); i != m.end(); ++i) { + + ARDOUR::BundleChannel c = i->column; + ARDOUR::BundleChannel r = i->row; + + if (c.bundle && r.bundle) { + add_channel_highlight (c); + } else if (c.bundle) { + _body->highlight_associated_channels (_matrix->column_index(), c); + } } } @@ -233,7 +211,7 @@ PortMatrixColumnLabels::port_name_shape (double xoff, double yoff) const if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - double x_ = xoff + slanted_height() / tan (angle()) + w; + double x_ = xoff + _height / tan (angle()) + w; double y_ = yoff; shape.push_back (make_pair (x_, y_)); x_ -= w; @@ -280,18 +258,14 @@ PortMatrixColumnLabels::render_bundle_name ( double x_ = xoff; uint32_t y = yoff; - if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - y += _height; - } else { - y += slanted_height(); - } + y += _height; double y_ = y; cairo_move_to (cr, x_, y_); x_ += w; cairo_line_to (cr, x_, y_); - x_ += slanted_height() / tan (angle ()); - y_ -= slanted_height(); + x_ += _height / tan (angle ()); + y_ -= _height; cairo_line_to (cr, x_, y_); x_ -= w; cairo_line_to (cr, x_, y_); @@ -303,6 +277,8 @@ PortMatrixColumnLabels::render_bundle_name ( set_source_rgb (cr, text_colour()); + double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height; + if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { double rl = 0; @@ -313,16 +289,16 @@ PortMatrixColumnLabels::render_bundle_name ( } cairo_move_to ( cr, - xoff + basic_text_x_pos (0) + rl * cos (angle()), - yoff + _height - rl * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()) + rl * cos (angle()), + yoff + _height - q * cos (angle ()) - rl * sin (angle()) ); } else { cairo_move_to ( cr, - xoff + basic_text_x_pos (0) + name_pad() * cos (angle ()), - yoff + slanted_height() - name_pad() * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()), + yoff + _height - q * cos (angle ()) ); } @@ -353,21 +329,24 @@ PortMatrixColumnLabels::render_channel_name ( set_source_rgb (cr, text_colour()); + double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height; + if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { cairo_move_to ( cr, - xoff + basic_text_x_pos(bc.channel), - yoff + _height - name_pad() * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()), + yoff + _height - q * cos (angle ()) ); + } else { double const rl = 3 * name_pad() + _longest_bundle_name; cairo_move_to ( cr, - xoff + basic_text_x_pos(bc.channel) + rl * cos (angle ()), - yoff + slanted_height() - rl * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()) + rl * cos (angle ()), + yoff + _height - q * cos (angle ()) - rl * sin (angle()) ); } @@ -391,7 +370,7 @@ PortMatrixColumnLabels::render_channel_name ( double PortMatrixColumnLabels::channel_x (ARDOUR::BundleChannel const &bc) const { - return channel_to_position (bc, _matrix->columns()) * grid_spacing (); + return channel_to_position (bc, _matrix->visible_columns()) * grid_spacing (); } double @@ -433,7 +412,7 @@ PortMatrixColumnLabels::queue_draw_for (ARDOUR::BundleChannel const & bc) } else if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - double const x_ = x + slanted_height() / tan (angle()) - lc * cos (angle()); + double const x_ = x + _height / tan (angle()) - lc * cos (angle()); _body->queue_draw_area ( component_to_parent_x (x_) - 1, @@ -447,111 +426,65 @@ PortMatrixColumnLabels::queue_draw_for (ARDOUR::BundleChannel const & bc) } } -void -PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t) +ARDOUR::BundleChannel +PortMatrixColumnLabels::position_to_channel (double p, double o, boost::shared_ptr group) const { - uint32_t cx = 0; - uint32_t const gh = _highest_group_name + 2 * name_pad(); - - bool group_name = false; - if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - if (y > (_height - gh)) { - group_name = true; - cx = x; - } else { - cx = x - (_height - gh - y) * tan (angle ()); - } - } else { - if (y < gh) { - group_name = true; - cx = x - _overhang; - } else { - cx = x - (_height - y) * tan (angle ()); - } - } - - pair, ARDOUR::BundleChannel> gc = position_to_group_and_channel (cx / grid_spacing(), _matrix->columns()); + uint32_t const cx = p - (_height - o) * tan (angle ()); + return PortMatrixComponent::position_to_channel (cx, o, group); +} - if (b == 1) { +void +PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t, guint) +{ + ARDOUR::BundleChannel w = position_to_channel (x, y, _matrix->visible_columns()); - if (group_name && gc.first) { - gc.first->set_visible (!gc.first->visible ()); - } else if (gc.second.bundle) { - _body->highlight_associated_channels (_matrix->column_index(), gc.second); - } + if ( + (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && y > (_height - _longest_bundle_name * sin (angle ()))) || + (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && y < (_longest_bundle_name * sin (angle ()))) + ) { - } else if (b == 3) { + w.channel = -1; + } - _matrix->popup_menu ( - gc, - make_pair (boost::shared_ptr (), ARDOUR::BundleChannel ()), - t - ); + if (b == 3) { + _matrix->popup_menu ( + w, + ARDOUR::BundleChannel (), + t + ); } } void -PortMatrixColumnLabels::draw_extra (cairo_t* cr) +PortMatrixColumnLabels::motion (double x, double y) { - PortMatrixLabels::draw_extra (cr); + ARDOUR::BundleChannel const w = position_to_channel (x, y, _matrix->visible_columns()); - /* PORT GROUP NAME */ - - double x = 0; - double y = 0; - - if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - x = component_to_parent_x (slanted_height() / tan (angle())); - y = component_to_parent_y ( _highest_group_name + name_pad()); - } else { - x = component_to_parent_x (0); - y = component_to_parent_y (_height - name_pad()); + if (w.bundle == 0) { + _body->set_mouseover (PortMatrixNode ()); + return; } - int g = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { + uint32_t const bh = _longest_channel_name * sin (angle ()) + _text_height / cos (angle ()); - /* compute width of this group */ - uint32_t w = 0; - if (!(*i)->visible()) { - w = grid_spacing (); - } else { - if (_matrix->show_only_bundles()) { - w = (*i)->bundles().size() * grid_spacing(); - } else { - w = (*i)->total_channels() * grid_spacing(); - } - } + if ( + (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && y > bh) || + (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && y < (_height - bh)) + ) { - if (w == 0) { - continue; - } + /* if the mouse is over a bundle name, highlight all channels in the bundle */ + + list n; - /* rectangle */ - set_source_rgb (cr, get_a_group_colour (g)); - double const rh = _highest_group_name + 2 * name_pad(); - if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - cairo_rectangle (cr, x, component_to_parent_y (0), w, rh); - } else { - cairo_rectangle (cr, x, component_to_parent_y (_height - rh), w, rh); + for (uint32_t i = 0; i < w.bundle->nchannels(); ++i) { + ARDOUR::BundleChannel const bc (w.bundle, i); + n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc)); } - cairo_fill (cr); - - /* x area available to draw the label in (trying to keep it visible) */ - double const lx = max (x, double (_parent_rectangle.get_x ())); - double const rx = min (x + w, double (_parent_rectangle.get_width())); - - /* hence what abbreviation (or not) we need for the group name */ - string const upper = Glib::ustring ((*i)->name).uppercase (); - pair const display = fit_to_pixels (cr, upper, rx - lx); - /* plot it */ - set_source_rgb (cr, text_colour()); - cairo_move_to (cr, (lx + rx - display.second) / 2, y); - cairo_show_text (cr, display.first.c_str()); - - x += w; - ++g; + _body->set_mouseover (n); + } else { + + _body->set_mouseover (PortMatrixNode (ARDOUR::BundleChannel (), w)); } -} +}