refactored some classes

This commit is contained in:
itsmattkc
2019-05-08 00:41:44 +10:00
parent 127a773c54
commit 9a13776b2c
133 changed files with 1698 additions and 1627 deletions
+2 -2
View File
@@ -32,7 +32,7 @@
#include <QApplication>
#include "panels/panels.h"
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include "effects/effectloaders.h"
#include "effects/transition.h"
#include "timeline/clip.h"
@@ -392,7 +392,7 @@ void EffectControls::LoadEvent()
QVBoxLayout* layout = nullptr;
EffectUI* container = open_effects_.at(i);
Node* e = open_effects_.at(i)->GetEffect();
OldEffectNode* e = open_effects_.at(i)->GetEffect();
if (e->subtype() == olive::kTypeVideo) {
vcontainer->setVisible(true);
+6 -6
View File
@@ -78,7 +78,7 @@ void EffectsPanel::Load() {
Clip* c = selected_clips_.at(i);
// Create a list of the effects we'll open
QVector<Node*> effects_to_open;
QVector<OldEffectNode*> effects_to_open;
// Determine based on the current selections whether to load all effects or just the transitions
bool whole_clip_is_selected = c->IsSelected();
@@ -121,7 +121,7 @@ void EffectsPanel::Load() {
// to clear the graph editor later.
if (!graph_editor_row_is_still_active) {
for (int k=0;k<effects_to_open.at(j)->row_count();k++) {
EffectRow* row = effects_to_open.at(j)->row(k);
NodeIO* row = effects_to_open.at(j)->row(k);
if (row == panel_graph_editor->get_row()) {
graph_editor_row_is_still_active = true;
break;
@@ -139,7 +139,7 @@ void EffectsPanel::Load() {
LoadEvent();
}
bool EffectsPanel::IsEffectSelected(Node *e)
bool EffectsPanel::IsEffectSelected(OldEffectNode *e)
{
for (int i=0;i<open_effects_.size();i++) {
if (open_effects_.at(i)->GetEffect() == e && open_effects_.at(i)->IsSelected()) {
@@ -176,7 +176,7 @@ void EffectsPanel::copy(bool del) {
for (int i=0;i<open_effects_.size();i++) {
if (open_effects_.at(i)->IsSelected()) {
Node* e = open_effects_.at(i)->GetEffect();
OldEffectNode* e = open_effects_.at(i)->GetEffect();
if (e->type() == EFFECT_TYPE_EFFECT) {
@@ -211,7 +211,7 @@ void EffectsPanel::AboutToClearEvent()
{
}
void EffectsPanel::DeleteEffect(ComboAction* ca, Node* effect_ref) {
void EffectsPanel::DeleteEffect(ComboAction* ca, OldEffectNode* effect_ref) {
if (effect_ref->type() == EFFECT_TYPE_EFFECT) {
ca->append(new EffectDeleteCommand(effect_ref));
@@ -264,7 +264,7 @@ void EffectsPanel::DeleteSelectedEffects() {
}
}
void EffectsPanel::open_effect(Node* e) {
void EffectsPanel::open_effect(OldEffectNode* e) {
EffectUI* container = new EffectUI(e);
connect(container, SIGNAL(CutRequested()), this, SLOT(cut()));
+3 -3
View File
@@ -18,7 +18,7 @@ public:
virtual bool focused() override;
bool IsEffectSelected(Node* e);
bool IsEffectSelected(OldEffectNode* e);
void DeleteSelectedEffects();
public slots:
@@ -33,8 +33,8 @@ protected:
QVector<EffectUI*> open_effects_;
private:
void Load();
void open_effect(Node *e);
void DeleteEffect(ComboAction* ca, Node* effect_ref);
void open_effect(OldEffectNode *e);
void DeleteEffect(ComboAction* ca, OldEffectNode* effect_ref);
private slots:
void deselect_all_effects(QWidget*);
};
+4 -4
View File
@@ -30,9 +30,9 @@
#include "timeline/timelinetools.h"
#include "ui/labelslider.h"
#include "ui/graphview.h"
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include "effects/effectfields.h"
#include "effects/effectrow.h"
#include "nodes/nodeio.h"
#include "timeline/clip.h"
#include "rendering/renderfunctions.h"
#include "panels.h"
@@ -131,7 +131,7 @@ GraphEditor::GraphEditor(QWidget* parent) : Panel(parent), row(nullptr) {
Retranslate();
}
EffectRow *GraphEditor::get_row()
NodeIO *GraphEditor::get_row()
{
return row;
}
@@ -166,7 +166,7 @@ bool GraphEditor::focused()
return hasFocus() || view->hasFocus() || header->hasFocus();
}
void GraphEditor::set_row(EffectRow *r) {
void GraphEditor::set_row(NodeIO *r) {
for (int i=0;i<field_sliders_.size();i++) {
delete field_sliders_.at(i);
delete field_enable_buttons.at(i);
+4 -4
View File
@@ -30,15 +30,15 @@
#include "ui/timelineheader.h"
#include "ui/labelslider.h"
#include "ui/keyframenavigator.h"
#include "effects/effectrow.h"
#include "nodes/nodeio.h"
class GraphEditor : public Panel {
Q_OBJECT
public:
GraphEditor(QWidget* parent = nullptr);
EffectRow* get_row();
void set_row(EffectRow* r);
NodeIO* get_row();
void set_row(NodeIO* r);
void update_panel();
virtual bool focused() override;
@@ -54,7 +54,7 @@ private:
QVector<LabelSlider*> field_sliders_;
QVector<QPushButton*> field_enable_buttons;
QLabel* current_row_desc;
EffectRow* row;
NodeIO* row;
KeyframeNavigator* keyframe_nav;
QPushButton* linear_button;
QPushButton* bezier_button;
+3 -3
View File
@@ -66,7 +66,7 @@ void NodeEditor::LoadEvent()
for (int i=0;i<open_effects_.size();i++) {
EffectUI* effect_ui = open_effects_.at(i);
Node* node = effect_ui->GetEffect();
OldEffectNode* node = effect_ui->GetEffect();
if (node->parent_clip == first_clip) {
NodeUI* node_ui = new NodeUI();
@@ -120,7 +120,7 @@ void NodeEditor::LoadEdges()
for (int i=0;i<open_effects_.size();i++) {
Node* n = open_effects_.at(i)->GetEffect();
OldEffectNode* n = open_effects_.at(i)->GetEffect();
if (n->parent_clip == first_clip) {
@@ -150,7 +150,7 @@ void NodeEditor::LoadEdges()
}
}
void NodeEditor::ConnectRow(EffectRow *row)
void NodeEditor::ConnectRow(NodeIO *row)
{
if (!connected_rows_.contains(row)) {
connect(row, SIGNAL(EdgesChanged()), this, SLOT(ReloadEdges()));
+2 -2
View File
@@ -26,14 +26,14 @@ private:
QWidget props_;
QVector<NodeUI*> nodes_;
QVector<NodeEdgeUI*> edges_;
QVector<EffectRow*> connected_rows_;
QVector<NodeIO*> connected_rows_;
QVBoxLayout* prop_layout_;
QVector<EffectUI*> nodes_open_in_props_;
void ClearEdges();
void LoadEdges();
void ConnectRow(EffectRow* row);
void ConnectRow(NodeIO* row);
void DisconnectAllRows();
private slots:
+2 -2
View File
@@ -876,7 +876,7 @@ void Timeline::transition_tool_click() {
transition_menu.addAction(tr("Video Transitions"))->setEnabled(false);
for (int i=0;i<olive::node_library.size();i++) {
NodePtr node = olive::node_library.at(i);
OldEffectNodePtr node = olive::node_library.at(i);
if (node != nullptr && node->type() == EFFECT_TYPE_TRANSITION && node->subtype() == olive::kTypeVideo) {
QAction* a = transition_menu.addAction(node->name());
a->setData(i);
@@ -888,7 +888,7 @@ void Timeline::transition_tool_click() {
transition_menu.addAction(tr("Audio Transitions"))->setEnabled(false);
for (int i=0;i<olive::node_library.size();i++) {
NodePtr node = olive::node_library.at(i);
OldEffectNodePtr node = olive::node_library.at(i);
if (node != nullptr && node->type() == EFFECT_TYPE_TRANSITION && node->subtype() == olive::kTypeAudio) {
QAction* a = transition_menu.addAction(node->name());
a->setData(i);