oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

most clip marker work completed #333

Browse Source
This commit is contained in:
itsmattkc
2019-02-01 02:53:54 +11:00
parent 0513749b9d
commit db92e5231f
11 changed files with 149 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelineheader.cpp
+11 -29
View File
@@ -20,7 +20,6 @@
#define PLAYHEAD_SIZE 6
#define LINE_MIN_PADDING 50
#define SUBLINE_MIN_PADDING 50 // TODO play with this
#define MARKER_SIZE 4
// used only if center_timeline_timecodes is FALSE
#define TEXT_PADDING_FROM_LINE 4
@@ -406,35 +405,18 @@ void TimelineHeader::paintEvent(QPaintEvent*) {
// draw markers
for (int i=0;i<viewer->seq->markers.size();i++) {
const Marker& m = viewer->seq->markers.at(i);
int marker_x = getHeaderScreenPointFromFrame(m.frame);
const QPoint points[5] = {
QPoint(marker_x, height()-1),
QPoint(marker_x + MARKER_SIZE, height() - MARKER_SIZE - 1),
QPoint(marker_x + MARKER_SIZE, yoff),
QPoint(marker_x - MARKER_SIZE, yoff),
QPoint(marker_x - MARKER_SIZE, height() - MARKER_SIZE - 1)
};
/*const QPoint points[5] = {
QPoint(marker_x, height()-1),
QPoint(marker_x + MARKER_SIZE, height() - MARKER_SIZE - 1),
QPoint(marker_x + MARKER_SIZE, yoff),
QPoint(marker_x - MARKER_SIZE, yoff),
QPoint(marker_x - MARKER_SIZE, height() - MARKER_SIZE - 1)
};*/
p.setPen(Qt::black);
bool selected = false;
for (int j=0;j<selected_markers.size();j++) {
if (selected_markers.at(j) == i) {
selected = true;
break;
}
}
if (selected) {
p.setBrush(QColor(208, 255, 208));
} else {
p.setBrush(QColor(128, 224, 128));
}
p.drawPolygon(points, 5);
bool selected = false;
for (int j=0;j<selected_markers.size();j++) {
if (selected_markers.at(j) == i) {
selected = true;
break;
}
}
draw_marker(p, marker_x, yoff, height()-1, selected, false);
}
// draw playhead triangle
ui/timelinewidget.cpp
+29
View File
@@ -1244,6 +1244,8 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
// slipping doesn't move the clips so we don't bother snapping for it
for (int i=0;i<panel_timeline->ghosts.size();i++) {
const Ghost& g = panel_timeline->ghosts.at(i);
// snap ghost's in point
if (panel_timeline->trim_target == -1 || g.trim_in) {
fm = g.old_in + frame_diff;
if (panel_timeline->snap_to_timeline(&fm, true, true, true)) {
@@ -1251,6 +1253,8 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
break;
}
}
// snap ghost's out point
if (panel_timeline->trim_target == -1 || !g.trim_in) {
fm = g.old_out + frame_diff;
if (panel_timeline->snap_to_timeline(&fm, true, true, true)) {
@@ -1258,6 +1262,19 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
break;
}
}
// if the ghost is attached to a clip, snap its markers too
if (panel_timeline->trim_target == -1 && g.clip >= 0) {
Clip* c = sequence->clips.at(g.clip);
for (int j=0;j<c->markers.size();j++) {
long marker_real_time = c->markers.at(j).frame + c->timeline_in - c->clip_in;
fm = marker_real_time + frame_diff;
if (panel_timeline->snap_to_timeline(&fm, true, true, true)) {
frame_diff = fm - marker_real_time;
break;
}
}
}
}
}
@@ -2394,6 +2411,18 @@ void TimelineWidget::paintEvent(QPaintEvent*) {
}
}
// draw clip markers
for (int j=0;j<clip->markers.size();j++) {
const Marker& m = clip->markers.at(j);
// convert marker time (in clip time) to sequence time
long marker_time = m.frame + clip->timeline_in - clip->clip_in;
int marker_x = panel_timeline->getTimelineScreenPointFromFrame(marker_time);
if (marker_x > clip_rect.x() && marker_x < clip_rect.right()) {
draw_marker(p, marker_x, clip_rect.bottom()-p.fontMetrics().height(), clip_rect.bottom(), false, false);
}
}
// draw clip transitions
draw_transition(p, clip, clip_rect, text_rect, TA_OPENING_TRANSITION);
draw_transition(p, clip, clip_rect, text_rect, TA_CLOSING_TRANSITION);