created enum for more node data types
This commit is contained in:
+2
-2
@@ -244,7 +244,7 @@ void GraphView::paintEvent(QPaintEvent *) {
|
||||
for (int i=row->FieldCount()-1;i>=0;i--) {
|
||||
EffectField* field = row->Field(i);
|
||||
|
||||
if (field->type() == EffectField::EFFECT_FIELD_DOUBLE && field_visibility.at(i)) {
|
||||
if (field->type() == olive::nodes::kFloat && field_visibility.at(i)) {
|
||||
// sort keyframes by time
|
||||
QVector<int> sorted_keys = sort_keys_from_field(field);
|
||||
|
||||
@@ -386,7 +386,7 @@ void GraphView::mousePressEvent(QMouseEvent *event) {
|
||||
} else {
|
||||
for (int i=0;i<row->FieldCount();i++) {
|
||||
EffectField* field = row->Field(i);
|
||||
if (field->type() == EffectField::EFFECT_FIELD_DOUBLE && field_visibility.at(i)) {
|
||||
if (field->type() == olive::nodes::kFloat && field_visibility.at(i)) {
|
||||
for (int j=0;j<field->keyframes.size();j++) {
|
||||
const EffectKeyframe& key = field->keyframes.at(j);
|
||||
int key_x = get_screen_x(key.time);
|
||||
|
||||
+9
-2
@@ -1,6 +1,7 @@
|
||||
#include "nodeview.h"
|
||||
|
||||
#include <QWheelEvent>
|
||||
#include <QScrollBar>
|
||||
#include <QDebug>
|
||||
|
||||
NodeView::NodeView(QGraphicsScene *scene, QWidget *parent) :
|
||||
@@ -27,8 +28,14 @@ void NodeView::mousePressEvent(QMouseEvent *event)
|
||||
void NodeView::mouseMoveEvent(QMouseEvent *event)
|
||||
{
|
||||
if (hand_moving_) {
|
||||
QPointF scene_delta = mapToScene(event->pos() - drag_start_) - mapToScene(0.0, 0.0);
|
||||
emit ScrollChanged(scene_delta.x(), scene_delta.y());
|
||||
//QPointF scene_delta = mapToScene(event->pos() - drag_start_) - mapToScene(0.0, 0.0);
|
||||
//emit ScrollChanged(scene_delta.x(), scene_delta.y());
|
||||
|
||||
QPoint delta = event->pos() - drag_start_;
|
||||
|
||||
horizontalScrollBar()->setValue(horizontalScrollBar()->value() + delta.x());
|
||||
verticalScrollBar()->setValue(verticalScrollBar()->value() + delta.y());
|
||||
|
||||
drag_start_ = event->pos();
|
||||
} else {
|
||||
QGraphicsView::mouseMoveEvent(event);
|
||||
|
||||
@@ -8,9 +8,6 @@ class NodeView : public QGraphicsView {
|
||||
public:
|
||||
NodeView(QGraphicsScene *scene, QWidget* parent = nullptr);
|
||||
|
||||
signals:
|
||||
void ScrollChanged(qreal x, qreal y);
|
||||
|
||||
protected:
|
||||
virtual void mousePressEvent(QMouseEvent *event) override;
|
||||
virtual void mouseMoveEvent(QMouseEvent *event) override;
|
||||
|
||||
Reference in New Issue
Block a user