improved nodeparamview Y setting
Still not perfect, mostly due to Qt's terrible QMainWindowLayout, but ah well
This commit is contained in:
@@ -22,6 +22,8 @@
|
||||
|
||||
namespace olive {
|
||||
|
||||
#define super KeyframeViewBase
|
||||
|
||||
KeyframeView::KeyframeView(QWidget *parent) :
|
||||
KeyframeViewBase(parent),
|
||||
max_scroll_(0)
|
||||
@@ -29,6 +31,19 @@ KeyframeView::KeyframeView(QWidget *parent) :
|
||||
setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
}
|
||||
|
||||
void KeyframeView::SetElementY(const NodeConnectable::InputConnection &c, int y)
|
||||
{
|
||||
qreal scene_y = mapToScene(mapFromGlobal(QPoint(0, y))).y();
|
||||
|
||||
element_y_.insert(c, scene_y);
|
||||
|
||||
for (auto it=item_map().cbegin(); it!=item_map().cend(); it++) {
|
||||
if (it.key()->parent() == c.input && it.key()->element() == c.element) {
|
||||
it.value()->SetOverrideY(scene_y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeView::wheelEvent(QWheelEvent *event)
|
||||
{
|
||||
if (!HandleZoomFromScroll(event)) {
|
||||
@@ -42,14 +57,11 @@ void KeyframeView::SceneRectUpdateEvent(QRectF &rect)
|
||||
rect.setHeight(max_scroll_);
|
||||
}
|
||||
|
||||
void KeyframeView::AddKeyframe(NodeKeyframe* key, int y)
|
||||
KeyframeViewItem* KeyframeView::AddKeyframe(NodeKeyframe* key)
|
||||
{
|
||||
QPoint global_pt(0, y);
|
||||
QPoint local_pt = mapFromGlobal(global_pt);
|
||||
QPointF scene_pt = mapToScene(local_pt);
|
||||
|
||||
KeyframeViewItem* item = AddKeyframeInternal(key);
|
||||
item->SetOverrideY(scene_pt.y());
|
||||
KeyframeViewItem* item = super::AddKeyframe(key);
|
||||
item->SetOverrideY(element_y_.value({key->parent(), key->element()}));
|
||||
return item;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -36,15 +36,19 @@ public:
|
||||
max_scroll_ = i;
|
||||
}
|
||||
|
||||
void SetElementY(const Node::InputConnection& c, int y);
|
||||
|
||||
protected:
|
||||
virtual void wheelEvent(QWheelEvent* event) override;
|
||||
|
||||
virtual void SceneRectUpdateEvent(QRectF& rect) override;
|
||||
|
||||
public slots:
|
||||
void AddKeyframe(NodeKeyframe* key, int y);
|
||||
virtual KeyframeViewItem* AddKeyframe(NodeKeyframe* key) override;
|
||||
|
||||
private:
|
||||
QHash<Node::InputConnection, qreal> element_y_;
|
||||
|
||||
int max_scroll_;
|
||||
|
||||
};
|
||||
|
||||
@@ -72,6 +72,43 @@ void KeyframeViewBase::DeleteSelected()
|
||||
Core::instance()->undo_stack()->pushIfHasChildren(command);
|
||||
}
|
||||
|
||||
void KeyframeViewBase::AddKeyframesOfNode(Node *n)
|
||||
{
|
||||
foreach (NodeInput* i, n->inputs()) {
|
||||
AddKeyframesOfInput(i);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::AddKeyframesOfInput(NodeInput *input)
|
||||
{
|
||||
if (!input->IsKeyframable()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i=-1; i<input->ArraySize(); i++) {
|
||||
AddKeyframesOfElement(input, i);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::AddKeyframesOfElement(NodeInput *input, int element)
|
||||
{
|
||||
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
|
||||
|
||||
for (int i=0; i<tracks.size(); i++) {
|
||||
AddKeyframesOfTrack(input, element, i);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::AddKeyframesOfTrack(NodeInput *input, int element, int track)
|
||||
{
|
||||
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
|
||||
const NodeKeyframeTrack& t = tracks.at(track);
|
||||
|
||||
foreach (NodeKeyframe* key, t) {
|
||||
AddKeyframe(key);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::RemoveKeyframesOfNode(Node *n)
|
||||
{
|
||||
foreach (NodeInput* i, n->inputs()) {
|
||||
@@ -81,12 +118,31 @@ void KeyframeViewBase::RemoveKeyframesOfNode(Node *n)
|
||||
|
||||
void KeyframeViewBase::RemoveKeyframesOfInput(NodeInput *input)
|
||||
{
|
||||
if (!input->IsKeyframable()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i=-1; i<input->ArraySize(); i++) {
|
||||
foreach (const NodeKeyframeTrack& track, input->GetKeyframeTracks(i)) {
|
||||
foreach (NodeKeyframe* key, track) {
|
||||
RemoveKeyframe(key);
|
||||
}
|
||||
}
|
||||
RemoveKeyframesOfElement(input, i);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::RemoveKeyframesOfElement(NodeInput *input, int element)
|
||||
{
|
||||
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
|
||||
|
||||
for (int i=0; i<tracks.size(); i++) {
|
||||
RemoveKeyframesOfTrack(input, element, i);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::RemoveKeyframesOfTrack(NodeInput *input, int element, int track)
|
||||
{
|
||||
const QVector<NodeKeyframeTrack>& tracks = input->GetKeyframeTracks(element);
|
||||
const NodeKeyframeTrack& t = tracks.at(track);
|
||||
|
||||
foreach (NodeKeyframe* key, t) {
|
||||
RemoveKeyframe(key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,7 +167,7 @@ void KeyframeViewBase::RemoveKeyframe(NodeKeyframe* key)
|
||||
delete item_map_.take(key);
|
||||
}
|
||||
|
||||
KeyframeViewItem *KeyframeViewBase::AddKeyframeInternal(NodeKeyframe* key)
|
||||
KeyframeViewItem *KeyframeViewBase::AddKeyframe(NodeKeyframe* key)
|
||||
{
|
||||
KeyframeViewItem* item = item_map_.value(key);
|
||||
|
||||
|
||||
@@ -40,10 +40,22 @@ public:
|
||||
|
||||
void DeleteSelected();
|
||||
|
||||
void AddKeyframesOfNode(Node* n);
|
||||
|
||||
void AddKeyframesOfInput(NodeInput* input);
|
||||
|
||||
void AddKeyframesOfElement(NodeInput* input, int element);
|
||||
|
||||
void AddKeyframesOfTrack(NodeInput* input, int element, int track);
|
||||
|
||||
void RemoveKeyframesOfNode(Node* n);
|
||||
|
||||
void RemoveKeyframesOfInput(NodeInput* input);
|
||||
|
||||
void RemoveKeyframesOfElement(NodeInput* input, int element);
|
||||
|
||||
void RemoveKeyframesOfTrack(NodeInput* input, int element, int track);
|
||||
|
||||
void SelectAll();
|
||||
|
||||
void DeselectAll();
|
||||
@@ -52,11 +64,11 @@ signals:
|
||||
void Dragged(int current_x, int current_y);
|
||||
|
||||
public slots:
|
||||
virtual KeyframeViewItem* AddKeyframe(NodeKeyframe* key);
|
||||
|
||||
void RemoveKeyframe(NodeKeyframe* key);
|
||||
|
||||
protected:
|
||||
virtual KeyframeViewItem* AddKeyframeInternal(NodeKeyframe* key);
|
||||
|
||||
virtual void mousePressEvent(QMouseEvent *event) override;
|
||||
virtual void mouseMoveEvent(QMouseEvent *event) override;
|
||||
virtual void mouseReleaseEvent(QMouseEvent *event) override;
|
||||
|
||||
Reference in New Issue
Block a user