Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add searching to vestige instrument view #7369

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add searching to vestige instrument view #7369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37eec04
Add searching to vestige instrument view
jiffygist Jul 6, 2024
15b3b87
Add searching to VST Effect View
jiffygist Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions plugins/Vestige/Vestige.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <QGridLayout>
#include <QPainter>
#include <QPushButton>
#include <QLineEdit>
#include <QScrollArea>
#include <QMdiArea>
#include <QMenu>
Expand Down Expand Up @@ -955,6 +956,7 @@ ManageVestigeInstrumentView::ManageVestigeInstrumentView( Instrument * _instrume
l->addWidget( m_syncButton, 0, 0, 1, 2, Qt::AlignLeft );

m_displayAutomatedOnly = new QPushButton( tr( "Automated" ), this );
m_isAuto = false;
connect( m_displayAutomatedOnly, SIGNAL( clicked() ), this,
SLOT( displayAutomatedOnly() ) );

Expand All @@ -967,6 +969,15 @@ ManageVestigeInstrumentView::ManageVestigeInstrumentView( Instrument * _instrume

l->addWidget( m_closeButton, 0, 2, 1, 7, Qt::AlignLeft );

auto m_searchBar = new QLineEdit(this);
m_searchBar->setPlaceholderText(tr("Search"));
m_searchBar->setMaxLength(35);
m_searchBar->setClearButtonEnabled(true);
m_searchBar->addAction(embed::getIconPixmap("zoom"), QLineEdit::LeadingPosition);
l->addWidget( m_searchBar, 0, 3, 1, 2, Qt::AlignLeft );

connect( m_searchBar, SIGNAL( textEdited( const QString& ) ),
this, SLOT( onFilterChanged( const QString& ) ) );

for( int i = 0; i < 10; i++ )
{
Expand Down Expand Up @@ -1076,21 +1087,32 @@ void ManageVestigeInstrumentView::syncPlugin( void )

void ManageVestigeInstrumentView::displayAutomatedOnly( void )
{
bool isAuto = QString::compare( m_displayAutomatedOnly->text(), tr( "Automated" ) ) == 0;
m_isAuto = !m_isAuto;
displayFilteredKnobs();
}

for( int i = 0; i< m_vi->paramCount; i++ )
{

if( !( m_vi->knobFModel[ i ]->isAutomated() || m_vi->knobFModel[ i ]->controllerConnection() ) )
void ManageVestigeInstrumentView::displayFilteredKnobs( void )
{
if (m_isAuto) {
m_displayAutomatedOnly->setText( "All" );
} else {
m_displayAutomatedOnly->setText( "Automated" );
}

const QMap<QString, QString> & dump = m_vi->m_plugin->parameterDump();
auto paramStr = std::array<char, 35>{};
QStringList s_dumpValues;
for( int i = 0; i < m_vi->paramCount; i++ )
{
sprintf(paramStr.data(), "param%d", i);
s_dumpValues = dump[paramStr.data()].split(":");
if( !s_dumpValues.at(1).contains(m_filter, Qt::CaseInsensitive)
|| (m_isAuto && !( m_vi->knobFModel[ i ]->isAutomated() || m_vi->knobFModel[ i ]->controllerConnection())))
{
if( vstKnobs[ i ]->isVisible() == true && isAuto )
{
vstKnobs[ i ]->hide();
m_displayAutomatedOnly->setText( "All" );
} else {
vstKnobs[ i ]->show();
m_displayAutomatedOnly->setText( "Automated" );
}
vstKnobs[ i ]->hide();
} else {
vstKnobs[ i ]->show();
}
}
}
Expand Down Expand Up @@ -1230,6 +1252,11 @@ void ManageVestigeInstrumentView::paintEvent( QPaintEvent * )
+ tr( " - VST plugin control" ) );
}

void ManageVestigeInstrumentView::onFilterChanged( const QString & filter )
{
m_filter = filter;
displayFilteredKnobs();
}

} // namespace gui

Expand Down
5 changes: 5 additions & 0 deletions plugins/Vestige/Vestige.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@ class ManageVestigeInstrumentView : public InstrumentViewFixedSize
protected slots:
void syncPlugin();
void displayAutomatedOnly();
void displayFilteredKnobs();
void setParameter( lmms::Model * action );
void syncParameterText();
void closeWindow();
void onFilterChanged( const QString & filter );


protected:
Expand All @@ -132,8 +134,11 @@ protected slots:
QGridLayout * l;
QPushButton * m_syncButton;
QPushButton * m_displayAutomatedOnly;
QPushButton * m_searchBar;
QPushButton * m_closeButton;
CustomTextKnob ** vstKnobs;
bool m_isAuto;
QString m_filter;

} ;

