Diffstat (limited to 'noncore/multimedia/tonleiter/tonleiterdata.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/tonleiter/tonleiterdata.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/noncore/multimedia/tonleiter/tonleiterdata.cpp b/noncore/multimedia/tonleiter/tonleiterdata.cpp index 33b3c49..564b7f0 100644 --- a/noncore/multimedia/tonleiter/tonleiterdata.cpp +++ b/noncore/multimedia/tonleiter/tonleiterdata.cpp | |||
@@ -1,30 +1,31 @@ | |||
1 | #include "tonleiterdata.h" | 1 | #include "tonleiterdata.h" |
2 | |||
3 | #include <qpe/config.h> | ||
4 | |||
5 | using namespace Data; | 2 | using namespace Data; |
6 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | #include <qpe/config.h> | ||
7 | using namespace Opie::Core; | ||
7 | 8 | ||
8 | TonleiterData::TonleiterData(QObject* parent) | 9 | TonleiterData::TonleiterData(QObject* parent) |
9 | :QObject(parent) | 10 | :QObject(parent) |
10 | { | 11 | { |
11 | drawnames=true; | 12 | drawnames=true; |
12 | loadData(); | 13 | loadData(); |
13 | } | 14 | } |
14 | //**************************************************************************** | 15 | //**************************************************************************** |
15 | TonleiterData::~TonleiterData() | 16 | TonleiterData::~TonleiterData() |
16 | { | 17 | { |
17 | saveData(); | 18 | saveData(); |
18 | } | 19 | } |
19 | //**************************************************************************** | 20 | //**************************************************************************** |
20 | void TonleiterData::setCurrentInstrumetID(int id) | 21 | void TonleiterData::setCurrentInstrumetID(int id) |
21 | { | 22 | { |
22 | if(id>=0 && id<noOfInstruments()) | 23 | if(id>=0 && id<noOfInstruments()) |
23 | { | 24 | { |
24 | currentInstrumentID=id; | 25 | currentInstrumentID=id; |
25 | emit dataChange(); | 26 | emit dataChange(); |
26 | } | 27 | } |
27 | } | 28 | } |
28 | //**************************************************************************** | 29 | //**************************************************************************** |
29 | void TonleiterData::setCurrentScaleID(int id) | 30 | void TonleiterData::setCurrentScaleID(int id) |
30 | { | 31 | { |
@@ -131,68 +132,68 @@ void TonleiterData::saveData() | |||
131 | save.setGroup("Scale"); | 132 | save.setGroup("Scale"); |
132 | save.writeEntry("noOfScales",noOfScales()); | 133 | save.writeEntry("noOfScales",noOfScales()); |
133 | for(int s=0;s<noOfScales();s++) | 134 | for(int s=0;s<noOfScales();s++) |
134 | { | 135 | { |
135 | QStringList scalelist; | 136 | QStringList scalelist; |
136 | Scale scale=getScale(s); | 137 | Scale scale=getScale(s); |
137 | scalelist.append(scale.scaleName()); | 138 | scalelist.append(scale.scaleName()); |
138 | for(int ht=0;ht<scale.noOfHaltones();ht++) | 139 | for(int ht=0;ht<scale.noOfHaltones();ht++) |
139 | scalelist.append(QString::number(scale.getHalfTone(ht))); | 140 | scalelist.append(QString::number(scale.getHalfTone(ht))); |
140 | save.writeEntry("Scale"+QString::number(s),scalelist,';'); | 141 | save.writeEntry("Scale"+QString::number(s),scalelist,';'); |
141 | } | 142 | } |
142 | } | 143 | } |
143 | //**************************************************************************** | 144 | //**************************************************************************** |
144 | int TonleiterData::noOfInstruments() | 145 | int TonleiterData::noOfInstruments() |
145 | { | 146 | { |
146 | return (int)instruments.count(); | 147 | return (int)instruments.count(); |
147 | } | 148 | } |
148 | //**************************************************************************** | 149 | //**************************************************************************** |
149 | Instrument TonleiterData::getInstrument(int id) | 150 | Instrument TonleiterData::getInstrument(int id) |
150 | { | 151 | { |
151 | if(id>=0 && id<noOfInstruments()) | 152 | if(id>=0 && id<noOfInstruments()) |
152 | return instruments[id]; | 153 | return instruments[id]; |
153 | else | 154 | else |
154 | { | 155 | { |
155 | qDebug("undefined insrtument %d of %d",id,instruments.count()); | 156 | odebug << "undefined insrtument " << id << " of " << instruments.count() << "" << oendl; |
156 | return Instrument(); | 157 | return Instrument(); |
157 | } | 158 | } |
158 | 159 | ||
159 | } | 160 | } |
160 | //**************************************************************************** | 161 | //**************************************************************************** |
161 | int TonleiterData::getCurrentInstrumentID() | 162 | int TonleiterData::getCurrentInstrumentID() |
162 | { | 163 | { |
163 | return currentInstrumentID; | 164 | return currentInstrumentID; |
164 | } | 165 | } |
165 | //**************************************************************************** | 166 | //**************************************************************************** |
166 | int TonleiterData::noOfScales() | 167 | int TonleiterData::noOfScales() |
167 | { | 168 | { |
168 | return (int)scales.count(); | 169 | return (int)scales.count(); |
169 | } | 170 | } |
170 | //**************************************************************************** | 171 | //**************************************************************************** |
171 | Scale TonleiterData::getScale(int id) | 172 | Scale TonleiterData::getScale(int id) |
172 | { | 173 | { |
173 | if(id>=0 && id<noOfScales()) | 174 | if(id>=0 && id<noOfScales()) |
174 | return scales[id]; | 175 | return scales[id]; |
175 | else | 176 | else |
176 | { | 177 | { |
177 | qDebug("Undefined scale"); | 178 | odebug << "Undefined scale" << oendl; |
178 | return Scale(); | 179 | return Scale(); |
179 | } | 180 | } |
180 | } | 181 | } |
181 | //**************************************************************************** | 182 | //**************************************************************************** |
182 | int TonleiterData::getCurrentScaleID() | 183 | int TonleiterData::getCurrentScaleID() |
183 | { | 184 | { |
184 | return currentScaleID; | 185 | return currentScaleID; |
185 | } | 186 | } |
186 | //**************************************************************************** | 187 | //**************************************************************************** |
187 | int TonleiterData::getCurrentBaseNote() | 188 | int TonleiterData::getCurrentBaseNote() |
188 | { | 189 | { |
189 | return currentNote; | 190 | return currentNote; |
190 | } | 191 | } |
191 | //**************************************************************************** | 192 | //**************************************************************************** |
192 | bool TonleiterData::isDrawNames() | 193 | bool TonleiterData::isDrawNames() |
193 | { | 194 | { |
194 | return drawnames; | 195 | return drawnames; |
195 | } | 196 | } |
196 | //**************************************************************************** | 197 | //**************************************************************************** |
197 | //**************************************************************************** | 198 | //**************************************************************************** |
198 | 199 | ||