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

backend for marker drawing (#123)

Browse Source
This commit is contained in:
itsmattkc
2018-09-24 22:21:59 +10:00
parent b88468f9e3
commit 7c0f60df43
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/sequence.cpp
+2 -1
View File
@@ -10,7 +10,8 @@ Sequence::Sequence() :
using_workarea(false), using_workarea(false),
workarea_in(0), workarea_in(0),
workarea_out(0) workarea_out(0)
{} {
}
Sequence::~Sequence() { Sequence::~Sequence() {
// dealloc all clips // dealloc all clips
ui/timelineheader.cpp
+18 -2
View File
@@ -15,6 +15,8 @@
#define CLICK_RANGE 5 #define CLICK_RANGE 5
#define PLAYHEAD_SIZE 6 #define PLAYHEAD_SIZE 6
#define LINE_MIN_PADDING 50
#define MARKER_SIZE 4
TimelineHeader::TimelineHeader(QWidget *parent) : QWidget(parent), dragging(false), resizing_workarea(false), zoom(1), in_visible(0), snapping(true), fm(font()) { TimelineHeader::TimelineHeader(QWidget *parent) : QWidget(parent), dragging(false), resizing_workarea(false), zoom(1), in_visible(0), snapping(true), fm(font()) {
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
@@ -120,8 +122,6 @@ void TimelineHeader::update_header(double z) {
update(); update();
} }
#define LINE_MIN_PADDING 50
void TimelineHeader::paintEvent(QPaintEvent*) { void TimelineHeader::paintEvent(QPaintEvent*) {
if (sequence != NULL) { if (sequence != NULL) {
QPainter p(this); QPainter p(this);
@@ -185,6 +185,22 @@ void TimelineHeader::paintEvent(QPaintEvent*) {
p.drawLine(out_x, 0, out_x, height()); p.drawLine(out_x, 0, out_x, height());
} }
// draw markers
for (int i=0;i<sequence->markers.size();i++) {
const Marker& m = sequence->markers.at(i);
int marker_x = getScreenPointFromFrame(zoom, 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)
};
p.setPen(Qt::black);
p.setBrush(QColor(128, 224, 128));
p.drawPolygon(points, 5);
}
// draw playhead triangle // draw playhead triangle
in_x = getScreenPointFromFrame(zoom, sequence->playhead - in_visible); in_x = getScreenPointFromFrame(zoom, sequence->playhead - in_visible);
QPoint start(in_x, height()+2); QPoint start(in_x, height()+2);