oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: began heavy rework of curve view to link closely with param view

Browse Source
This commit is contained in:
itsmattkc
2020-09-29 00:42:16 +10:00
parent fb6e8a8a13
commit 610f4c54fe
18 changed files with 386 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/param/param.cpp
+1 -75
View File
@@ -28,9 +28,8 @@ ParamPanel::ParamPanel(QWidget* parent) :
TimeBasedPanel(QStringLiteral("ParamPanel"), parent)
{
NodeParamView* view = new NodeParamView();
connect(view, &NodeParamView::InputDoubleClicked, this, &ParamPanel::CreateCurvePanel);
connect(view, &NodeParamView::RequestSelectNode, this, &ParamPanel::RequestSelectNode);
//connect(view, &NodeParamView::FoundGizmos, this, &ParamPanel::FoundGizmos);
connect(view, &NodeParamView::NodeOrderChanged, this, &ParamPanel::NodeOrderChanged);
SetTimeBasedWidget(view);
Retranslate();
@@ -50,14 +49,6 @@ void ParamPanel::DeselectNodes(const QList<Node *> &nodes)
Retranslate();
}
void ParamPanel::SetTimestamp(const int64_t &timestamp)
{
TimeBasedPanel::SetTimestamp(timestamp);
// Ensure all CurvePanels are updated with this time too
ParamViewTimeChanged(timestamp);
}
void ParamPanel::DeleteSelected()
{
static_cast<NodeParamView*>(GetTimeBasedWidget())->DeleteSelected();
@@ -78,69 +69,4 @@ void ParamPanel::Retranslate()
}
}
void ParamPanel::CreateCurvePanel(NodeInput *input)
{
if (!input->is_keyframable()) {
return;
}
CurvePanel* panel = open_curve_panels_.value(input);
if (panel) {
panel->raise();
return;
}
NodeParamView* view = static_cast<NodeParamView*>(GetTimeBasedWidget());
panel = Core::instance()->main_window()->AppendCurvePanel();
panel->ConnectViewerNode(view->GetConnectedNode());
panel->SetTimestamp(view->GetTimestamp());
panel->SetInput(input);
connect(view, &NodeParamView::TimeChanged, this, &ParamPanel::ParamViewTimeChanged);
connect(panel, &CurvePanel::TimeChanged, this, &ParamPanel::CurvePanelTimeChanged);
connect(panel, &CurvePanel::CloseRequested, this, &ParamPanel::ClosingCurvePanel);
open_curve_panels_.insert(input, panel);
}
void ParamPanel::ClosingCurvePanel()
{
CurvePanel* panel = static_cast<CurvePanel*>(sender());
open_curve_panels_.remove(panel->GetInput());
}
void ParamPanel::ParamViewTimeChanged(const int64_t &time)
{
// Ensure all CurvePanels are updated with this time too
QHash<NodeInput*, CurvePanel*>::const_iterator i;
for (i=open_curve_panels_.begin(); i!=open_curve_panels_.end(); i++) {
// If connected viewers are the same, set the timestamp
if (i.value()->GetConnectedViewer() == GetConnectedViewer()) {
i.value()->SetTimestamp(time);
}
}
}
void ParamPanel::CurvePanelTimeChanged(const int64_t &time)
{
GetTimeBasedWidget()->SetTimestamp(time);
emit GetTimeBasedWidget()->TimeChanged(time);
CurvePanel* src = static_cast<CurvePanel*>(sender());
// Ensure all CurvePanels are updated with this time too
QHash<NodeInput*, CurvePanel*>::const_iterator i;
for (i=open_curve_panels_.begin(); i!=open_curve_panels_.end(); i++) {
// If connected viewers are the same and the panel isn't the source, set the timestamp
if (i.value() != src && i.value()->GetConnectedViewer() == src->GetConnectedViewer()) {
i.value()->SetTimestamp(time);
}
}
}
OLIVE_NAMESPACE_EXIT