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

Piano roll vertical zoom #5442

Merged
merged 10 commits into from
Apr 30, 2020
Merged

Piano roll vertical zoom #5442

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a4909e6
Preparing piano roll for changing the height of the keys.
akimaze Apr 7, 2020
5fca16b
Implemented piano roll vertical zooming.
akimaze Apr 7, 2020
c69f026
Removed static from PianoRoll:drawNoteRect() and s_keyLineHeight --> …
akimaze Apr 14, 2020
ff519e4
Unnecessary round() when multiplying by 2.
akimaze Apr 14, 2020
460ffd9
Center note text vertically.
akimaze Apr 16, 2020
c1ddc58
Simplification of calculations.
akimaze Apr 16, 2020
4de220f
Better note text height calculation (proposed by PhysSong).
akimaze Apr 20, 2020
101c0d2
Fixed white keys names positions.
akimaze Apr 21, 2020
78f835e
Change fontMetrics.boundingRect().height() to - boundingRect.top() - …
akimaze Apr 23, 2020
1153549
Changed name from fontHeight to labelHeight.
akimaze Apr 29, 2020
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
14 changes: 13 additions & 1 deletion include/PianoRoll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class PianoRoll : public QWidget
void focusOutEvent( QFocusEvent * ) override;

int getKey( int y ) const;
static void drawNoteRect( QPainter & p, int x, int y,
void drawNoteRect( QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol, const QColor & noteTextColor,
const QColor & selCol, const int noteOpc, const bool borderless, bool drawNoteName );
void removeSelection();
Expand All @@ -192,6 +192,8 @@ class PianoRoll : public QWidget
// for entering values with dblclick in the vol/pan bars
void enterValue( NoteVector* nv );

void updateYScroll();

protected slots:
void play();
void record();
Expand All @@ -217,6 +219,7 @@ protected slots:
void updatePositionStepRecording(const MidiTime & t );

void zoomingChanged();
void zoomingYChanged();
void quantizeChanged();
void noteLengthChanged();
void quantizeNotes();
Expand Down Expand Up @@ -330,12 +333,14 @@ protected slots:
static TextFloat * s_textFloat;

ComboBoxModel m_zoomingModel;
ComboBoxModel m_zoomingYModel;
ComboBoxModel m_quantizeModel;
ComboBoxModel m_noteLenModel;
ComboBoxModel m_scaleModel;
ComboBoxModel m_chordModel;

static const QVector<double> m_zoomLevels;
static const QVector<double> m_zoomYLevels;

Pattern* m_pattern;
NoteVector m_ghostNotes;
Expand Down Expand Up @@ -385,6 +390,12 @@ protected slots:
int m_ppb; // pixels per bar
int m_totalKeysToScroll;

int m_keyLineHeight;
int m_octaveHeight;
int m_whiteKeySmallHeight;
int m_whiteKeyBigHeight;
int m_blackKeyHeight;

// remember these values to use them
// for the next note that is set
MidiTime m_lenOfNewNotes;
Expand Down Expand Up @@ -501,6 +512,7 @@ private slots:
PianoRoll* m_editor;

ComboBox * m_zoomingComboBox;
ComboBox * m_zoomingYComboBox;
ComboBox * m_quantizeComboBox;
ComboBox * m_noteLenComboBox;
ComboBox * m_scaleComboBox;
Expand Down
Loading