hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Commented out all referances to unused is_selected

Browse Source
This commit is contained in:
TheTravelingSpaceman
2017-02-28 12:26:36 +02:00
parent 3897aa453b
commit 9f689a3599
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/AutomationEditor.h
View File

@@ -126,8 +126,7 @@ protected:
float getLevel( int y );
int xCoordOfTick( int tick );
float yCoordOfLevel( float level );
inline void drawLevelTick( QPainter & p, int tick,
float value, bool is_selected );
inline void drawLevelTick( QPainter & p, int tick, float value);// bool is_selected ); //NEEDS Change in CSS
void removeSelection();
void selectAll();
void getSelectedValues(timeMap & selected_values );

27
src/gui/editors/AutomationEditor.cpp
View File

@@ -1284,7 +1284,8 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
if( validPattern() )
{
int len_ticks = 4;
//NEEDS Change in CSS
//int len_ticks = 4;
timeMap & time_map = m_pattern->getTimeMap();
//Don't bother doing/rendering anything if there is no automation points
@@ -1307,8 +1308,9 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
{
break;
}
bool is_selected = false;
//NEEDS Change in CSS
/*bool is_selected = false;
// if we're in move-mode, we may only draw
// values in selected area, that have originally
// been selected and not values that are now in
@@ -1326,7 +1328,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
it.key() + len_ticks <= sel_pos_end )
{
is_selected = true;
}
}*/
float *values = m_pattern->valuesAfter( it.key() );
@@ -1341,7 +1343,8 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
path.moveTo( QPointF( xCoordOfTick( it.key() ), yCoordOfLevel( 0 ) ) );
for( int i = 0; i < ( it + 1 ).key() - it.key(); i++ )
{ path.lineTo( QPointF( xCoordOfTick( it.key() + i ), yCoordOfLevel( values[i] ) ) );
//drawLevelTick( p, it.key() + i, values[i], is_selected );
//NEEDS Change in CSS
//drawLevelTick( p, it.key() + i, values[i], is_selected );
}
path.lineTo( QPointF( xCoordOfTick( ( it + 1 ).key() ), yCoordOfLevel( nextValue ) ) );
@@ -1363,7 +1366,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
// TODO: Find out if the section after the last control
// point is able to be selected and if so set this
// boolean correctly
drawLevelTick( p, i, it.value(), false );
drawLevelTick( p, i, it.value()); ////NEEDS Change in CSS:, false );
}
// Draw circle(the last one)
drawAutomationPoint(p, it);
@@ -1463,8 +1466,9 @@ float AutomationEditor::yCoordOfLevel(float level )
void AutomationEditor::drawLevelTick(QPainter & p, int tick, float value,
bool is_selected )
//NEEDS Change in CSS
void AutomationEditor::drawLevelTick(QPainter & p, int tick, float value)
// bool is_selected )
{
int grid_bottom = height() - SCROLLBAR_SIZE - 1;
const int x = xCoordOfTick( tick );
@@ -1492,10 +1496,15 @@ void AutomationEditor::drawLevelTick(QPainter & p, int tick, float value,
rect_height = (int)( value * m_y_delta );
}
QBrush currentColor = is_selected
//NEEDS Change in CSS
/*QBrush currentColor = is_selected
? QBrush( QColor( 0x00, 0x40, 0xC0 ) )
: graphColor();
*/
QBrush currentColor = graphColor();
p.fillRect( x, y_start, rect_width, rect_height, currentColor );
}