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

change: change code style to Linux style except indent.

Browse Source
This commit is contained in:
Mike Solar
2025-08-03 03:09:40 +08:00
parent 65ab76edc8
commit 74f73ab3be
789 changed files with 77113 additions and 68888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/time/timeformat/timeformat.cpp
+23 -19
View File
@@ -22,7 +22,8 @@
#include <QDateTime>
namespace olive {
namespace olive
{
#define super Node
@@ -32,48 +33,51 @@ const QString TimeFormatNode::kLocalTimeInput = QStringLiteral("localtime_in");
TimeFormatNode::TimeFormatNode()
{
AddInput(kTimeInput, NodeValue::kFloat);
AddInput(kFormatInput, NodeValue::kText, QStringLiteral("hh:mm:ss"));
AddInput(kLocalTimeInput, NodeValue::kBoolean);
AddInput(kTimeInput, NodeValue::kFloat);
AddInput(kFormatInput, NodeValue::kText, QStringLiteral("hh:mm:ss"));
AddInput(kLocalTimeInput, NodeValue::kBoolean);
}
QString TimeFormatNode::Name() const
{
return tr("Time Format");
return tr("Time Format");
}
QString TimeFormatNode::id() const
{
return QStringLiteral("org.olivevideoeditor.Olive.timeformat");
return QStringLiteral("org.olivevideoeditor.Olive.timeformat");
}
QVector<Node::CategoryID> TimeFormatNode::Category() const
{
return {kCategoryGenerator};
return { kCategoryGenerator };
}
QString TimeFormatNode::Description() const
{
return tr("Format time (in Unix epoch seconds) into a string.");
return tr("Format time (in Unix epoch seconds) into a string.");
}
void TimeFormatNode::Retranslate()
{
super::Retranslate();
super::Retranslate();
SetInputName(kTimeInput, tr("Time"));
SetInputName(kFormatInput, tr("Format"));
SetInputName(kLocalTimeInput, tr("Interpret time as local time"));
SetInputName(kTimeInput, tr("Time"));
SetInputName(kFormatInput, tr("Format"));
SetInputName(kLocalTimeInput, tr("Interpret time as local time"));
}
void TimeFormatNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
void TimeFormatNode::Value(const NodeValueRow &value,
const NodeGlobals &globals,
NodeValueTable *table) const
{
qint64 ms_since_epoch = value[kTimeInput].toDouble()*1000;
bool time_is_local = value[kLocalTimeInput].toBool();
QDateTime dt = QDateTime::fromMSecsSinceEpoch(ms_since_epoch, time_is_local ? Qt::LocalTime : Qt::UTC);
QString format = value[kFormatInput].toString();
QString output = dt.toString(format);
table->Push(NodeValue(NodeValue::kText, output, this));
qint64 ms_since_epoch = value[kTimeInput].toDouble() * 1000;
bool time_is_local = value[kLocalTimeInput].toBool();
QDateTime dt = QDateTime::fromMSecsSinceEpoch(
ms_since_epoch, time_is_local ? Qt::LocalTime : Qt::UTC);
QString format = value[kFormatInput].toString();
QString output = dt.toString(format);
table->Push(NodeValue(NodeValue::kText, output, this));
}
}
app/node/time/timeformat/timeformat.h
+16 -16
View File
@@ -23,29 +23,29 @@
#include "node/node.h"
namespace olive {
class TimeFormatNode : public Node
namespace olive
{
Q_OBJECT
class TimeFormatNode : public Node {
Q_OBJECT
public:
TimeFormatNode();
TimeFormatNode();
NODE_DEFAULT_FUNCTIONS(TimeFormatNode)
NODE_DEFAULT_FUNCTIONS(TimeFormatNode)
virtual QString Name() const override;
virtual QString id() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual void Retranslate() override;
virtual void Retranslate() override;
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
static const QString kTimeInput;
static const QString kFormatInput;
static const QString kLocalTimeInput;
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
NodeValueTable *table) const override;
static const QString kTimeInput;
static const QString kFormatInput;
static const QString kLocalTimeInput;
};
}
app/node/time/timeoffset/timeoffsetnode.cpp
+30 -20
View File
@@ -22,7 +22,8 @@
#include "widget/slider/rationalslider.h"
namespace olive {
namespace olive
{
const QString TimeOffsetNode::kTimeInput = QStringLiteral("time_in");
const QString TimeOffsetNode::kInputInput = QStringLiteral("input_in");
@@ -31,50 +32,59 @@ const QString TimeOffsetNode::kInputInput = QStringLiteral("input_in");
TimeOffsetNode::TimeOffsetNode()
{
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)), InputFlags(kInputFlagNotConnectable));
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)),
InputFlags(kInputFlagNotConnectable));
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
AddInput(kInputInput, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable));
AddInput(kInputInput, NodeValue::kNone,
InputFlags(kInputFlagNotKeyframable));
}
void TimeOffsetNode::Retranslate()
{
super::Retranslate();
super::Retranslate();
SetInputName(kTimeInput, QStringLiteral("Time"));
SetInputName(kInputInput, QStringLiteral("Input"));
SetInputName(kTimeInput, QStringLiteral("Time"));
SetInputName(kInputInput, QStringLiteral("Input"));
}
TimeRange TimeOffsetNode::InputTimeAdjustment(const QString &input, int element, const TimeRange &input_time, bool clamp) const
TimeRange TimeOffsetNode::InputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time,
bool clamp) const
{
if (input == kInputInput) {
return TimeRange(GetRemappedTime(input_time.in()), GetRemappedTime(input_time.out()));
} else {
return super::InputTimeAdjustment(input, element, input_time, clamp);
}
if (input == kInputInput) {
return TimeRange(GetRemappedTime(input_time.in()),
GetRemappedTime(input_time.out()));
} else {
return super::InputTimeAdjustment(input, element, input_time, clamp);
}
}
TimeRange TimeOffsetNode::OutputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
TimeRange
TimeOffsetNode::OutputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time) const
{
/*if (input == kInputInput) {
/*if (input == kInputInput) {
rational target_time = GetValueAtTime(kTimeInput, input_time.in()).value<rational>();
return TimeRange(target_time, target_time + input_time.length());
} else {
return super::OutputTimeAdjustment(input, element, input_time);
}*/
return super::OutputTimeAdjustment(input, element, input_time);
return super::OutputTimeAdjustment(input, element, input_time);
}
void TimeOffsetNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
void TimeOffsetNode::Value(const NodeValueRow &value,
const NodeGlobals &globals,
NodeValueTable *table) const
{
table->Push(value[kInputInput]);
table->Push(value[kInputInput]);
}
rational TimeOffsetNode::GetRemappedTime(const rational &input) const
{
return input + GetValueAtTime(kTimeInput, input).value<rational>();
return input + GetValueAtTime(kTimeInput, input).value<rational>();
}
}
app/node/time/timeoffset/timeoffsetnode.h
+33 -29
View File
@@ -23,48 +23,52 @@
#include "node/node.h"
namespace olive {
class TimeOffsetNode : public Node
namespace olive
{
class TimeOffsetNode : public Node {
public:
TimeOffsetNode();
TimeOffsetNode();
NODE_DEFAULT_FUNCTIONS(TimeOffsetNode)
NODE_DEFAULT_FUNCTIONS(TimeOffsetNode)
virtual QString Name() const override
{
return tr("Time Offset");
}
virtual QString Name() const override
{
return tr("Time Offset");
}
virtual QString id() const override
{
return QStringLiteral("org.olivevideoeditor.Olive.timeoffset");
}
virtual QString id() const override
{
return QStringLiteral("org.olivevideoeditor.Olive.timeoffset");
}
virtual QVector<CategoryID> Category() const override
{
return {kCategoryTime};
}
virtual QVector<CategoryID> Category() const override
{
return { kCategoryTime };
}
virtual QString Description() const override
{
return tr("Offset time passing through the graph.");
}
virtual QString Description() const override
{
return tr("Offset time passing through the graph.");
}
virtual TimeRange InputTimeAdjustment(const QString& input, int element, const TimeRange& input_time, bool clamp) const override;
virtual TimeRange OutputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const override;
virtual TimeRange InputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time,
bool clamp) const override;
virtual TimeRange
OutputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time) const override;
virtual void Retranslate() override;
virtual void Retranslate() override;
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
NodeValueTable *table) const override;
static const QString kTimeInput;
static const QString kInputInput;
static const QString kTimeInput;
static const QString kInputInput;
private:
rational GetRemappedTime(const rational& input) const;
rational GetRemappedTime(const rational &input) const;
};
}
app/node/time/timeremap/timeremap.cpp
+32 -24
View File
@@ -22,7 +22,8 @@
#include "widget/slider/rationalslider.h"
namespace olive {
namespace olive
{
const QString TimeRemapNode::kTimeInput = QStringLiteral("time_in");
const QString TimeRemapNode::kInputInput = QStringLiteral("input_in");
@@ -31,70 +32,77 @@ const QString TimeRemapNode::kInputInput = QStringLiteral("input_in");
TimeRemapNode::TimeRemapNode()
{
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)), InputFlags(kInputFlagNotConnectable));
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)),
InputFlags(kInputFlagNotConnectable));
SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
AddInput(kInputInput, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable));
AddInput(kInputInput, NodeValue::kNone,
InputFlags(kInputFlagNotKeyframable));
}
QString TimeRemapNode::Name() const
{
return tr("Time Remap");
return tr("Time Remap");
}
QString TimeRemapNode::id() const
{
return QStringLiteral("org.olivevideoeditor.Olive.timeremap");
return QStringLiteral("org.olivevideoeditor.Olive.timeremap");
}
QVector<Node::CategoryID> TimeRemapNode::Category() const
{
return {kCategoryTime};
return { kCategoryTime };
}
QString TimeRemapNode::Description() const
{
return tr("Arbitrarily remap time through the nodes.");
return tr("Arbitrarily remap time through the nodes.");
}
TimeRange TimeRemapNode::InputTimeAdjustment(const QString &input, int element, const TimeRange &input_time, bool clamp) const
TimeRange TimeRemapNode::InputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time,
bool clamp) const
{
if (input == kInputInput) {
return TimeRange(GetRemappedTime(input_time.in()), GetRemappedTime(input_time.out()));
} else {
return super::InputTimeAdjustment(input, element, input_time, clamp);
}
if (input == kInputInput) {
return TimeRange(GetRemappedTime(input_time.in()),
GetRemappedTime(input_time.out()));
} else {
return super::InputTimeAdjustment(input, element, input_time, clamp);
}
}
TimeRange TimeRemapNode::OutputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
TimeRange TimeRemapNode::OutputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time) const
{
/*if (input == kInputInput) {
/*if (input == kInputInput) {
rational target_time = GetValueAtTime(kTimeInput, input_time.in()).value<rational>();
return TimeRange(target_time, target_time + input_time.length());
} else {
return super::OutputTimeAdjustment(input, element, input_time);
}*/
return super::OutputTimeAdjustment(input, element, input_time);
return super::OutputTimeAdjustment(input, element, input_time);
}
void TimeRemapNode::Retranslate()
{
super::Retranslate();
super::Retranslate();
SetInputName(kTimeInput, QStringLiteral("Time"));
SetInputName(kInputInput, QStringLiteral("Input"));
SetInputName(kTimeInput, QStringLiteral("Time"));
SetInputName(kInputInput, QStringLiteral("Input"));
}
void TimeRemapNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
void TimeRemapNode::Value(const NodeValueRow &value, const NodeGlobals &globals,
NodeValueTable *table) const
{
table->Push(value[kInputInput]);
table->Push(value[kInputInput]);
}
rational TimeRemapNode::GetRemappedTime(const rational &input) const
{
return GetValueAtTime(kTimeInput, input).value<rational>();
return GetValueAtTime(kTimeInput, input).value<rational>();
}
}
app/node/time/timeremap/timeremap.h
+22 -18
View File
@@ -23,34 +23,38 @@
#include "node/node.h"
namespace olive {
class TimeRemapNode : public Node
namespace olive
{
Q_OBJECT
class TimeRemapNode : public Node {
Q_OBJECT
public:
TimeRemapNode();
TimeRemapNode();
NODE_DEFAULT_FUNCTIONS(TimeRemapNode)
NODE_DEFAULT_FUNCTIONS(TimeRemapNode)
virtual QString Name() const override;
virtual QString id() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual QString Name() const override;
virtual QString id() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual TimeRange InputTimeAdjustment(const QString& input, int element, const TimeRange& input_time, bool clamp) const override;
virtual TimeRange OutputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const override;
virtual TimeRange InputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time,
bool clamp) const override;
virtual TimeRange
OutputTimeAdjustment(const QString &input, int element,
const TimeRange &input_time) const override;
virtual void Retranslate() override;
virtual void Retranslate() override;
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals,
NodeValueTable *table) const override;
static const QString kTimeInput;
static const QString kInputInput;
static const QString kTimeInput;
static const QString kInputInput;
private:
rational GetRemappedTime(const rational& input) const;
rational GetRemappedTime(const rational &input) const;
};
}