X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=8a73d5f3854683c1b19cd7fbe70069fcac9c7af9;hb=8496f57fd49f1fd74d2c8662a91088374fb662ba;hp=9e77d0c9e733e10c24021ab2827de3b8edd80ecd;hpb=c86210a9d5bdb7b36ad58552a1f99f53d48781b3;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 9e77d0c9e7..8a73d5f385 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 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,26 +18,49 @@ */ #include -#include +#include "ardour/tempo.h" + +#include "ardour_ui.h" +/* + * ardour_ui.h include was moved to the top of the list + * due to a conflicting definition of 'Rect' between + * Apple's MacTypes.h and GTK. + */ #include "marker.h" #include "public_editor.h" #include "utils.h" #include "canvas_impl.h" -#include "ardour_ui.h" #include "simpleline.h" +#include + #include "i18n.h" +using namespace std; using namespace ARDOUR; +using namespace Gtkmm2ext; + +PBD::Signal1 Marker::CatchDeletion; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, +Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& annotation, Type type, nframes_t frame, bool handle_events) - : editor (ed), _parent(&parent), _type(type) + : editor (ed) + , _parent (&parent) + , _line_parent (&line_parent) + , _line (0) + , _type (type) + , _selected (false) + , _shown (false) + , _line_shown (false) + , _canvas_height (0) + , _color (rgba) + , _left_label_limit (DBL_MAX) + , _right_label_limit (DBL_MAX) + { double label_offset = 0; - bool annotate_left = false; /* Shapes we use: @@ -47,7 +70,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con ^ | | V (0,5) (6,5) - \ / + \ / (3,10) @@ -64,17 +87,17 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con Start: - 0,0\ - | \ + 0,0\ + | \ | \ 6,6 | / | / - 0,12 + 0,12 End: /12,0 - / | + / | / | 6,6 | \ | @@ -82,51 +105,29 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con \ | 12,12 - - TransportStart: - - 0,0 - | \ - | \ - | \ - | \ - | \ - 0,13 --- 13,13 - - TransportEnd: - - /13,0 - / | - / | - / | - / | - / | - 0,13 ------ 13,13 - - - PunchIn: + PunchIn: 0,0 ------> 13,0 | / | / | / - | / - | / - | / + | / + | / + | / 0,13 PunchOut 0,0 -->-13,0 - \ | + \ | \ | \ | \ | \ | \ | 13,13 - - + + */ switch (type) { @@ -136,11 +137,11 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (6.0, 0.0)); points->push_back (Gnome::Art::Point (6.0, 5.0)); - points->push_back (Gnome::Art::Point (3.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 5.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - - shift = 3; + points->push_back (Gnome::Art::Point (3.0, 10.0)); + points->push_back (Gnome::Art::Point (0.0, 5.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); + + _shift = 3; label_offset = 8.0; break; @@ -149,85 +150,85 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (3.0, 0.0)); - points->push_back (Gnome::Art::Point (6.0, 5.0)); - points->push_back (Gnome::Art::Point (6.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 5.0)); - points->push_back (Gnome::Art::Point (3.0, 0.0)); + points->push_back (Gnome::Art::Point (6.0, 5.0)); + points->push_back (Gnome::Art::Point (6.0, 10.0)); + points->push_back (Gnome::Art::Point (0.0, 10.0)); + points->push_back (Gnome::Art::Point (0.0, 5.0)); + points->push_back (Gnome::Art::Point (3.0, 0.0)); - shift = 3; + _shift = 3; label_offset = 8.0; break; - case Start: + case SessionStart: + case RangeStart: + points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (6.5, 6.5)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (6.5, 6.5)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 0; + _shift = 0; label_offset = 13.0; break; - case End: + case SessionEnd: + case RangeEnd: points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (6.5, 6.5)); - points->push_back (Gnome::Art::Point (13.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 13.0)); - points->push_back (Gnome::Art::Point (6.5, 6.5)); - - shift = 13; + points->push_back (Gnome::Art::Point (13.0, 0.0)); + points->push_back (Gnome::Art::Point (13.0, 13.0)); + points->push_back (Gnome::Art::Point (6.5, 6.5)); + + _shift = 13; label_offset = 6.0; - annotate_left = true; break; case LoopStart: points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - - shift = 0; + points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (13.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); + + _shift = 0; label_offset = 12.0; break; case LoopEnd: points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (13.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (13.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); points->push_back (Gnome::Art::Point (13.0, 0.0)); - - shift = 13; + + _shift = 13; label_offset = 0.0; - annotate_left = true; break; case PunchIn: points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 0.0)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (13.0, 0.0)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 0; + _shift = 0; label_offset = 13.0; break; - + case PunchOut: points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (12.0, 0.0)); - points->push_back (Gnome::Art::Point (12.0, 12.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (12.0, 0.0)); + points->push_back (Gnome::Art::Point (12.0, 12.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); - shift = 13; + _shift = 13; label_offset = 0.0; - annotate_left = true; break; - + } frame_position = frame; @@ -235,58 +236,53 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con /* adjust to properly locate the tip */ - unit_position -= shift; + unit_position -= _shift; group = new Group (parent, unit_position, 1.0); mark = new Polygon (*group); mark->property_points() = *points; - mark->property_fill_color_rgba() = rgba; - mark->property_outline_color_rgba() = rgba; + set_color_rgba (rgba); mark->property_width_pixels() = 1; - Pango::FontDescription* font = get_font_for_style (N_("MarkerText")); - //cerr << " font->get_size() = " << font->get_size() << " is_absolute = " << pango_font_description_get_size_is_absolute(font->gobj()) << " to_string = " << font->to_string() << endl; - text = new Text (*group); - text->property_font_desc() = *font; - text->property_text() = annotation.c_str(); - delete font; - - if (annotate_left) { - text->property_x() = -(text->property_text_width()); - } else { - text->property_x() = label_offset; - } - text->property_y() = 0.0; - text->property_anchor() = Gtk::ANCHOR_NW; - text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerLabel.get(); + /* setup name pixbuf sizes */ + name_font = get_font_for_style (N_("MarkerText")); + + Gtk::Label foo; + + Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ + int width; + + layout->set_font_description (*name_font); + Gtkmm2ext::get_ink_pixel_size (layout, width, name_height); + + name_pixbuf = new ArdourCanvas::Pixbuf(*group); + name_pixbuf->property_x() = label_offset; + name_pixbuf->property_y() = (13/2) - (name_height/2); - editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition)); + set_name (annotation.c_str()); + + editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); mark->set_data ("marker", this); if (handle_events) { - group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); } - line = 0; - } Marker::~Marker () { - drop_references (); + CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ - delete text; + delete name_pixbuf; delete mark; delete points; - if (line) { - delete line; - line = 0; - } + delete _line; } void Marker::reparent(ArdourCanvas::Group & parent) @@ -295,49 +291,62 @@ void Marker::reparent(ArdourCanvas::Group & parent) _parent = &parent; } +void +Marker::set_selected (bool s) +{ + _selected = s; + setup_line (); +} void -Marker::set_line_vpos (double pos, double height) +Marker::set_show_line (bool s) { - if (line) { - line->property_y1() = pos; - line->property_y2() = pos + height; - } + _line_shown = s; + setup_line (); } void -Marker::add_line (ArdourCanvas::Group* group, double y_origin, double initial_height) +Marker::setup_line () { - if (!line) { + if (_shown && (_selected || _line_shown)) { - line = new ArdourCanvas::SimpleLine (*group); - line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); - line->property_x1() = unit_position + shift; - line->property_y1() = y_origin; - line->property_x2() = unit_position + shift; - line->property_y2() = y_origin + initial_height; + if (_line == 0) { - line->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); - } + _line = new ArdourCanvas::SimpleLine (*_line_parent); + _line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); - show_line (); -} + setup_line_x (); -void -Marker::show_line () -{ - if (line) { - line->raise_to_top(); - line->show (); + _line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + } + + double yo = 0; + if (!_selected) { + /* work out where to start the line from so that it extends only as far as the mark */ + double x = 0; + _parent->i2w (x, yo); + _line_parent->w2i (x, yo); + } + + _line->property_y1() = yo + 10; + _line->property_y2() = yo + 10 + _canvas_height; + + _line->property_color_rgba() = _selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color; + _line->raise_to_top (); + _line->show (); + + } else { + if (_line) { + _line->hide (); + } } } -void -Marker::hide_line () +void +Marker::canvas_height_set (double h) { - if (line) { - line->hide (); - } + _canvas_height = h; + setup_line (); } ArdourCanvas::Item& @@ -347,63 +356,139 @@ Marker::the_item() const } void -Marker::set_name (const string& name) +Marker::set_name (const string& new_name) +{ + _name = new_name; + + setup_name_pixbuf (); +} + +/** @return true if our label is on the left of the mark, otherwise false */ +bool +Marker::label_on_left () const +{ + return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); +} + +void +Marker::setup_name_pixbuf () { - text->property_text() = name.c_str(); - if (_type == End) { - text->property_x() = -(text->property_text_width()); + double limit = DBL_MAX; + + if (label_on_left ()) { + limit = _left_label_limit; + } else { + limit = _right_label_limit; + } + + /* Work out how wide the name can be */ + int name_width = min ((double) pixel_width (_name, *name_font) + 2, limit); + if (name_width == 0) { + name_width = 1; + } + + if (label_on_left ()) { + name_pixbuf->property_x() = -name_width; } + + name_pixbuf->property_pixbuf() = pixbuf_from_string (_name, name_font, name_width, name_height, Gdk::Color ("#000000")); } void -Marker::set_position (nframes_t frame) +Marker::setup_line_x () +{ + if (_line) { + _line->property_x1() = unit_position + _shift - 0.5; + _line->property_x2() = unit_position + _shift - 0.5; + } +} + +void +Marker::set_position (framepos_t frame) { double new_unit_position = editor.frame_to_unit (frame); - new_unit_position -= shift; + new_unit_position -= _shift; group->move (new_unit_position - unit_position, 0.0); frame_position = frame; unit_position = new_unit_position; - if (line) { - line->property_x1() = unit_position + shift; - line->property_x2() = unit_position + shift; - } + setup_line_x (); } void Marker::reposition () { set_position (frame_position); -} +} void Marker::show () { - group->show(); + _shown = true; + + group->show (); + setup_line (); } void Marker::hide () { - group->hide(); + _shown = false; + + group->hide (); + setup_line (); } void -Marker::set_color_rgba (uint32_t color) +Marker::set_color_rgba (uint32_t c) { - mark->property_fill_color_rgba() = color; - mark->property_outline_color_rgba() = color; + _color = c; + mark->property_fill_color_rgba() = _color; + mark->property_outline_color_rgba() = _color; + if (_line && !_selected) { + _line->property_color_rgba() = _color; + } +} + +/** Set the number of pixels that are available for a label to the left of the centre of this marker */ +void +Marker::set_left_label_limit (double p) +{ + /* Account for the size of the marker */ + _left_label_limit = p - 13; + if (_left_label_limit < 0) { + _left_label_limit = 0; + } + + if (label_on_left ()) { + setup_name_pixbuf (); + } +} + +/** Set the number of pixels that are available for a label to the right of the centre of this marker */ +void +Marker::set_right_label_limit (double p) +{ + /* Account for the size of the marker */ + _right_label_limit = p - 13; + if (_right_label_limit < 0) { + _right_label_limit = 0; + } + + if (!label_on_left ()) { + setup_name_pixbuf (); + } } /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, +TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& text, ARDOUR::TempoSection& temp) - : Marker (editor, parent, rgba, text, Tempo, 0, false), + : Marker (editor, parent, line_parent, rgba, text, Tempo, 0, false), _tempo (temp) { set_position (_tempo.frame()); - group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this)); + group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this)); } TempoMarker::~TempoMarker () @@ -412,13 +497,13 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, - ARDOUR::MeterSection& m) - : Marker (editor, parent, rgba, text, Meter, 0, false), +MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, ArdourCanvas::Group& line_parent, guint32 rgba, const string& text, + ARDOUR::MeterSection& m) + : Marker (editor, parent, line_parent, rgba, text, Meter, 0, false), _meter (m) { set_position (_meter.frame()); - group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this)); + group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this)); } MeterMarker::~MeterMarker ()