--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="35mm"
+ height="35mm"
+ viewBox="0 0 35.000001 35"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="select.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8284271"
+ inkscape:cx="4.8524935"
+ inkscape:cy="34.228523"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="995"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-6.3144683,15.262769)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+ d="M 21.604698,2.5582203 37.559549,18.494139 c 0.739437,0.413423 1.494454,0.785898 2.673133,0.04548 0.773585,-1.191683 0.420947,-1.927565 0,-2.635791 L 24.205701,-0.15491415 c -6.5e-5,-0.0684839 -1.360739,1.61587825 -2.601003,2.71313445 z"
+ id="path5828"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+ d="M 36.6434,-0.90186321 C 26.383577,2.6511488 23.447169,6.069677 19.999778,17.261513 19.762588,18.031545 11.947724,-3.2916786 7.9848587,-13.668122 Z"
+ id="path5884"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscc" />
+ </g>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="35mm"
+ height="35mm"
+ viewBox="0 0 35.000001 35"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="zoom.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8284272"
+ inkscape:cx="-24.841773"
+ inkscape:cy="49.172909"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="995"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-6.3144683,15.262769)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+ d="M 21.219999,2.4159489 37.174851,18.351868 c 0.739437,0.413423 1.494454,0.785898 2.673133,0.04548 0.773585,-1.191683 0.420947,-1.927565 0,-2.635791 L 23.821002,-0.29718512 c -6.5e-5,-0.06848 -1.360739,1.61587802 -2.601003,2.71313402 z"
+ id="path5828-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <ellipse
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+ id="path5809"
+ cx="20.144106"
+ cy="-1.0881108"
+ rx="12.398235"
+ ry="12.398153" />
+ </g>
+</svg>
# Splash screen (all platforms)
$INKSCAPE splash.png src/splash.svg -w 400 -h 300
+ # Timeline toolbar icons (all platforms)
+ $INKSCAPE select.png src/select.svg -w 24 -h 24
+ $INKSCAPE zoom.png src/zoom.svg -w 24 -h 24
+
# favicon
mkdir -p web
convert src/web.png -resize 256x256 -transparent white web/favicon-256x256.png
if not bld.env.TARGET_WINDOWS:
bld.install_as('${PREFIX}/share/dcpomatic2/dcpomatic2_server_small.png', 'linux/16/dcpomatic2.png')
bld.install_files('${PREFIX}/share/dcpomatic2', 'splash.png')
+ bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom.png')
+ bld.install_files('${PREFIX}/share/dcpomatic2', 'select.png')
/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using std::list;
using std::cout;
+using std::min;
using std::max;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
- : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
+ : wxScrolledCanvas (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _content_panel (cp)
, _film (film)
, _time_axis_view (new TimelineTimeAxisView (*this, 64))
, _first_move (false)
, _menu (this)
, _snap (true)
+ , _tool (SELECT)
+ , _x_scroll_rate (16)
+ , _y_scroll_rate (16)
{
#ifndef __WXOSX__
SetDoubleBuffered (true);
film_changed (Film::CONTENT);
- SetMinSize (wxSize (640, tracks() * track_height() + 96));
+ SetMinSize (wxSize (640, 4 * track_height() + 96));
_tracks_position = Position<int> (_labels_view->bbox().width, 32);
_film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1));
_film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2, _3));
+
+ _pixels_per_second = max (0.01, static_cast<double>(640 - tracks_position().x * 2) / film->length().seconds ());
+
+ setup_scrollbars ();
+ EnableScrolling (true, true);
}
void
Timeline::paint ()
{
wxPaintDC dc (this);
+ DoPrepareDC (dc);
wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
if (!gc) {
return;
}
+ int vsx, vsy;
+ GetViewStart (&vsx, &vsy);
+ gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate);
+
gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
shared_ptr<TimelineContentView> ic = dynamic_pointer_cast<TimelineContentView> (i);
- /* Find areas of overlap */
+ /* Find areas of overlap with other content views, so that we can plot them */
list<dcpomatic::Rect<int> > overlaps;
BOOST_FOREACH (shared_ptr<TimelineView> j, _views) {
shared_ptr<TimelineContentView> jc = dynamic_pointer_cast<TimelineContentView> (j);
i->paint (gc, overlaps);
}
+ if (_zoom_point) {
+ /* Translate back as _down_point and _zoom_point do not take scroll into account */
+ gc->Translate (vsx * _x_scroll_rate, vsy * _y_scroll_rate);
+ gc->SetPen (*wxBLACK_PEN);
+ gc->SetBrush (*wxTRANSPARENT_BRUSH);
+ gc->DrawRectangle (
+ min (_down_point.x, _zoom_point->x),
+ min (_down_point.y, _zoom_point->y),
+ fabs (_down_point.x - _zoom_point->x),
+ fabs (_down_point.y - _zoom_point->y)
+ );
+ }
+
delete gc;
}
}
assign_tracks ();
- setup_pixels_per_second ();
+ setup_scrollbars ();
Refresh ();
}
if (property == AudioContentProperty::STREAMS) {
recreate_views ();
} else if (!frequent) {
- setup_pixels_per_second ();
+ setup_scrollbars ();
Refresh ();
}
}
}
void
-Timeline::setup_pixels_per_second ()
+Timeline::setup_scrollbars ()
{
shared_ptr<const Film> film = _film.lock ();
- if (!film || film->length() == DCPTime ()) {
+ if (!film || !_pixels_per_second) {
return;
}
-
- _pixels_per_second = static_cast<double>(width() - tracks_position().x * 2) / film->length().seconds ();
+ SetVirtualSize (*_pixels_per_second * film->length().seconds(), tracks() * track_height() + 96);
+ SetScrollRate (_x_scroll_rate, _y_scroll_rate);
}
shared_ptr<TimelineView>
void
Timeline::left_down (wxMouseEvent& ev)
+{
+ _left_down = true;
+ _down_point = ev.GetPosition ();
+
+ switch (_tool) {
+ case SELECT:
+ left_down_select (ev);
+ break;
+ case ZOOM:
+ /* Nothing to do */
+ break;
+ }
+}
+
+void
+Timeline::left_down_select (wxMouseEvent& ev)
{
shared_ptr<TimelineView> view = event_to_view (ev);
shared_ptr<TimelineContentView> content_view = dynamic_pointer_cast<TimelineContentView> (view);
content_view->set_selected (!content_view->selected ());
}
- _left_down = true;
- _down_point = ev.GetPosition ();
_first_move = false;
if (_down_view) {
{
_left_down = false;
+ switch (_tool) {
+ case SELECT:
+ left_up_select (ev);
+ break;
+ case ZOOM:
+ left_up_zoom (ev);
+ break;
+ }
+}
+
+void
+Timeline::left_up_select (wxMouseEvent& ev)
+{
if (_down_view) {
_down_view->content()->set_change_signals_frequent (false);
}
/* Clear up up the stuff we don't do during drag */
assign_tracks ();
- setup_pixels_per_second ();
+ setup_scrollbars ();
Refresh ();
_start_snaps.clear ();
_end_snaps.clear ();
}
+void
+Timeline::left_up_zoom (wxMouseEvent& ev)
+{
+ _zoom_point = ev.GetPosition ();
+
+ int vsx, vsy;
+ GetViewStart (&vsx, &vsy);
+
+ wxPoint top_left(min(_down_point.x, _zoom_point->x), min(_down_point.y, _zoom_point->y));
+ wxPoint bottom_right(max(_down_point.x, _zoom_point->x), max(_down_point.y, _zoom_point->y));
+
+ DCPTime time_left = DCPTime::from_seconds((top_left.x + vsx - _tracks_position.x) / *_pixels_per_second);
+ DCPTime time_right = DCPTime::from_seconds((bottom_right.x + vsx - _tracks_position.x) / *_pixels_per_second);
+ _pixels_per_second = GetSize().GetWidth() / (time_right.seconds() - time_left.seconds());
+ cout << "Zoom range " << to_string(time_left) << " " << to_string(time_right) << " " << *_pixels_per_second << "\n";
+ setup_scrollbars ();
+ Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, wxDefaultCoord);
+ cout << "Offset " << (time_left.seconds() * *_pixels_per_second / _x_scroll_rate) << "\n";
+
+ _zoom_point = optional<wxPoint> ();
+ Refresh ();
+}
+
void
Timeline::mouse_moved (wxMouseEvent& ev)
+{
+ switch (_tool) {
+ case SELECT:
+ mouse_moved_select (ev);
+ break;
+ case ZOOM:
+ mouse_moved_zoom (ev);
+ break;
+ }
+}
+
+void
+Timeline::mouse_moved_select (wxMouseEvent& ev)
{
if (!_left_down) {
return;
set_position_from_event (ev);
}
+void
+Timeline::mouse_moved_zoom (wxMouseEvent& ev)
+{
+ if (!_left_down) {
+ return;
+ }
+
+ _zoom_point = ev.GetPosition ();
+ Refresh ();
+}
+
void
Timeline::right_down (wxMouseEvent& ev)
+{
+ switch (_tool) {
+ case SELECT:
+ right_down_select (ev);
+ break;
+ case ZOOM:
+ /* Zoom out */
+ _pixels_per_second = *_pixels_per_second / 2;
+ setup_scrollbars ();
+ break;
+ }
+}
+
+void
+Timeline::right_down_select (wxMouseEvent& ev)
{
shared_ptr<TimelineView> view = event_to_view (ev);
shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (view);
void
Timeline::resized ()
{
- setup_pixels_per_second ();
+ setup_scrollbars ();
}
void
class TimelineReelsView;
class TimelineLabelsView;
-class Timeline : public wxPanel
+class Timeline : public wxScrolledCanvas
{
public:
Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
void force_redraw (dcpomatic::Rect<int> const &);
int width () const {
- return GetSize().GetWidth ();
+ return GetVirtualSize().GetWidth ();
}
int track_height () const {
int tracks () const;
- void setup_pixels_per_second ();
-
void set_snap (bool s) {
_snap = s;
}
void set_selection (ContentList selection);
+ enum Tool {
+ SELECT,
+ ZOOM
+ };
+
+ void set_tool (Tool t) {
+ _tool = t;
+ }
+
private:
void paint ();
void left_down (wxMouseEvent &);
+ void left_down_select (wxMouseEvent &);
void left_up (wxMouseEvent &);
+ void left_up_select (wxMouseEvent &);
+ void left_up_zoom (wxMouseEvent &);
void right_down (wxMouseEvent &);
+ void right_down_select (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
+ 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 set_position_from_event (wxMouseEvent &);
void clear_selection ();
void recreate_views ();
+ void setup_scrollbars ();
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
boost::optional<double> _pixels_per_second;
bool _left_down;
wxPoint _down_point;
+ boost::optional<wxPoint> _zoom_point;
boost::shared_ptr<TimelineContentView> _down_view;
DCPTime _down_view_position;
bool _first_move;
std::list<DCPTime> _start_snaps;
std::list<DCPTime> _end_snaps;
Position<int> _tracks_position;
+ Tool _tool;
+ int _x_scroll_rate;
+ int _y_scroll_rate;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _film_content_changed_connection;
/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include <list>
-#include <wx/graphics.h>
-#include "lib/playlist.h"
#include "film_editor.h"
#include "timeline_dialog.h"
#include "wx_util.h"
#include "content_panel.h"
+#include "lib/playlist.h"
+#include "lib/cross.h"
+#include <wx/graphics.h>
#include <iostream>
+#include <list>
using std::list;
using std::cout;
controls->Add (_snap);
_sequence = new wxCheckBox (this, wxID_ANY, _("Keep video and subtitles in sequence"));
controls->Add (_sequence, 1, wxLEFT, 12);
+ wxToolBar* toolbar = new wxToolBar (this, wxID_ANY);
+
+#ifdef DCPOMATIC_LINUX
+ wxBitmap select (wxString::Format (wxT ("%s/select.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom (wxString::Format (wxT ("%s/zoom.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
+ toolbar->AddRadioTool ((int) Timeline::SELECT, _("Select"), select);
+ toolbar->AddRadioTool ((int) Timeline::ZOOM, _("Zoom"), zoom);
+ controls->Add (toolbar);
+ toolbar->Bind (wxEVT_TOOL, bind (&TimelineDialog::tool_changed, this, _1));
sizer->Add (controls, 0, wxALL, 12);
sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
{
_timeline.set_selection (selection);
}
+
+void
+TimelineDialog::tool_changed (wxCommandEvent& ev)
+{
+ _timeline.set_tool ((Timeline::Tool) ev.GetId());
+}
void snap_toggled ();
void sequence_toggled ();
void film_changed (Film::Property);
+ void tool_changed (wxCommandEvent& id);
boost::weak_ptr<Film> _film;
Timeline _timeline;
projects / dcpomatic.git / commitdiff
