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/panel/viewer/viewer.cpp
+12 -11
View File
@@ -20,24 +20,25 @@
#include "viewer.h"
namespace olive {
ViewerPanel::ViewerPanel(const QString &object_name) :
ViewerPanelBase(object_name)
namespace olive
{
// Set ViewerWidget as the central widget
ViewerWidget* vw = new ViewerWidget(this);
SetViewerWidget(vw);
// Set strings
Retranslate();
ViewerPanel::ViewerPanel(const QString &object_name)
: ViewerPanelBase(object_name)
{
// Set ViewerWidget as the central widget
ViewerWidget *vw = new ViewerWidget(this);
SetViewerWidget(vw);
// Set strings
Retranslate();
}
void ViewerPanel::Retranslate()
{
ViewerPanelBase::Retranslate();
ViewerPanelBase::Retranslate();
SetTitle(tr("Viewer"));
SetTitle(tr("Viewer"));
}
}
app/panel/viewer/viewer.h
+5 -5
View File
@@ -25,19 +25,19 @@
#include "viewerbase.h"
namespace olive {
namespace olive
{
/**
* @brief Dockable wrapper around a ViewerWidget
*/
class ViewerPanel : public ViewerPanelBase {
Q_OBJECT
Q_OBJECT
public:
ViewerPanel(const QString& object_name);
ViewerPanel(const QString &object_name);
protected:
virtual void Retranslate() override;
virtual void Retranslate() override;
};
}
app/panel/viewer/viewerbase.cpp
+48 -33
View File
@@ -22,96 +22,111 @@
#include "window/mainwindow/mainwindow.h"
namespace olive {
namespace olive
{
#define super TimeBasedPanel
ViewerPanelBase::ViewerPanelBase(const QString& object_name) :
super(object_name)
ViewerPanelBase::ViewerPanelBase(const QString &object_name)
: super(object_name)
{
connect(PanelManager::instance(), &PanelManager::FocusedPanelChanged, this, &ViewerPanelBase::FocusedPanelChanged);
connect(PanelManager::instance(), &PanelManager::FocusedPanelChanged, this,
&ViewerPanelBase::FocusedPanelChanged);
}
void ViewerPanelBase::PlayPause()
{
GetViewerWidget()->TogglePlayPause();
GetViewerWidget()->TogglePlayPause();
}
void ViewerPanelBase::PlayInToOut()
{
GetViewerWidget()->Play(true);
GetViewerWidget()->Play(true);
}
void ViewerPanelBase::ShuttleLeft()
{
GetViewerWidget()->ShuttleLeft();
GetViewerWidget()->ShuttleLeft();
}
void ViewerPanelBase::ShuttleStop()
{
GetViewerWidget()->ShuttleStop();
GetViewerWidget()->ShuttleStop();
}
void ViewerPanelBase::ShuttleRight()
{
GetViewerWidget()->ShuttleRight();
GetViewerWidget()->ShuttleRight();
}
void ViewerPanelBase::ConnectTimeBasedPanel(TimeBasedPanel *panel)
{
connect(panel, &TimeBasedPanel::PlayPauseRequested, this, &ViewerPanelBase::PlayPause);
connect(panel, &TimeBasedPanel::PlayInToOutRequested, this, &ViewerPanelBase::PlayInToOut);
connect(panel, &TimeBasedPanel::ShuttleLeftRequested, this, &ViewerPanelBase::ShuttleLeft);
connect(panel, &TimeBasedPanel::ShuttleStopRequested, this, &ViewerPanelBase::ShuttleStop);
connect(panel, &TimeBasedPanel::ShuttleRightRequested, this, &ViewerPanelBase::ShuttleRight);
connect(panel, &TimeBasedPanel::PlayPauseRequested, this,
&ViewerPanelBase::PlayPause);
connect(panel, &TimeBasedPanel::PlayInToOutRequested, this,
&ViewerPanelBase::PlayInToOut);
connect(panel, &TimeBasedPanel::ShuttleLeftRequested, this,
&ViewerPanelBase::ShuttleLeft);
connect(panel, &TimeBasedPanel::ShuttleStopRequested, this,
&ViewerPanelBase::ShuttleStop);
connect(panel, &TimeBasedPanel::ShuttleRightRequested, this,
&ViewerPanelBase::ShuttleRight);
}
void ViewerPanelBase::DisconnectTimeBasedPanel(TimeBasedPanel *panel)
{
disconnect(panel, &TimeBasedPanel::PlayPauseRequested, this, &ViewerPanelBase::PlayPause);
disconnect(panel, &TimeBasedPanel::PlayInToOutRequested, this, &ViewerPanelBase::PlayInToOut);
disconnect(panel, &TimeBasedPanel::ShuttleLeftRequested, this, &ViewerPanelBase::ShuttleLeft);
disconnect(panel, &TimeBasedPanel::ShuttleStopRequested, this, &ViewerPanelBase::ShuttleStop);
disconnect(panel, &TimeBasedPanel::ShuttleRightRequested, this, &ViewerPanelBase::ShuttleRight);
disconnect(panel, &TimeBasedPanel::PlayPauseRequested, this,
&ViewerPanelBase::PlayPause);
disconnect(panel, &TimeBasedPanel::PlayInToOutRequested, this,
&ViewerPanelBase::PlayInToOut);
disconnect(panel, &TimeBasedPanel::ShuttleLeftRequested, this,
&ViewerPanelBase::ShuttleLeft);
disconnect(panel, &TimeBasedPanel::ShuttleStopRequested, this,
&ViewerPanelBase::ShuttleStop);
disconnect(panel, &TimeBasedPanel::ShuttleRightRequested, this,
&ViewerPanelBase::ShuttleRight);
}
void ViewerPanelBase::SetFullScreen(QScreen *screen)
{
GetViewerWidget()->SetFullScreen(screen);
GetViewerWidget()->SetFullScreen(screen);
}
void ViewerPanelBase::SetGizmos(Node *node)
{
GetViewerWidget()->SetGizmos(node);
GetViewerWidget()->SetGizmos(node);
}
void ViewerPanelBase::CacheEntireSequence()
{
GetViewerWidget()->CacheEntireSequence();
GetViewerWidget()->CacheEntireSequence();
}
void ViewerPanelBase::CacheSequenceInOut()
{
GetViewerWidget()->CacheSequenceInOut();
GetViewerWidget()->CacheSequenceInOut();
}
void ViewerPanelBase::SetViewerWidget(ViewerWidget *vw)
{
connect(vw, &ViewerWidget::TextureChanged, this, &ViewerPanelBase::TextureChanged);
connect(vw, &ViewerWidget::ColorProcessorChanged, this, &ViewerPanelBase::ColorProcessorChanged);
connect(vw, &ViewerWidget::ColorManagerChanged, this, &ViewerPanelBase::ColorManagerChanged);
connect(vw, &ViewerWidget::TextureChanged, this,
&ViewerPanelBase::TextureChanged);
connect(vw, &ViewerWidget::ColorProcessorChanged, this,
&ViewerPanelBase::ColorProcessorChanged);
connect(vw, &ViewerWidget::ColorManagerChanged, this,
&ViewerPanelBase::ColorManagerChanged);
SetTimeBasedWidget(vw);
SetTimeBasedWidget(vw);
}
void ViewerPanelBase::FocusedPanelChanged(PanelWidget *panel)
{
if (dynamic_cast<ViewerPanelBase*>(panel)) {
auto vw = GetViewerWidget();
if (vw->IsPlaying() && panel != this) {
vw->Pause();
}
}
if (dynamic_cast<ViewerPanelBase *>(panel)) {
auto vw = GetViewerWidget();
if (vw->IsPlaying() && panel != this) {
vw->Pause();
}
}
}
}
app/panel/viewer/viewerbase.h
+57 -58
View File
@@ -25,102 +25,101 @@
#include "panel/timebased/timebased.h"
#include "widget/viewer/viewer.h"
namespace olive {
class ViewerPanelBase : public TimeBasedPanel
namespace olive
{
Q_OBJECT
class ViewerPanelBase : public TimeBasedPanel {
Q_OBJECT
public:
ViewerPanelBase(const QString& object_name);
ViewerPanelBase(const QString &object_name);
ViewerWidget *GetViewerWidget() const
{
return static_cast<ViewerWidget*>(GetTimeBasedWidget());
}
ViewerWidget *GetViewerWidget() const
{
return static_cast<ViewerWidget *>(GetTimeBasedWidget());
}
virtual void PlayPause() override;
virtual void PlayPause() override;
virtual void PlayInToOut() override;
virtual void PlayInToOut() override;
virtual void ShuttleLeft() override;
virtual void ShuttleLeft() override;
virtual void ShuttleStop() override;
virtual void ShuttleStop() override;
virtual void ShuttleRight() override;
virtual void ShuttleRight() override;
void ConnectTimeBasedPanel(TimeBasedPanel* panel);
void ConnectTimeBasedPanel(TimeBasedPanel *panel);
void DisconnectTimeBasedPanel(TimeBasedPanel* panel);
void DisconnectTimeBasedPanel(TimeBasedPanel *panel);
/**
/**
* @brief Wrapper for ViewerWidget::SetFullScreen()
*/
void SetFullScreen(QScreen* screen = nullptr);
void SetFullScreen(QScreen *screen = nullptr);
ColorManager *GetColorManager()
{
return GetViewerWidget()->color_manager();
}
ColorManager *GetColorManager()
{
return GetViewerWidget()->color_manager();
}
void UpdateTextureFromNode()
{
GetViewerWidget()->UpdateTextureFromNode();
}
void UpdateTextureFromNode()
{
GetViewerWidget()->UpdateTextureFromNode();
}
void AddPlaybackDevice(ViewerDisplayWidget *vw)
{
GetViewerWidget()->AddPlaybackDevice(vw);
}
void AddPlaybackDevice(ViewerDisplayWidget *vw)
{
GetViewerWidget()->AddPlaybackDevice(vw);
}
void SetTimelineSelectedBlocks(const QVector<Block*> &b)
{
GetViewerWidget()->SetTimelineSelectedBlocks(b);
}
void SetTimelineSelectedBlocks(const QVector<Block *> &b)
{
GetViewerWidget()->SetTimelineSelectedBlocks(b);
}
void SetNodeViewSelections(const QVector<Node*> &n)
{
GetViewerWidget()->SetNodeViewSelections(n);
}
void SetNodeViewSelections(const QVector<Node *> &n)
{
GetViewerWidget()->SetNodeViewSelections(n);
}
void ConnectMulticamWidget(MulticamWidget *p)
{
GetViewerWidget()->ConnectMulticamWidget(p);
}
void ConnectMulticamWidget(MulticamWidget *p)
{
GetViewerWidget()->ConnectMulticamWidget(p);
}
public slots:
void SetGizmos(Node* node);
void SetGizmos(Node *node);
void CacheEntireSequence();
void CacheEntireSequence();
void CacheSequenceInOut();
void CacheSequenceInOut();
void RequestStartEditingText()
{
GetViewerWidget()->RequestStartEditingText();
}
void RequestStartEditingText()
{
GetViewerWidget()->RequestStartEditingText();
}
signals:
/**
/**
* @brief Signal emitted when a new frame is loaded
*/
void TextureChanged(TexturePtr t);
void TextureChanged(TexturePtr t);
/**
/**
* @brief Wrapper for ViewerGLWidget::ColorProcessorChanged()
*/
void ColorProcessorChanged(ColorProcessorPtr processor);
void ColorProcessorChanged(ColorProcessorPtr processor);
/**
/**
* @brief Wrapper for ViewerGLWidget::ColorManagerChanged()
*/
void ColorManagerChanged(ColorManager* color_manager);
void ColorManagerChanged(ColorManager *color_manager);
protected:
void SetViewerWidget(ViewerWidget *vw);
void SetViewerWidget(ViewerWidget *vw);
private slots:
void FocusedPanelChanged(PanelWidget *panel);
void FocusedPanelChanged(PanelWidget *panel);
};
}