Changeset 1581 for branches/undo/gui/src/PatternEditor/PianoRollEditor.cpp

Timestamp:

03/01/10 01:24:14 (3 years ago)

Author:

wolke

Message:

merge rev 1578:1580 from trunk

Location:

branches/undo

Files:

• . (modified) (1 prop)
• gui/src/PatternEditor/PianoRollEditor.cpp (modified) (2 diffs)

branches/undo/gui/src/PatternEditor/PianoRollEditor.cpp

@@ -423 +423 @@
         uint h = m_nRowHeight - 2;
 
-        int red = (int) (pNote->get_velocity() * 255);
-        int green;
-        int blue;
-        blue = (255 - (int) red)* .33;
-        green =  (255 - (int) red);
+        QColor color = m_pPatternEditorPanel->getDrumPatternEditor()->computeNoteColor( pNote->get_velocity() );
 
         if ( pNote->get_length() == -1 && pNote->get_noteoff() == false ) {
-                pPainter->setBrush(QColor( red,green,blue ));
+                pPainter->setBrush( color );
                 pPainter->drawEllipse( start_x -4 , start_y, w, h );
         }
@@ -444 +440 @@
                 nend = nend - 1;        // lascio un piccolo spazio tra una nota ed un altra
 
-                pPainter->setBrush(QColor( red,green,blue ));
-                pPainter->fillRect( start_x, start_y, nend, h, QColor( red,green,blue ) );
+                pPainter->setBrush( color );
+                pPainter->fillRect( start_x, start_y, nend, h, color );
                 pPainter->drawRect( start_x, start_y, nend, h );
         }