}
y1 = br.bottom() - (m_keyframeDefault - m_keyframeOffset) * maxh;
QLineF l(x1, y1, x2, y1);
- QLineF l2 = painter->matrix().map(l);
+ QLineF l2 = painter->worldTransform().map(l);
painter->setPen(QColor(168, 168, 168, 180));
painter->drawLine(l2);
painter->setPen(QColor(108, 108, 108, 180));
// make sure line begins with clip beginning
if (!limitedKeyFrames && i.key() != start) {
QLineF l(br.x(), y1, x1, y1);
- l2 = painter->matrix().map(l);
+ l2 = painter->worldTransform().map(l);
painter->drawLine(l2);
}
while (i != m_keyframes.constEnd()) {
y2 = br.bottom() - (i.value() - m_keyframeOffset) * maxh;
}
QLineF l(x1, y1, x2, y2);
- l2 = painter->matrix().map(l);
+ l2 = painter->worldTransform().map(l);
painter->drawLine(l2);
if (active) {
const QRectF frame(l2.x1() - 3, l2.y1() - 3, 6, 6);
// make sure line ends at clip end
if (!limitedKeyFrames && x1 != br.right()) {
QLineF l(x1, y1, br.right(), y1);
- painter->drawLine(painter->matrix().map(l));
+ painter->drawLine(painter->worldTransform().map(l));
}
if (active && m_keyframes.count() > 1) {
if (isSelected() || (parentItem() && parentItem()->isSelected())) {
paintColor = paintColor.darker();
framePen.setColor(Qt::red);
- framePen.setWidth(2);
+ framePen.setWidthF(2.0);
}
else {
framePen.setColor(paintColor.darker());
}
const QRectF exposed = option->exposedRect;
- painter->fillRect(exposed, paintColor);
painter->setClipRect(exposed);
- painter->setMatrixEnabled(false);
- const QRectF mapped = painter->matrix().mapRect(rect()).adjusted(0, 0, 1.0, 0.5);
+ painter->fillRect(exposed, paintColor);
+ painter->setWorldMatrixEnabled(false);;
+ const QRectF mapped = painter->worldTransform().mapRect(rect());
// draw thumbnails
if (KdenliveSettings::videothumbnails() && !isAudioOnly()) {
QPen pen = painter->pen();
}
// if we are in full zoom, paint thumbnail for every frame
- if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && painter->matrix().m11() == FRAME_SIZE) {
+ if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && painter->worldTransform().m11() == FRAME_SIZE) {
int offset = (m_info.startPos - m_info.cropStart).frames(m_fps);
int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset);
int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset);
mappedRect.setTop(mappedRect.bottom() - mapped.height() / 2);
} else mappedRect = mapped;
- double scale = painter->matrix().m11();
+ double scale = painter->worldTransform().m11();
int channels = 0;
if (isEnabled() && m_clip) channels = m_clip->getProperty("channels").toInt();
if (scale != m_framePixelWidth)
m_audioThumbCachePic.clear();
double cropLeft = m_info.cropStart.frames(m_fps);
const int clipStart = mappedRect.x();
- const int mappedStartPixel = painter->matrix().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart;
- const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart;
+ const int mappedStartPixel = painter->worldTransform().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart;
+ const int mappedEndPixel = painter->worldTransform().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart;
cropLeft = cropLeft * scale;
if (channels >= 1) {
if (pos > GenTime()) {
if (pos > cropDuration()) break;
QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom());
- QLineF l2 = painter->matrix().map(l);
+ QLineF l2 = painter->worldTransform().map(l);
painter->setPen(pen);
painter->drawLine(l2);
if (KdenliveSettings::showmarkers()) {
framepos = rect().x() + pos.frames(m_fps);
const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10);
- const QRectF r2 = painter->matrix().mapRect(r1);
+ const QRectF r2 = painter->worldTransform().mapRect(r1);
const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' ');
painter->setBrush(markerBrush);
painter->setPen(Qt::NoPen);
fadeInPath.lineTo(0, rect().height());
fadeInPath.lineTo(m_startFade, 0);
fadeInPath.closeSubpath();
- QPainterPath f1 = painter->matrix().map(fadeInPath);
+ QPainterPath f1 = painter->worldTransform().map(fadeInPath);
painter->fillPath(f1/*.intersected(resultClipPath)*/, fades);
/*if (isSelected()) {
QLineF l(m_startFade * scale, 0, 0, itemHeight);
fadeOutPath.lineTo(rect().width(), rect().height());
fadeOutPath.lineTo(rect().width() - m_endFade, 0);
fadeOutPath.closeSubpath();
- QPainterPath f1 = painter->matrix().map(fadeOutPath);
+ QPainterPath f1 = painter->worldTransform().map(fadeOutPath);
painter->fillPath(f1/*.intersected(resultClipPath)*/, fades);
/*if (isSelected()) {
QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight);
painter->setClipping(false);
painter->setPen(framePen);
if (isSelected() || (parentItem() && parentItem()->isSelected())) {
- painter->drawRect(mapped.adjusted(1.0, 0.5, -1.5, -0.5));
+ painter->drawRect(mapped.adjusted(0.5, 0.5, -0.5, -0.5));
}
else {
- painter->drawRect(mapped.adjusted(0, 0.5, -0.5, -0.5));
+ painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5));
}
}
m_info.cropStart = GenTime();
m_maxDuration = GenTime(600);
- if (m_automaticTransition) setBrush(QColor(200, 200, 50, 100));
- else setBrush(QColor(200, 100, 50, 100));
+ if (m_automaticTransition) setBrush(QColor(200, 200, 50, 180));
+ else setBrush(QColor(200, 100, 50, 180));
//m_referenceClip = clipa;
if (params.isNull()) {
m_automaticTransition = automatic;
if (automatic) {
m_parameters.setAttribute("automatic", 1);
- setBrush(QColor(200, 200, 50, 150));
+ setBrush(QColor(200, 200, 50, 180));
} else {
m_parameters.removeAttribute("automatic");
- setBrush(QColor(200, 50, 50, 150));
+ setBrush(QColor(200, 100, 50, 180));
}
update();
}
painter->setClipRect(exposed);
const QRectF br = rect();
QPen framePen;
- const QRectF mapped = painter->matrix().mapRect(br);
+ const QRectF mapped = painter->worldTransform().mapRect(br);
painter->fillRect(exposed, brush());
QPointF p1(br.x(), br.y() + br.height() / 2 - 7);
- painter->setMatrixEnabled(false);
+ painter->setWorldMatrixEnabled(false);
const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString());
// Draw clip name
// Draw frame
painter->setPen(framePen);
painter->setClipping(false);
- painter->drawRect(mapped.adjusted(1.0, 0, -1.0, 0));
+ painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5));
}
int Transition::type() const