updated scope panel to be permanent

Never liked how this was set up before. This makes more sense to me.
This commit is contained in:
itsmattkc
2022-01-02 14:05:25 -08:00
parent 61f65a3def
commit f6f67e895d
10 changed files with 88 additions and 59 deletions
-20
View File
@@ -973,11 +973,6 @@ void ViewerWidget::WindowAboutToClose()
windows_.remove(windows_.key(static_cast<ViewerWindow*>(sender())));
}
void ViewerWidget::ContextMenuScopeTriggered(QAction *action)
{
emit RequestScopePanel(static_cast<ScopePanel::Type>(action->data().toInt()));
}
void ViewerWidget::RendererGeneratedFrame()
{
RenderTicketWatcher* ticket = static_cast<RenderTicketWatcher*>(sender());
@@ -1117,21 +1112,6 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
menu.addSeparator();
{
// Scopes
Menu* scopes_menu = new Menu(tr("Scopes"), &menu);
menu.addMenu(scopes_menu);
for (int i=0;i<ScopePanel::kTypeCount;i++) {
QAction* scope_action = scopes_menu->addAction(ScopePanel::TypeToName(static_cast<ScopePanel::Type>(i)));
scope_action->setData(i);
}
connect(scopes_menu, &Menu::triggered, this, &ViewerWidget::ContextMenuScopeTriggered);
}
menu.addSeparator();
{
Menu* cache_menu = new Menu(tr("Cache"), &menu);
menu.addMenu(cache_menu);
-10
View File
@@ -33,7 +33,6 @@
#include "audiowaveformview.h"
#include "common/rational.h"
#include "node/output/viewer/viewer.h"
#include "panel/scope/scope.h"
#include "render/previewaudiodevice.h"
#include "render/previewautocacher.h"
#include "threading/threadticketwatcher.h"
@@ -131,13 +130,6 @@ signals:
*/
void TextureChanged(TexturePtr t);
/**
* @brief Request a scope panel
*
* As a widget, we don't handle panels, but a parent panel may pick this signal up.
*/
void RequestScopePanel(ScopePanel::Type type);
/**
* @brief Wrapper for ViewerGLWidget::ColorProcessorChanged()
*/
@@ -296,8 +288,6 @@ private slots:
void WindowAboutToClose();
void ContextMenuScopeTriggered(QAction* action);
void RendererGeneratedFrame();
void RendererGeneratedFrameForQueue();