EQ Fixed so builds on win, Changed display colors, made res lines thinner

This commit is contained in:
Dave French
2014-12-14 21:13:20 +00:00
parent c5c9b59167
commit b595d432d9
4 changed files with 6 additions and 5 deletions

View File

@@ -2,4 +2,5 @@ INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
LINK_LIBRARIES(${FFTW3F_LIBRARIES})
BUILD_PLUGIN(eq eqeffect.cpp eqcontrols.cpp eqcontrolsdialog.cpp eqfilter.h eqparameterwidget.cpp eqfader.h eqspectrumview.h MOCFILES eqcontrols.h eqparameterwidget.h eqfader.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(eq eqeffect.cpp eqcontrols.cpp eqcontrolsdialog.cpp eqfilter.h eqparameterwidget.cpp eqfader.h eqspectrumview.h ../../src/gui/widgets/Fader.cpp
MOCFILES eqcontrols.h eqparameterwidget.h eqfader.h ../../include/Fader.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

View File

@@ -51,10 +51,10 @@ EqControlsDialog::EqControlsDialog( EqControls *controls ) :
m_inSpec = new EqSpectrumView( &controls->m_inFftBands, this);
m_inSpec->move( 50, 5 );
m_inSpec->color = QColor( 255, 0, 255, 150 );
m_inSpec->color = QColor( 255, 0, 0, 150 );
m_outSpec = new EqSpectrumView( &controls->m_outFftBands, this);
m_outSpec->move( 50, 5 );
m_outSpec->color = QColor(00, 255, 255, 80);
m_outSpec->color = QColor(0, 255, 0, 80);
m_parameterWidget = new EqParameterWidget( this );
m_parameterWidget->move( 50, 5 );

View File

@@ -93,7 +93,7 @@ void EqParameterWidget::paintEvent( QPaintEvent *event )
float bw = m_bands[i].freq->value() / m_bands[i].res->value();
m_bands[i].x = x; m_bands[i].y = y;
painter.drawPoint( x, y );
painter.setPen( QPen( m_bands[i].color, 3, Qt::SolidLine, Qt::SquareCap, Qt::BevelJoin ) );
painter.setPen( QPen( m_bands[i].color, 1, Qt::SolidLine, Qt::SquareCap, Qt::BevelJoin ) );
if( i == 0 || i == bandCount() - 1 )
{
painter.drawLine(x, y, x, y - (m_bands[i].res->value() * 4 ) );

View File

@@ -87,7 +87,7 @@ public:
const int inactiveAlpha()
{
return 100;
return 50;
}