X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcornerswidget.cpp;h=20546a7900ee994918473e6834d351af69574634;hb=b6d6c25f1bd07f11a0ceaf32a3a5bcaeab367336;hp=1b9fd5dd2fa8318b0dadc46880a1fcf9e10b4645;hpb=92abe16daaa5167ca9dff9c30aae3208d8221636;p=kdenlive diff --git a/src/cornerswidget.cpp b/src/cornerswidget.cpp index 1b9fd5dd..20546a79 100644 --- a/src/cornerswidget.cpp +++ b/src/cornerswidget.cpp @@ -36,14 +36,13 @@ inline int lerp( const int a, const int b, double t ) return a + (b - a) * t; } -CornersWidget::CornersWidget(Monitor *monitor, QDomElement e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent) : +CornersWidget::CornersWidget(Monitor *monitor, const QDomElement& e, int minFrame, int maxFrame, const Timecode &tc, int activeKeyframe, QWidget* parent) : KeyframeEdit(e, minFrame, maxFrame, tc, activeKeyframe, parent), m_monitor(monitor), m_showScene(true), m_pos(0) { MonitorEditWidget *edit = monitor->getEffectEdit(); - edit->showVisibilityButton(true); m_scene = edit->getScene(); m_scene->cleanup(); @@ -57,12 +56,10 @@ CornersWidget::CornersWidget(Monitor *monitor, QDomElement e, int minFrame, int edit->addCustomButton(KIcon("insert-horizontal-rule"), i18n("Show/Hide the lines connecting the corners"), this, SLOT(slotShowLines(bool)), true, KdenliveSettings::onmonitoreffects_cornersshowlines()); - connect(edit, SIGNAL(showEdit(bool)), this, SLOT(slotShowScene(bool))); - connect(m_monitor, SIGNAL(renderPosition(int)), this, SLOT(slotCheckMonitorPosition(int))); connect(m_item, SIGNAL(changed()), this, SLOT(slotUpdateProperties())); connect(m_scene, SIGNAL(addKeyframe()), this, SLOT(slotInsertKeyframe())); - connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotUpdateItem())); + connect(keyframe_list, SIGNAL(cellChanged(int,int)), this, SLOT(slotUpdateItem())); m_scene->centerView(); } @@ -72,13 +69,11 @@ CornersWidget::~CornersWidget() delete m_item; if (m_monitor) { MonitorEditWidget *edit = m_monitor->getEffectEdit(); - edit->showVisibilityButton(false); edit->removeCustomControls(); - m_monitor->slotShowEffectScene(false); } } -void CornersWidget::addParameter(QDomElement e, int activeKeyframe) +void CornersWidget::addParameter(const QDomElement &e, int activeKeyframe) { KeyframeEdit::addParameter(e, activeKeyframe); @@ -168,20 +163,6 @@ QList CornersWidget::getPoints(QTableWidgetItem* keyframe) return points; } -void CornersWidget::slotCheckMonitorPosition(int renderPos) -{ - if (m_showScene) - emit checkMonitorPosition(renderPos); -} - -void CornersWidget::slotShowScene(bool show) -{ - m_showScene = show; - if (!m_showScene) - m_monitor->slotShowEffectScene(false); - else - slotCheckMonitorPosition(m_monitor->render->seekFramePosition()); -} void CornersWidget::slotShowLines(bool show) { @@ -242,7 +223,7 @@ void CornersWidget::slotInsertKeyframe() QPolygonF pol = m_item->polygon(); double val; - for (int i = 0; i < keyframe_list->columnCount(); i++) { + for (int i = 0; i < keyframe_list->columnCount(); ++i) { if (i < 8) { if (i % 2 == 0) val = pol.at(i / 2).x() / (double)m_monitor->render->frameRenderWidth(); @@ -265,4 +246,5 @@ void CornersWidget::slotInsertKeyframe() keyframe_list->selectRow(row); } + #include "cornerswidget.moc"