decoupled effectfield UI from backend
This commit is contained in:
+12
-7
@@ -31,9 +31,10 @@
|
||||
#include "ui/labelslider.h"
|
||||
#include "ui/graphview.h"
|
||||
#include "project/effect.h"
|
||||
#include "project/effectfield.h"
|
||||
#include "project/effectfields.h"
|
||||
#include "project/effectrow.h"
|
||||
#include "project/clip.h"
|
||||
#include "rendering/renderfunctions.h"
|
||||
#include "panels.h"
|
||||
#include "debug.h"
|
||||
|
||||
@@ -142,8 +143,12 @@ void GraphEditor::update_panel() {
|
||||
int slider_index = 0;
|
||||
for (int i=0;i<row->fieldCount();i++) {
|
||||
EffectField* field = row->field(i);
|
||||
if (field->type == EFFECT_FIELD_DOUBLE) {
|
||||
slider_proxies.at(slider_index)->set_value(row->field(i)->get_current_data().toDouble(), false);
|
||||
if (field->type() == EffectField::EFFECT_FIELD_DOUBLE) {
|
||||
slider_proxies.at(slider_index)->set_value(
|
||||
row->field(i)->GetValueAt(playhead_to_clip_seconds(field->GetParentRow()->parent_effect->parent_clip,
|
||||
olive::ActiveSequence->playhead)).toDouble(),
|
||||
false
|
||||
);
|
||||
slider_index++;
|
||||
}
|
||||
}
|
||||
@@ -175,10 +180,10 @@ void GraphEditor::set_row(EffectRow *r) {
|
||||
if (r != nullptr && r->isKeyframing()) {
|
||||
for (int i=0;i<r->fieldCount();i++) {
|
||||
EffectField* field = r->field(i);
|
||||
if (field->type == EFFECT_FIELD_DOUBLE) {
|
||||
if (field->type() == EffectField::EFFECT_FIELD_DOUBLE) {
|
||||
QPushButton* slider_button = new QPushButton();
|
||||
slider_button->setCheckable(true);
|
||||
slider_button->setChecked(field->is_enabled());
|
||||
slider_button->setChecked(field->IsEnabled());
|
||||
slider_button->setIcon(QIcon(":/icons/record.svg"));
|
||||
slider_button->setProperty("field", i);
|
||||
slider_button->setIconSize(slider_button->iconSize()*0.5);
|
||||
@@ -192,7 +197,7 @@ void GraphEditor::set_row(EffectRow *r) {
|
||||
slider_proxies.append(slider);
|
||||
value_layout->addWidget(slider);
|
||||
|
||||
slider_proxy_sources.append(static_cast<LabelSlider*>(field->ui_element));
|
||||
//slider_proxy_sources.append(static_cast<LabelSlider*>(field->ui_element));
|
||||
|
||||
found_vals = true;
|
||||
}
|
||||
@@ -203,7 +208,7 @@ void GraphEditor::set_row(EffectRow *r) {
|
||||
row = r;
|
||||
current_row_desc->setText(row->parent_effect->parent_clip->name()
|
||||
+ " :: " + row->parent_effect->meta->name
|
||||
+ " :: " + row->get_name());
|
||||
+ " :: " + row->name());
|
||||
header->set_visible_in(r->parent_effect->parent_clip->timeline_in());
|
||||
|
||||
connect(keyframe_nav, SIGNAL(goto_previous_key()), row, SLOT(goto_previous_key()));
|
||||
|
||||
Reference in New Issue
Block a user