projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
y zoom.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 8f23f68941e6428a834910ac7dd988d813f6adb5..6df44372b0664ad918b7968a9f931e6631b52532 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-1,69
+1,63
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2015
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/>.
*/
*/
+#include "content_menu.h"
+#include "timeline_content_view.h"
+#include "lib/util.h"
+#include "lib/rect.h"
+#include "lib/film.h"
+#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/signals2.hpp>
-#include <wx/wx.h>
-#include "lib/util.h"
-#include "lib/rect.h"
-#include "content_menu.h"
class Film;
class Film;
-class View;
-class ContentView;
-class FilmEditor;
-class TimeAxisView;
+class ContentPanel;
+class TimelineView;
+class TimelineTimeAxisView;
+class TimelineReelsView;
+class TimelineLabelsView;
class Timeline : public wxPanel
{
public:
class Timeline : public wxPanel
{
public:
- Timeline (wxWindow *,
FilmEditor
*, boost::shared_ptr<Film>);
+ Timeline (wxWindow *,
ContentPanel
*, boost::shared_ptr<Film>);
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 ();
+ return Get
Virtual
Size().GetWidth ();
}
int track_height () const {
}
int track_height () const {
- return
48
;
+ return
_track_height
;
}
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;
}
@@
-72,40
+66,69
@@
public:
return _snap;
}
return _snap;
}
+ void set_selection (ContentList selection);
+
+ enum Tool {
+ SELECT,
+ ZOOM
+ };
+
+ void set_tool (Tool t) {
+ _tool = t;
+ }
+
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 playlist_changed ();
- void playlist_content_changed (int);
+ void mouse_moved_select (wxMouseEvent &);
+ void mouse_moved_zoom (wxMouseEvent &);
+ void film_changed (Film::Property);
+ void film_content_changed (int, bool frequent);
void resized ();
void assign_tracks ();
void set_position_from_event (wxMouseEvent &);
void clear_selection ();
void resized ();
void assign_tracks ();
void set_position_from_event (wxMouseEvent &);
void clear_selection ();
+ void recreate_views ();
+ void setup_scrollbars ();
- typedef std::vector<boost::shared_ptr<View> > ViewList;
- typedef std::vector<boost::shared_ptr<ContentView> > ContentViewList;
-
- boost::shared_ptr<View> event_to_view (wxMouseEvent &);
- ContentViewList selected_views () const;
+ boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+ TimelineContentViewList selected_views () const;
ContentList selected_content () const;
ContentList selected_content () const;
+ void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
- FilmEditor* _film_editor;
+ wxPanel* _labels_panel;
+ wxScrolledCanvas* _main_canvas;
+ ContentPanel* _content_panel;
boost::weak_ptr<Film> _film;
boost::weak_ptr<Film> _film;
- ViewList _views;
- boost::shared_ptr<TimeAxisView> _time_axis_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::shared_ptr<ContentView> _down_view;
+ boost::optional<wxPoint> _zoom_point;
+ boost::shared_ptr<TimelineContentView> _down_view;
DCPTime _down_view_position;
bool _first_move;
ContentMenu _menu;
bool _snap;
DCPTime _down_view_position;
bool _first_move;
ContentMenu _menu;
bool _snap;
-
- boost::signals2::scoped_connection _playlist_changed_connection;
- boost::signals2::scoped_connection _playlist_content_changed_connection;
+ std::list<DCPTime> _start_snaps;
+ std::list<DCPTime> _end_snaps;
+ Tool _tool;
+ int _x_scroll_rate;
+ int _y_scroll_rate;
+ int _track_height;
+
+ boost::signals2::scoped_connection _film_changed_connection;
+ boost::signals2::scoped_connection _film_content_changed_connection;
};
};