From b2ef363f49db70219ac1eaebb7d69dcdade8d60b Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 2 Nov 2019 22:13:32 +0800 Subject: Keyboard plugin: show additional information on the side. qmpPluginAPI::registerEventHandler now accepts an optional argument that determines whether the handler is called prior to or after an event is sent. --- simple-visualization/qmpkeyboardwindow.cpp | 42 +++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) (limited to 'simple-visualization/qmpkeyboardwindow.cpp') diff --git a/simple-visualization/qmpkeyboardwindow.cpp b/simple-visualization/qmpkeyboardwindow.cpp index 562596c..8fe0e6f 100644 --- a/simple-visualization/qmpkeyboardwindow.cpp +++ b/simple-visualization/qmpkeyboardwindow.cpp @@ -1,23 +1,41 @@ #include +#include #include +#include +#include "qmppianowidget.hpp" #include "qmpkeyboardwindow.hpp" qmpKeyboardWindow::qmpKeyboardWindow(qmpPluginAPI *_api,QWidget *parent): QWidget(parent,Qt::Dialog),api(_api) { - setLayout(new QVBoxLayout()); + setWindowTitle("Keyboard"); + QGridLayout *grid; + setLayout(grid=new QGridLayout()); for(int ch=0;ch<16;++ch) - layout()->addWidget(pw[ch]=new qmpPianoWidget(this)); + { + grid->addWidget(lb[ch]=new QLabel,ch,0); + grid->addWidget(pw[ch]=new qmpPianoWidget(this),ch,1); + pw[ch]->setSizePolicy(QSizePolicy::Policy::Expanding,QSizePolicy::Policy::Preferred); + } hide(); eh=api->registerEventHandler( [this](const void* ee,void*){ const SEvent *e=(const SEvent*)ee; + int ch=e->type&0xF; if((e->type&0xF0)==0x80||((e->type&0xF0)==0x90&&e->p2==0)) - emit keystateupdated(e->type&0xF,e->p1,false); + emit keystateupdated(ch,e->p1,false); if((e->type&0xF0)==0x90&&e->p2>0) - emit keystateupdated(e->type&0xF,e->p1,e->p2>0); + emit keystateupdated(ch,e->p1,e->p2>0); + if((e->type&0xF0)==0xB0||(e->type&0xF0)==0xC0) + lb[ch]->setText( + QString::fromStdString(api->getChannelPresetString(ch))+ + QString("\nch:%1 v:%2 p:%3 e:%4") + .arg(QString::number(ch+1)) + .arg(QString::number(api->getChannelCC(ch,0x7))) + .arg(QString::number(api->getChannelCC(ch,0xa))) + .arg(QString::number(api->getChannelCC(ch,0xb)))); } - ,nullptr); + ,nullptr,true); connect(this,&qmpKeyboardWindow::keystateupdated,this,&qmpKeyboardWindow::onkeystatesupdate); } qmpKeyboardWindow::~qmpKeyboardWindow() @@ -32,4 +50,16 @@ void qmpKeyboardWindow::closeEvent(QCloseEvent *event) void qmpKeyboardWindow::onkeystatesupdate(int ch,int key,bool state) {pw[ch]->setKeyState(key,state);} void qmpKeyboardWindow::resetAll() -{for(int ch=0;ch<16;++ch)pw[ch]->reset();} +{ + for(int ch=0;ch<16;++ch) + { + pw[ch]->reset(); + lb[ch]->setText( + QString::fromStdString(api->getChannelPresetString(ch))+ + QString("\nch:%1 v:%2 p:%3 e:%4") + .arg(QString::number(ch+1)) + .arg(QString::number(api->getChannelCC(ch,0x7))) + .arg(QString::number(api->getChannelCC(ch,0xa))) + .arg(QString::number(api->getChannelCC(ch,0xb)))); + } +} -- cgit v1.2.3