summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/scoreedit.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-04-11 12:30:11 +0000
committerFlorian Jung <flo@windfisch.org>2011-04-11 12:30:11 +0000
commitbe4e0679ad4a847f7b3f7e9cb85e54be2f32085f (patch)
treeb9f7e2ed090acbea8832fd49ab49cb11f2d9fa90 /muse2/muse/midiedit/scoreedit.h
parentd80dde88f453a5a032213aaacb77d6851b127e69 (diff)
implemented highlighting currently played notes
plus bugfix: manipulating non-zero-aligned parts works now correctly plus some cosmetic stuff in the source (ints -> unsigneds)
Diffstat (limited to 'muse2/muse/midiedit/scoreedit.h')
-rw-r--r--muse2/muse/midiedit/scoreedit.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/muse2/muse/midiedit/scoreedit.h b/muse2/muse/midiedit/scoreedit.h
index 84d61d11..3542a529 100644
--- a/muse2/muse/midiedit/scoreedit.h
+++ b/muse2/muse/midiedit/scoreedit.h
@@ -225,6 +225,8 @@ class FloItem
mutable int stem_x;
mutable QPixmap* pix;
+ mutable bool is_active;
+
QRect bbox() const;
@@ -405,6 +407,8 @@ struct cumulative_t
};
#define BLACK_PIXMAP (NUM_PARTCOLORS)
+#define HIGHLIGHTED_PIXMAP (NUM_PARTCOLORS+1)
+
struct timesig_t
{
int num;
@@ -453,13 +457,18 @@ class ScoreCanvas : public View
int calc_posadd(int t);
+
+ bool need_redraw_for_hilighting(ScoreItemList::iterator from_it, ScoreItemList::iterator to_it);
+ bool need_redraw_for_hilighting(int x1, int x2);
+ bool need_redraw_for_hilighting();
+
int canvas_width();
int viewport_width();
- QPixmap pix_whole[NUM_PARTCOLORS+1], pix_half[NUM_PARTCOLORS+1], pix_quarter[NUM_PARTCOLORS+1];
+ QPixmap pix_whole[NUM_PARTCOLORS+2], pix_half[NUM_PARTCOLORS+2], pix_quarter[NUM_PARTCOLORS+2];
QPixmap pix_r1, pix_r2, pix_r4, pix_r8, pix_r16;
- QPixmap pix_dot[NUM_PARTCOLORS+1], pix_flag_up[4], pix_flag_down[4];
- QPixmap pix_b[NUM_PARTCOLORS+1], pix_sharp[NUM_PARTCOLORS+1], pix_noacc[NUM_PARTCOLORS+1];
+ QPixmap pix_dot[NUM_PARTCOLORS+2], pix_flag_up[4], pix_flag_down[4];
+ QPixmap pix_b[NUM_PARTCOLORS+2], pix_sharp[NUM_PARTCOLORS+2], pix_noacc[NUM_PARTCOLORS+2];
QPixmap pix_num[10];
QPixmap pix_clef_violin, pix_clef_bass;