Diffstat (limited to 'noncore/multimedia/tonleiter/fretboard.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/tonleiter/fretboard.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/noncore/multimedia/tonleiter/fretboard.h b/noncore/multimedia/tonleiter/fretboard.h index eb509b0..458c733 100644 --- a/noncore/multimedia/tonleiter/fretboard.h +++ b/noncore/multimedia/tonleiter/fretboard.h | |||
@@ -1,23 +1,27 @@ | |||
1 | #ifndef TONLEITER_FRET_BOARD_H | 1 | #ifndef TONLEITER_FRET_BOARD_H |
2 | #define TONLEITER_FRET_BOARD_H | 2 | #define TONLEITER_FRET_BOARD_H |
3 | 3 | ||
4 | #include <qbrush.h> | 4 | #include <qbrush.h> |
5 | #include <qpen.h> | 5 | #include <qpen.h> |
6 | #include <qvaluelist.h> | 6 | #include <qvaluelist.h> |
7 | #include <qwidget.h> | 7 | #include <qwidget.h> |
8 | 8 | ||
9 | 9 | ||
10 | #include "tonleiterdata.h" | 10 | #include "tonleiterdata.h" |
11 | 11 | ||
12 | using namespace Data; | ||
13 | |||
14 | namespace Graph | ||
15 | { | ||
12 | class FretBoard : public QWidget | 16 | class FretBoard : public QWidget |
13 | { | 17 | { |
14 | Q_OBJECT | 18 | Q_OBJECT |
15 | private: | 19 | private: |
16 | TonleiterData* data; | 20 | TonleiterData* data; |
17 | 21 | ||
18 | QPen fretpen; | 22 | QPen fretpen; |
19 | QBrush markerbrush; | 23 | QBrush markerbrush; |
20 | QPen stringpen; | 24 | QPen stringpen; |
21 | 25 | ||
22 | Instrument inst; | 26 | Instrument inst; |
23 | 27 | ||
@@ -33,22 +37,20 @@ private: | |||
33 | 37 | ||
34 | double fretdist; | 38 | double fretdist; |
35 | double stringdist; | 39 | double stringdist; |
36 | 40 | ||
37 | public: | 41 | public: |
38 | FretBoard(TonleiterData* data,QWidget* parent,const char* name="FretBoard",WFlags f=0); | 42 | FretBoard(TonleiterData* data,QWidget* parent,const char* name="FretBoard",WFlags f=0); |
39 | virtual ~FretBoard(); | 43 | virtual ~FretBoard(); |
40 | private slots: | 44 | private slots: |
41 | void dataChange(); | 45 | void dataChange(); |
42 | private: | 46 | private: |
43 | void paintEvent(QPaintEvent* pe); | 47 | void paintEvent(QPaintEvent* pe); |
44 | void resizeEvent(QResizeEvent* re); | 48 | void resizeEvent(QResizeEvent* re); |
45 | //void mousePressEvent(QMouseEvent* mpe); | ||
46 | //void mouseMoveEvent(QMouseEvent* mme); | ||
47 | //void mouseReleaseEvent(QMouseEvent* mre); | ||
48 | void paintBoard(QPainter* p); | 49 | void paintBoard(QPainter* p); |
49 | void paintFrets(QPainter* p); | 50 | void paintFrets(QPainter* p); |
50 | void paintStrings(QPainter* p); | 51 | void paintStrings(QPainter* p); |
51 | void paintScale(QPainter* p); | 52 | void paintScale(QPainter* p); |
52 | }; | 53 | }; |
54 | }; | ||
53 | 55 | ||
54 | #endif //TONLEITER_FRET_BOARD_H | 56 | #endif //TONLEITER_FRET_BOARD_H |