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.

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

Enable mixer color-coding #5589

Merged
merged 22 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
5 changes: 5 additions & 0 deletions include/FxLine.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#ifndef FX_LINE_H
#define FX_LINE_H

#include <QColorDialog>
#include <QGraphicsView>
#include <QLineEdit>
#include <QWidget>
Expand Down Expand Up @@ -98,9 +99,13 @@ class FxLine : public QWidget
bool m_inRename;
QLineEdit * m_renameLineEdit;
QGraphicsView * m_view;
QColorDialog m_dialog;

public slots:
void renameChannel();
void resetColor();
void changeColor();
void randomColor();

private slots:
void renameFinished();
Expand Down
5 changes: 5 additions & 0 deletions include/FxMixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

#include <atomic>

#include <QColor>

class FxRoute;
typedef QVector<FxRoute *> FxRouteVector;

Expand Down Expand Up @@ -69,6 +71,9 @@ class FxChannel : public ThreadableJob

bool requiresProcessing() const override { return true; }
void unmuteForSolo();

QColor m_color;
bool m_hasColor;


std::atomic_int m_dependenciesMet;
Expand Down
8 changes: 8 additions & 0 deletions src/core/FxMixer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ FxChannel::FxChannel( int idx, Model * _parent ) :
m_lock(),
m_channelIndex( idx ),
m_queued( false ),
m_hasColor( false ),
m_dependenciesMet(0)
{
BufferManager::clear( m_buffer, Engine::mixer()->framesPerPeriod() );
Expand Down Expand Up @@ -741,6 +742,8 @@ void FxMixer::saveSettings( QDomDocument & _doc, QDomElement & _this )
ch->m_soloModel.saveSettings( _doc, fxch, "soloed" );
fxch.setAttribute( "num", i );
fxch.setAttribute( "name", ch->m_name );
fxch.setAttribute( "hascolor", ch->m_hasColor );
fxch.setAttribute( "mixercolor", ch->m_color.rgb() );

// add the channel sends
for( int si = 0; si < ch->m_sends.size(); ++si )
Expand Down Expand Up @@ -786,6 +789,11 @@ void FxMixer::loadSettings( const QDomElement & _this )
m_fxChannels[num]->m_muteModel.loadSettings( fxch, "muted" );
m_fxChannels[num]->m_soloModel.loadSettings( fxch, "soloed" );
m_fxChannels[num]->m_name = fxch.attribute( "name" );
if( fxch.hasAttribute( "hascolor" ) )
{
m_fxChannels[num]->m_hasColor = fxch.attribute( "hascolor" ).toInt();
m_fxChannels[num]->m_color.setRgb( fxch.attribute( "mixercolor" ).toUInt() );
}

m_fxChannels[num]->m_fxChain.restoreState( fxch.firstChildElement(
m_fxChannels[num]->m_fxChain.nodeName() ) );
Expand Down
70 changes: 67 additions & 3 deletions src/gui/widgets/FxLine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@

#include "FxLine.h"

#include <cstdlib>
#include <ctime>

#include <QGraphicsProxyWidget>

#include "CaptionMenu.h"
Expand Down Expand Up @@ -65,7 +68,8 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex ) :
m_strokeOuterInactive( 0, 0, 0 ),
m_strokeInnerActive( 0, 0, 0 ),
m_strokeInnerInactive( 0, 0, 0 ),
m_inRename( false )
m_inRename( false ),
m_dialog( QColor( 0, 0, 0 ) )
{
if( !s_sendBgArrow )
{
Expand Down Expand Up @@ -120,6 +124,22 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex ) :
proxyWidget->setPos( 8, 145 );

connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) );

connect( &Engine::fxMixer()->effectChannel( m_channelIndex )->m_muteModel, SIGNAL( dataChanged() ), this, SLOT( update() ) );

srand( time( 0 ) );

QColor buffer;
for( int i = 0; i < 48; i += 6 )
{
for( int j = 0; j < 6; j++ )
{
buffer.setHsl( qMax( 0, 44 * ( i / 6 ) - 1 ), 150 - 20 * j, 140 - 10 * j );
m_dialog.setStandardColor( i + j, buffer );
}

}

}


Expand Down Expand Up @@ -147,8 +167,11 @@ void FxLine::setChannelIndex( int index )

void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool sendToThis, bool receiveFromThis )
{
QString name = Engine::fxMixer()->effectChannel( m_channelIndex )->m_name;
auto channel = Engine::fxMixer()->effectChannel( m_channelIndex );
bool muted = channel->m_muteModel.value();
QString name = channel->m_name;
QString elidedName = elideName( name );

if( !m_inRename && m_renameLineEdit->text() != elidedName )
{
m_renameLineEdit->setText( elidedName );
Expand All @@ -157,7 +180,13 @@ void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool
int width = fxLine->rect().width();
int height = fxLine->rect().height();

p->fillRect( fxLine->rect(), isActive ? fxLine->backgroundActive() : p->background() );
QColor color = muted ? ( isActive ? fxLine->backgroundActive().color() : p->background().color() )
: ( channel->m_hasColor ? ( isActive ? channel->m_color.darker( 120 )
: channel->m_color.darker( 150 ) )
: ( isActive ? fxLine->backgroundActive().color()
: p->background().color() ) );

p->fillRect( fxLine->rect(), color );

// inner border
p->setPen( isActive ? fxLine->strokeInnerActive() : fxLine->strokeInnerInactive() );
Expand Down Expand Up @@ -238,6 +267,11 @@ void FxLine::contextMenuEvent( QContextMenuEvent * )
contextMenu->addSeparator();
}
contextMenu->addAction( embed::getIconPixmap( "cancel" ), tr( "Remove &unused channels" ), this, SLOT( removeUnusedChannels() ) );

contextMenu->addSeparator();
contextMenu->addAction( embed::getIconPixmap( "colorize" ), tr( "Set channel color" ), this, SLOT( changeColor() ) );
contextMenu->addAction( embed::getIconPixmap( "colorize" ), tr( "Remove channel color" ), this, SLOT( resetColor() ) );
contextMenu->addAction( embed::getIconPixmap( "colorize" ), tr( "Pick random channel color" ), this, SLOT( randomColor() ) );
contextMenu->exec( QCursor::pos() );
delete contextMenu;
}
Expand Down Expand Up @@ -395,3 +429,33 @@ void FxLine::setStrokeInnerInactive( const QColor & c )
{
m_strokeInnerInactive = c;
}

void FxLine::changeColor()
{
auto channel = Engine::fxMixer()->effectChannel( m_channelIndex );

QColor new_color = m_dialog.getColor( channel->m_color );
if( ! new_color.isValid() )
{ return; }

channel->m_color = new_color;
channel->m_hasColor = true;

update();
}

void FxLine::resetColor()
{
Engine::fxMixer()->effectChannel( m_channelIndex )->m_hasColor = false;
update();
}

void FxLine::randomColor()
{
auto channel = Engine::fxMixer()->effectChannel( m_channelIndex );

channel->m_color = m_dialog.standardColor( rand() % 48 );
channel->m_hasColor = true;

update();
}