projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code to copy the data and hook it up to a menu item.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index e0e4dfb2a416e4b1668a151606d788ea9d1f0eb8..44a8973716bdd3dca7f3df7fe761f5fd1a019f40 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-32,40
+33,30
@@
class ContentPanel;
class TimelineView;
class TimelineTimeAxisView;
class TimelineReelsView;
class TimelineView;
class TimelineTimeAxisView;
class TimelineReelsView;
+class TimelineLabelsView;
+class FilmViewer;
class Timeline : public wxPanel
{
public:
class Timeline : public wxPanel
{
public:
- Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
+ Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>
, boost::weak_ptr<FilmViewer> viewer
);
boost::shared_ptr<const Film> film () const;
void force_redraw (dcpomatic::Rect<int> const &);
boost::shared_ptr<const Film> film () const;
void force_redraw (dcpomatic::Rect<int> const &);
- int x_offset () const {
- return 8;
- }
+ int width () const;
- int width () const {
- return GetSize().GetWidth ();
- }
-
- int track_height () const {
- return 48;
+ int pixels_per_track () const {
+ return _pixels_per_track;
}
boost::optional<double> pixels_per_second () const {
return _pixels_per_second;
}
}
boost::optional<double> pixels_per_second () const {
return _pixels_per_second;
}
- Position<int> tracks_position () const {
- return Position<int> (8, 8);
- }
-
int tracks () const;
int tracks () const;
- void setup_pixels_per_second ();
-
void set_snap (bool s) {
_snap = s;
}
void set_snap (bool s) {
_snap = s;
}
@@
-76,42
+67,81
@@
public:
void set_selection (ContentList selection);
void set_selection (ContentList selection);
+ enum Tool {
+ SELECT,
+ ZOOM,
+ ZOOM_ALL,
+ SNAP,
+ SEQUENCE
+ };
+
+ void tool_clicked (Tool t);
+
+ int tracks_y_offset () const;
+
private:
private:
- void paint ();
+ void paint_labels ();
+ void paint_main ();
void left_down (wxMouseEvent &);
void left_down (wxMouseEvent &);
+ void left_down_select (wxMouseEvent &);
void left_up (wxMouseEvent &);
void left_up (wxMouseEvent &);
+ void left_up_select (wxMouseEvent &);
+ void left_up_zoom (wxMouseEvent &);
void right_down (wxMouseEvent &);
void right_down (wxMouseEvent &);
+ void right_down_select (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
- void film_changed (Film::Property);
- void film_content_changed (int);
+ void mouse_moved_select (wxMouseEvent &);
+ void mouse_moved_zoom (wxMouseEvent &);
+ void film_change (ChangeType type, Film::Property);
+ void film_content_change (ChangeType type, int, bool frequent);
void resized ();
void assign_tracks ();
void resized ();
void assign_tracks ();
- void set_position_from_event (wxMouseEvent
&
);
+ void set_position_from_event (wxMouseEvent
& ev, bool force_emit = false
);
void clear_selection ();
void recreate_views ();
void clear_selection ();
void recreate_views ();
+ void setup_scrollbars ();
+ void scrolled (wxScrollWinEvent& ev);
+ void set_pixels_per_second (double pps);
+ void set_pixels_per_track (int h);
+ void zoom_all ();
+ void update_playhead ();
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
ContentList selected_content () const;
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
ContentList selected_content () const;
- void maybe_snap (
DCPTime a, DCPTime b, boost::optional<
DCPTime>& nearest_distance) const;
+ void maybe_snap (
dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::
DCPTime>& nearest_distance) const;
+ wxScrolledCanvas* _labels_canvas;
+ wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
boost::weak_ptr<Film> _film;
ContentPanel* _content_panel;
boost::weak_ptr<Film> _film;
+ boost::weak_ptr<FilmViewer> _viewer;
TimelineViewList _views;
boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
boost::shared_ptr<TimelineReelsView> _reels_view;
TimelineViewList _views;
boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
boost::shared_ptr<TimelineReelsView> _reels_view;
+ boost::shared_ptr<TimelineLabelsView> _labels_view;
int _tracks;
boost::optional<double> _pixels_per_second;
bool _left_down;
wxPoint _down_point;
int _tracks;
boost::optional<double> _pixels_per_second;
bool _left_down;
wxPoint _down_point;
+ boost::optional<wxPoint> _zoom_point;
boost::shared_ptr<TimelineContentView> _down_view;
boost::shared_ptr<TimelineContentView> _down_view;
- DCPTime _down_view_position;
+
dcpomatic::
DCPTime _down_view_position;
bool _first_move;
ContentMenu _menu;
bool _snap;
bool _first_move;
ContentMenu _menu;
bool _snap;
- std::list<DCPTime> _start_snaps;
- std::list<DCPTime> _end_snaps;
+ std::list<dcpomatic::DCPTime> _start_snaps;
+ std::list<dcpomatic::DCPTime> _end_snaps;
+ Tool _tool;
+ int _x_scroll_rate;
+ int _y_scroll_rate;
+ int _pixels_per_track;
+ bool _first_resize;
+ wxTimer _timer;
+
+ static double const _minimum_pixels_per_second;
+ static int const _minimum_pixels_per_track;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _film_changed_connection;
- boost::signals2::scoped_connection _film_content_change
d
_connection;
+ boost::signals2::scoped_connection _film_content_change_connection;
};
};