diff --git a/src/assets/view/widgets/keyframewidget.hpp b/src/assets/view/widgets/keyframewidget.hpp --- a/src/assets/view/widgets/keyframewidget.hpp +++ b/src/assets/view/widgets/keyframewidget.hpp @@ -21,7 +21,6 @@ #define KEYFRAMEWIDGET_H #include "abstractparamwidget.hpp" - #include "definitions.h" #include #include @@ -35,6 +34,7 @@ class QToolButton; class TimecodeDisplay; class KSelectAction; +class Monitor; class KeyframeWidget : public AbstractParamWidget { @@ -50,6 +50,7 @@ void addKeyframe(int pos = -1); void updateTimecodeFormat(); + const QString getValue() const; void slotSetRange(QPair range) override; void slotRefresh() override; @@ -63,17 +64,23 @@ void monitorSeek(int pos); void slotEditKeyframeType(QAction *action); +signals: + void valueChanged(const QString val); + private: QVBoxLayout *m_lay; + Monitor *m_monitor; std::shared_ptr m_keyframes; - + QSize m_defaultSize; + KeyframeView *m_keyframeview; QToolButton *m_buttonAddDelete; QToolButton *m_buttonPrevious; QToolButton *m_buttonNext; KSelectAction *m_selectType; TimecodeDisplay *m_time; - + DoubleWidget *m_rotationWidget; + void connectMonitor(bool active); std::unordered_map m_parameters; }; diff --git a/src/assets/view/widgets/keyframewidget.cpp b/src/assets/view/widgets/keyframewidget.cpp --- a/src/assets/view/widgets/keyframewidget.cpp +++ b/src/assets/view/widgets/keyframewidget.cpp @@ -36,6 +36,7 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr model, QModelIndex index, QWidget *parent) : AbstractParamWidget(model, index, parent) + , m_rotationWidget(nullptr) { m_keyframes = model->getKeyframeModel(); @@ -63,7 +64,8 @@ m_buttonNext->setAutoRaise(true); m_buttonNext->setIcon(KoIconUtils::themedIcon(QStringLiteral("media-skip-forward"))); m_buttonNext->setToolTip(i18n("Go to next keyframe")); - + m_defaultSize = pCore->getCurrentFrameSize(); + // Keyframe type widget m_selectType = new KSelectAction(KoIconUtils::themedIcon(QStringLiteral("keyframes")), i18n("Keyframe interpolation"), this); QAction *linear = new QAction(KoIconUtils::themedIcon(QStringLiteral("linear")), i18n("Linear"), this); @@ -272,6 +274,16 @@ doubleWidget->factor = factor; connect(doubleWidget, &DoubleWidget::valueChanged, [this, index](double v) { m_keyframes->updateKeyframe(GenTime(getPosition(), pCore->getCurrentFps()), QVariant(v), index); }); + if (m_model->data(index, AssetParameterModel::NameRole).toString() == QLatin1String("rotation")) { + m_rotationWidget = doubleWidget; + qDebug()<<"/// FOUND ROTATION PARAMETER; CONNECTING"; + Monitor *monitor = pCore->getMonitor(m_model->monitorId); + connect(monitor, &Monitor::angleChanged, + [this, doubleWidget] (const double &angle) { + doubleWidget->setValue(angle); + doubleWidget->valueChanged(angle); + }); + } paramWidget = doubleWidget; } if (paramWidget) { diff --git a/src/monitor/monitor.h b/src/monitor/monitor.h --- a/src/monitor/monitor.h +++ b/src/monitor/monitor.h @@ -343,6 +343,8 @@ void extractZone(const QString &id); void effectChanged(const QRect &); void effectPointsChanged(const QVariantList &); + void opacityChanged(double); + void angleChanged(double); void addKeyframe(); void deleteKeyframe(); void seekToNextKeyframe(); diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp --- a/src/monitor/monitor.cpp +++ b/src/monitor/monitor.cpp @@ -171,6 +171,8 @@ m_qmlManager = new QmlManager(m_glMonitor); connect(m_qmlManager, &QmlManager::effectChanged, this, &Monitor::effectChanged); connect(m_qmlManager, &QmlManager::effectPointsChanged, this, &Monitor::effectPointsChanged); + connect(m_qmlManager, &QmlManager::opacityChanged, this, &Monitor::opacityChanged); + connect(m_qmlManager, &QmlManager::angleChanged, this, &Monitor::angleChanged); auto *monitorEventEater = new QuickMonitorEventEater(this); m_glWidget->installEventFilter(monitorEventEater); diff --git a/src/monitor/qmlmanager.h b/src/monitor/qmlmanager.h --- a/src/monitor/qmlmanager.h +++ b/src/monitor/qmlmanager.h @@ -56,10 +56,14 @@ void effectRectChanged(); void effectPolygonChanged(); void effectRotoChanged(); + void effectOpacityChanged(); + void effectRotationChanged(); signals: void effectChanged(const QRect &); void effectPointsChanged(const QVariantList &); + void opacityChanged(const double &); + void angleChanged(const double &); }; #endif diff --git a/src/monitor/qmlmanager.cpp b/src/monitor/qmlmanager.cpp --- a/src/monitor/qmlmanager.cpp +++ b/src/monitor/qmlmanager.cpp @@ -66,6 +66,8 @@ root = m_view->rootObject(); QObject::connect(root, SIGNAL(effectChanged()), this, SLOT(effectRectChanged()), Qt::UniqueConnection); QObject::connect(root, SIGNAL(centersChanged()), this, SLOT(effectPolygonChanged()), Qt::UniqueConnection); + QObject::connect(root, SIGNAL(opacityChanged(double)), this, SIGNAL(opacityChanged(double)), Qt::UniqueConnection); + QObject::connect(root, SIGNAL(angleChanged(double)), this, SIGNAL(angleChanged(double)), Qt::UniqueConnection); root->setProperty("profile", QPoint(profile.width(), profile.height())); root->setProperty("framesize", QRect(0, 0, profile.width(), profile.height())); root->setProperty("scalex", (double)displayRect.width() / profile.width() * zoom); @@ -154,3 +156,21 @@ } emit effectPointsChanged(mix); } + +void QmlManager::effectOpacityChanged() +{ + if (!m_view->rootObject()) { + return; + } + const double opacityValue = m_view->rootObject()->property("opacity").toReal(); + emit opacityChanged(opacityValue); +} + +void QmlManager::effectRotationChanged() +{ + if (!m_view->rootObject()) { + return; + } + const double rotationValue = m_view->rootObject()->property("rotation").toReal(); + emit angleChanged(rotationValue); +} diff --git a/src/monitor/view/OpacitySlider.qml b/src/monitor/view/OpacitySlider.qml new file mode 100644 --- /dev/null +++ b/src/monitor/view/OpacitySlider.qml @@ -0,0 +1,22 @@ +import QtQuick.Controls 1.3 +import QtQuick.Controls.Styles 1.3 +import QtQuick 2.0 + +Item { + id: opacity + objectName: "opacity" + + Row { + Slider { + id: opacitySlider + objectName: "opacitySlider" + orientation: Qt.Horizontal + maximumValue: 100 + stepSize: 1 + value: 50 + onValueChanged: { + root.opacityChanged(value); + } + } + } +} diff --git a/src/monitor/view/RotationSlider.qml b/src/monitor/view/RotationSlider.qml new file mode 100644 --- /dev/null +++ b/src/monitor/view/RotationSlider.qml @@ -0,0 +1,22 @@ +import QtQuick.Controls 1.3 +import QtQuick.Controls.Styles 1.3 +import QtQuick 2.0 + +Item { + id: rotation + objectName: "rotation" + + Row { + Slider { + id: rotationSlider + objectName: "rotationSlider" + orientation: Qt.Horizontal + maximumValue: 359 + stepSize: 1 + value: 0 + onValueChanged: { + root.angleChanged(value); + } + } + } +} diff --git a/src/monitor/view/kdenlivemonitoreffectscene.qml b/src/monitor/view/kdenlivemonitoreffectscene.qml --- a/src/monitor/view/kdenlivemonitoreffectscene.qml +++ b/src/monitor/view/kdenlivemonitoreffectscene.qml @@ -36,11 +36,15 @@ property var centerPointsTypes: [] onCenterPointsChanged: canvas.requestPaint() property bool showToolbar: false + property bool showOpacity: false + property bool showRotation: false signal effectChanged() signal centersChanged() signal addKeyframe() signal seekToKeyframe() signal toolBarChanged(bool doAccept) + signal opacityChanged(double value) + signal angleChanged(double value) onZoomChanged: { effectToolBar.setZoom(root.zoom) } @@ -530,6 +534,27 @@ color: framerect.hoverColor } } + + OpacitySlider { + id: opacitySlider + anchors { + left: parent.left + top: parent.top + topMargin: 20 + leftMargin: 10 + } + } + + RotationSlider { + id: rotationSlider + anchors { + left: parent.left + top: parent.top + topMargin: 40 + leftMargin: 10 + } + } + MonitorRuler { id: clipMonitorRuler anchors { diff --git a/src/uiresources.qrc b/src/uiresources.qrc --- a/src/uiresources.qrc +++ b/src/uiresources.qrc @@ -13,6 +13,8 @@ monitor/view/SceneToolBar.qml monitor/view/EffectToolBar.qml monitor/view/MonitorRuler.qml + monitor/view/OpacitySlider.qml + monitor/view/RotationSlider.qml timeline2/view/qml/timeline.qml timeline2/view/qml/TrackHead.qml timeline2/view/qml/Track.qml diff --git a/src/widgets/geometrywidget.h b/src/widgets/geometrywidget.h --- a/src/widgets/geometrywidget.h +++ b/src/widgets/geometrywidget.h @@ -30,6 +30,7 @@ class KSelectAction; class DragValue; class Monitor; +class DoubleWidget; /** * @brief A widget for modifying numbers by dragging, using the mouse wheel or entering them with the keyboard. @@ -63,6 +64,7 @@ DragValue *m_spinHeight; DragValue *m_spinSize; DragValue *m_opacity; + DoubleWidget *m_rotationWidget; QSize m_defaultSize; QSize m_sourceSize; QAction *m_originalSize; @@ -73,6 +75,8 @@ public slots: void slotUpdateGeometryRect(const QRect r); void slotSetRange(QPair); + void slotUpdateOpacity(double); +// void slotUpdateRotation(double); private slots: void slotAdjustRectKeyframeValue(); @@ -100,6 +104,8 @@ signals: void valueChanged(const QString val); + void opacityChanged(double opacity); +// void angleChanged(double rotation); }; #endif diff --git a/src/widgets/geometrywidget.cpp b/src/widgets/geometrywidget.cpp --- a/src/widgets/geometrywidget.cpp +++ b/src/widgets/geometrywidget.cpp @@ -35,6 +35,7 @@ , m_max(range.second) , m_active(false) , m_monitor(monitor) + , m_rotationWidget(nullptr) { Q_UNUSED(useRatioLock) setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum); @@ -389,19 +390,33 @@ m_spinWidth->blockSignals(true); m_spinHeight->blockSignals(true); m_opacity->blockSignals(true); + m_spinX->setValue(r.x()); m_spinY->setValue(r.y()); m_spinWidth->setValue(r.width()); m_spinHeight->setValue(r.height()); m_opacity->setValue((int) (opacity * 100)); + m_spinX->blockSignals(false); m_spinY->blockSignals(false); m_spinWidth->blockSignals(false); m_spinHeight->blockSignals(false); m_opacity->blockSignals(false); + m_monitor->setUpEffectGeometry(r); } +void GeometryWidget::slotUpdateOpacity(double value) +{ + m_opacity->setValue(value); +} + +/*void GeometryWidget::slotUpdateRotation(double value) +{ + if(m_rotationWidget) { + m_rotationWidget->setValue(value); + } +}*/ const QString GeometryWidget::getValue() const { @@ -416,7 +431,11 @@ m_active = activate; if (activate) { m_monitor->slotShowEffectScene(MonitorSceneGeometry); + //m_monitor->setEffectSceneProperty(QStringLiteral("showRotation"), true); + m_monitor->setEffectSceneProperty(QStringLiteral("showOpacity"), true); connect(m_monitor, &Monitor::effectChanged, this, &GeometryWidget::slotUpdateGeometryRect, Qt::UniqueConnection); + connect(m_monitor, &Monitor::opacityChanged, this, &GeometryWidget::slotUpdateOpacity, Qt::UniqueConnection); + //connect(m_monitor, &Monitor::angleChanged, this, &GeometryWidget::slotUpdateRotation, Qt::UniqueConnection); QRect rect(m_spinX->value(), m_spinY->value(), m_spinWidth->value(), m_spinHeight->value()); m_monitor->setUpEffectGeometry(rect); /*double ratio = (double)m_spinWidth->value() / m_spinHeight->value(); @@ -433,6 +452,8 @@ } else { m_monitor->slotShowEffectScene(MonitorSceneDefault); disconnect(m_monitor, &Monitor::effectChanged, this, &GeometryWidget::slotUpdateGeometryRect); + disconnect(m_monitor, &Monitor::opacityChanged, this, &GeometryWidget::slotUpdateOpacity); + //disconnect(m_monitor, &Monitor::angleChanged, this, &GeometryWidget::slotUpdateRotation); } }