Expand Down
56 changes: 40 additions & 16 deletions plugins/VstEffect/VstEffectControls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <QGridLayout>
#include <QMenu>
#include <QPushButton>
#include <QLineEdit>
#include <QScrollArea>

#include "embed.h"
Expand Down Expand Up @@ -353,7 +354,7 @@ ManageVSTEffectView::ManageVSTEffectView( VstEffect * _eff, VstEffectControls *
m_displayAutomatedOnly = new QPushButton( tr( "Automated" ), widget );
connect( m_displayAutomatedOnly, SIGNAL( clicked() ), this,
SLOT( displayAutomatedOnly() ) );

m_isAuto = false;
l->addWidget( m_displayAutomatedOnly, 0, 1, 1, 2, Qt::AlignLeft );


Expand All @@ -363,6 +364,15 @@ ManageVSTEffectView::ManageVSTEffectView( VstEffect * _eff, VstEffectControls *

l->addWidget( m_closeButton, 0, 2, 1, 7, Qt::AlignLeft );

auto m_searchBar = new QLineEdit(widget);
m_searchBar->setPlaceholderText(tr("Search"));
m_searchBar->setMaxLength(35);
m_searchBar->setClearButtonEnabled(true);
m_searchBar->addAction(embed::getIconPixmap("zoom"), QLineEdit::LeadingPosition);
l->addWidget( m_searchBar, 0, 3, 1, 2, Qt::AlignLeft );

connect( m_searchBar, SIGNAL( textEdited( const QString& ) ),
this, SLOT( onFilterChanged( const QString& ) ) );

for( int i = 0; i < 10; i++ )
{
Expand Down Expand Up @@ -471,27 +481,41 @@ void ManageVSTEffectView::syncPlugin()
}


void ManageVSTEffectView::onFilterChanged( const QString & filter )
{
m_filter = filter;
displayFilteredKnobs();
}

void ManageVSTEffectView::displayAutomatedOnly()
void ManageVSTEffectView::displayAutomatedOnly( void )
{
bool isAuto = QString::compare( m_displayAutomatedOnly->text(), tr( "Automated" ) ) == 0;
m_isAuto = !m_isAuto;
displayFilteredKnobs();
}

for( int i = 0; i< m_vi2->paramCount; i++ )
{
void ManageVSTEffectView::displayFilteredKnobs( void )
{
if (m_isAuto) {
m_displayAutomatedOnly->setText( "All" );
} else {
m_displayAutomatedOnly->setText( "Automated" );
}

if( !( m_vi2->knobFModel[ i ]->isAutomated() ||
m_vi2->knobFModel[ i ]->controllerConnection() ) )
const QMap<QString, QString> & dump = m_effect->m_plugin->parameterDump();
auto paramStr = std::array<char, 35>{};
QStringList s_dumpValues;
for( int i = 0; i < m_vi2->paramCount; i++ )
{
sprintf(paramStr.data(), "param%d", i);
s_dumpValues = dump[paramStr.data()].split(":");
if( !s_dumpValues.at(1).contains(m_filter, Qt::CaseInsensitive)
|| (m_isAuto && !( m_vi2->knobFModel[ i ]->isAutomated() || m_vi2->knobFModel[ i ]->controllerConnection())))
{
if( vstKnobs[ i ]->isVisible() == true && isAuto )
{
vstKnobs[ i ]->hide();
m_displayAutomatedOnly->setText( "All" );
} else {
vstKnobs[ i ]->show();
m_displayAutomatedOnly->setText( "Automated" );
}
vstKnobs[ i ]->hide();
} else {
vstKnobs[ i ]->show();
}
}
}
}


Expand Down
5 changes: 5 additions & 0 deletions plugins/VstEffect/VstEffectControls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ class ManageVSTEffectView : public QObject
protected slots:
void syncPlugin();
void displayAutomatedOnly();
void onFilterChanged( const QString & filter );
void displayFilteredKnobs();
void setParameter( lmms::Model * action );
void syncParameterText();
void closeWindow();
Expand All @@ -138,8 +140,11 @@ protected slots:

QPushButton * m_syncButton;
QPushButton * m_displayAutomatedOnly;
QPushButton * m_searchBar;
QPushButton * m_closeButton;
CustomTextKnob ** vstKnobs;
bool m_isAuto;
QString m_filter;

} ;

Expand Down
Loading