Skip to content

Commit 33fddc2

Browse files
juli27juli27
committed
Address review comments
1 parent cbe4fa0 commit 33fddc2

File tree

8 files changed

+39
-12
lines changed

8 files changed

+39
-12
lines changed

‎src/engraving/dom/clef.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ PropertyValue Clef::getProperty(Pid propertyId) const
284284
case Pid::CLEF_TYPE_TRANSPOSING: return m_clefTypes.transposingClef;
285285
case Pid::SHOW_COURTESY: return showCourtesy();
286286
case Pid::SMALL: return isSmall();
287-
case Pid::CLEF_TO_BARLINE_POS: return static_cast<int>(m_clefToBarlinePosition);
287+
case Pid::CLEF_TO_BARLINE_POS: return m_clefToBarlinePosition;
288288
case Pid::IS_HEADER: return m_isHeader;
289289
case Pid::IS_COURTESY: return m_isCourtesy;
290290
default:
@@ -319,7 +319,7 @@ bool Clef::setProperty(Pid propertyId, const PropertyValue& v)
319319
setSmall(v.toBool());
320320
break;
321321
case Pid::CLEF_TO_BARLINE_POS: {
322-
const auto newClefToBlPos = ClefToBarlinePosition(v.value<int>());
322+
const auto newClefToBlPos = v.value<ClefToBarlinePosition>();
323323

324324
if (newClefToBlPos != m_clefToBarlinePosition && !m_isHeader) {
325325
changeClefToBarlinePos(newClefToBlPos);
@@ -406,7 +406,7 @@ PropertyValue Clef::propertyDefault(Pid id) const
406406
case Pid::CLEF_TYPE_TRANSPOSING: return ClefType::INVALID;
407407
case Pid::SHOW_COURTESY: return true;
408408
case Pid::SMALL: return false;
409-
case Pid::CLEF_TO_BARLINE_POS: return static_cast<int>(ClefToBarlinePosition::AUTO);
409+
case Pid::CLEF_TO_BARLINE_POS: return ClefToBarlinePosition::AUTO;
410410
case Pid::IS_HEADER: return false;
411411
case Pid::IS_COURTESY: return false;
412412
default: return EngravingItem::propertyDefault(id);

‎src/engraving/dom/ornament.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ PropertyValue Ornament::getProperty(Pid propertyId) const
135135
case Pid::INTERVAL_BELOW:
136136
return _intervalBelow;
137137
case Pid::ORNAMENT_SHOW_ACCIDENTAL:
138-
return static_cast<int>(_showAccidental);
138+
return _showAccidental;
139139
case Pid::ORNAMENT_SHOW_CUE_NOTE:
140140
return m_showCueNote;
141141
case Pid::START_ON_UPPER_NOTE:
@@ -162,7 +162,7 @@ PropertyValue Ornament::propertyDefault(Pid id) const
162162
case Pid::INTERVAL_BELOW:
163163
return DEFAULT_ORNAMENT_INTERVAL;
164164
case Pid::ORNAMENT_SHOW_ACCIDENTAL:
165-
return static_cast<int>(OrnamentShowAccidental::DEFAULT);
165+
return OrnamentShowAccidental::DEFAULT;
166166
case Pid::ORNAMENT_SHOW_CUE_NOTE:
167167
return AutoOnOff::AUTO;
168168
case Pid::START_ON_UPPER_NOTE:
@@ -184,7 +184,7 @@ bool Ornament::setProperty(Pid propertyId, const PropertyValue& v)
184184
setIntervalBelow(v.value<OrnamentInterval>());
185185
break;
186186
case Pid::ORNAMENT_SHOW_ACCIDENTAL:
187-
setShowAccidental(OrnamentShowAccidental(v.value<int>()));
187+
setShowAccidental(v.value<OrnamentShowAccidental>());
188188
break;
189189
case Pid::ORNAMENT_SHOW_CUE_NOTE:
190190
setShowCueNote(v.value<AutoOnOff>());

‎src/engraving/dom/property.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static constexpr PropertyMetaData propertyList[] = {
6969
{ Pid::SHOW_IF_ENTIRE_SYSTEM_EMPTY, false, "showIfEntireSystemEmpty", P_TYPE::BOOL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "show if entire system empty") },
7070
{ Pid::SHOW_COURTESY, false, "showCourtesySig", P_TYPE::BOOL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "show courtesy") },
7171
{ Pid::KEYSIG_MODE, false, "keysig_mode", P_TYPE::KEY_MODE, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "key signature mode") },
72-
{ Pid::SLUR_STYLE_TYPE, false, "lineType", P_TYPE::INT, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "line type") },
72+
{ Pid::SLUR_STYLE_TYPE, false, "lineType", P_TYPE::SLUR_STYLE_TYPE, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "line type") },
7373
{ Pid::PITCH, true, "pitch", P_TYPE::INT, PropertyGroup::NONE, QT_TRANSLATE_NOOP("engraving/propertyName", "pitch") },
7474

7575
{ Pid::TPC1, true, "tpc", P_TYPE::INT, PropertyGroup::NONE, QT_TRANSLATE_NOOP("engraving/propertyName", "tonal pitch class") },
@@ -230,7 +230,7 @@ static constexpr PropertyMetaData propertyList[] = {
230230
{ Pid::ORNAMENT_STYLE, true, "ornamentStyle", P_TYPE::ORNAMENT_STYLE, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "ornament style") },
231231
{ Pid::INTERVAL_ABOVE, true, "intervalAbove", P_TYPE::ORNAMENT_INTERVAL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "interval above") },
232232
{ Pid::INTERVAL_BELOW, true, "intervalBelow", P_TYPE::ORNAMENT_INTERVAL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "interval below") },
233-
{ Pid::ORNAMENT_SHOW_ACCIDENTAL,true, "ornamentShowAccidental",P_TYPE::INT, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "ornament show accidental") },
233+
{ Pid::ORNAMENT_SHOW_ACCIDENTAL,true, "ornamentShowAccidental",P_TYPE::ORNAMENT_SHOW_ACCIDENTAL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "ornament show accidental") },
234234
{ Pid::ORNAMENT_SHOW_CUE_NOTE, true, "ornamentShowCueNote", P_TYPE::AUTO_ON_OFF, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "ornament show cue note") },
235235
{ Pid::START_ON_UPPER_NOTE, true, "startOnUpperNote", P_TYPE::BOOL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "start on upper note") },
236236

@@ -398,7 +398,7 @@ static constexpr PropertyMetaData propertyList[] = {
398398

399399
{ Pid::CLEF_TYPE_CONCERT, true, "concertClefType", P_TYPE::CLEF_TYPE, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "concert clef type") },
400400
{ Pid::CLEF_TYPE_TRANSPOSING, true, "transposingClefType", P_TYPE::CLEF_TYPE, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "transposing clef type") },
401-
{ Pid::CLEF_TO_BARLINE_POS, true, "clefToBarlinePos", P_TYPE::INT, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "clef to barline position") },
401+
{ Pid::CLEF_TO_BARLINE_POS, true, "clefToBarlinePos", P_TYPE::CLEF_TO_BARLINE_POS, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "clef to barline position") },
402402
{ Pid::IS_HEADER, true, "isHeader", P_TYPE::BOOL, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "is header")},
403403
{ Pid::KEY_CONCERT, true, "concertKey", P_TYPE::INT, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "concert key") },
404404
{ Pid::KEY, true, "actualKey", P_TYPE::INT, PropertyGroup::APPEARANCE, QT_TRANSLATE_NOOP("engraving/propertyName", "key") },

‎src/engraving/dom/slurtie.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ PropertyValue SlurTie::getProperty(Pid propertyId) const
366366
{
367367
switch (propertyId) {
368368
case Pid::SLUR_STYLE_TYPE:
369-
return static_cast<int>(styleType());
369+
return styleType();
370370
case Pid::SLUR_DIRECTION:
371371
return PropertyValue::fromValue<DirectionV>(slurDirection());
372372
default:
@@ -382,7 +382,7 @@ bool SlurTie::setProperty(Pid propertyId, const PropertyValue& v)
382382
{
383383
switch (propertyId) {
384384
case Pid::SLUR_STYLE_TYPE:
385-
setStyleType(SlurStyleType(v.value<int>()));
385+
setStyleType(v.value<SlurStyleType>());
386386
break;
387387
case Pid::SLUR_DIRECTION:
388388
setSlurDirection(v.value<DirectionV>());
@@ -402,7 +402,7 @@ PropertyValue SlurTie::propertyDefault(Pid id) const
402402
{
403403
switch (id) {
404404
case Pid::SLUR_STYLE_TYPE:
405-
return static_cast<int>(SlurStyleType::Solid);
405+
return SlurStyleType::Solid;
406406
case Pid::SLUR_DIRECTION:
407407
return PropertyValue::fromValue<DirectionV>(DirectionV::AUTO);
408408
default:

‎src/engraving/rw/read400/tread.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
203203
return PropertyValue::fromValue(TConv::fromXml(e.readAsciiText(), OrnamentStyle::DEFAULT));
204204
case P_TYPE::ORNAMENT_INTERVAL:
205205
return PropertyValue(TConv::fromXml(e.readText(), DEFAULT_ORNAMENT_INTERVAL));
206+
case P_TYPE::ORNAMENT_SHOW_ACCIDENTAL:
207+
return OrnamentShowAccidental(e.readInt());
206208
case P_TYPE::POINT:
207209
return PropertyValue::fromValue(e.readPoint());
208210
case P_TYPE::SCALE:
@@ -245,6 +247,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
245247

246248
case P_TYPE::CLEF_TYPE:
247249
return PropertyValue(TConv::fromXml(e.readAsciiText(), ClefType::G));
250+
case P_TYPE::CLEF_TO_BARLINE_POS:
251+
return ClefToBarlinePosition(e.readInt());
248252

249253
case P_TYPE::DYNAMIC_TYPE:
250254
return PropertyValue(TConv::fromXml(e.readAsciiText(), DynamicType::OTHER));
@@ -259,6 +263,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
259263

260264
case P_TYPE::TEXT_STYLE:
261265
return PropertyValue(TConv::fromXml(e.readAsciiText(), TextStyleType::DEFAULT));
266+
case P_TYPE::SLUR_STYLE_TYPE:
267+
return SlurStyleType(e.readInt());
262268

263269
case P_TYPE::CHANGE_METHOD:
264270
return PropertyValue(TConv::fromXml(e.readAsciiText(), ChangeMethod::NORMAL));

‎src/engraving/rw/read410/tread.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
362362
return PropertyValue::fromValue(TConv::fromXml(e.readAsciiText(), OrnamentStyle::DEFAULT));
363363
case P_TYPE::ORNAMENT_INTERVAL:
364364
return PropertyValue(TConv::fromXml(e.readText(), DEFAULT_ORNAMENT_INTERVAL));
365+
case P_TYPE::ORNAMENT_SHOW_ACCIDENTAL:
366+
return OrnamentShowAccidental(e.readInt());
365367
case P_TYPE::POINT:
366368
return PropertyValue::fromValue(e.readPoint());
367369
case P_TYPE::SCALE:
@@ -406,6 +408,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
406408

407409
case P_TYPE::CLEF_TYPE:
408410
return PropertyValue(TConv::fromXml(e.readAsciiText(), ClefType::G));
411+
case P_TYPE::CLEF_TO_BARLINE_POS:
412+
return ClefToBarlinePosition(e.readInt());
409413

410414
case P_TYPE::DYNAMIC_TYPE:
411415
return PropertyValue(TConv::fromXml(e.readAsciiText(), DynamicType::OTHER));
@@ -420,6 +424,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
420424

421425
case P_TYPE::TEXT_STYLE:
422426
return PropertyValue(TConv::fromXml(e.readAsciiText(), TextStyleType::DEFAULT));
427+
case P_TYPE::SLUR_STYLE_TYPE:
428+
return SlurStyleType(e.readInt());
423429

424430
case P_TYPE::CHANGE_METHOD:
425431
return PropertyValue(TConv::fromXml(e.readAsciiText(), ChangeMethod::NORMAL));

‎src/engraving/rw/read460/tread.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
369369
return PropertyValue::fromValue(TConv::fromXml(e.readAsciiText(), OrnamentStyle::DEFAULT));
370370
case P_TYPE::ORNAMENT_INTERVAL:
371371
return PropertyValue(TConv::fromXml(e.readText(), DEFAULT_ORNAMENT_INTERVAL));
372+
case P_TYPE::ORNAMENT_SHOW_ACCIDENTAL:
373+
return OrnamentShowAccidental(e.readInt());
372374
case P_TYPE::POINT:
373375
return PropertyValue::fromValue(e.readPoint());
374376
case P_TYPE::SCALE:
@@ -415,6 +417,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
415417

416418
case P_TYPE::CLEF_TYPE:
417419
return PropertyValue(TConv::fromXml(e.readAsciiText(), ClefType::G));
420+
case P_TYPE::CLEF_TO_BARLINE_POS:
421+
return ClefToBarlinePosition(e.readInt());
418422

419423
case P_TYPE::DYNAMIC_TYPE:
420424
return PropertyValue(TConv::fromXml(e.readAsciiText(), DynamicType::OTHER));
@@ -429,6 +433,8 @@ PropertyValue TRead::readPropertyValue(Pid id, XmlReader& e, ReadContext& ctx)
429433

430434
case P_TYPE::TEXT_STYLE:
431435
return PropertyValue(TConv::fromXml(e.readAsciiText(), TextStyleType::DEFAULT));
436+
case P_TYPE::SLUR_STYLE_TYPE:
437+
return SlurStyleType(e.readInt());
432438

433439
case P_TYPE::CHANGE_METHOD:
434440
return PropertyValue(TConv::fromXml(e.readAsciiText(), ChangeMethod::NORMAL));

‎src/engraving/rw/xmlwriter.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ void XmlWriter::tagProperty(const AsciiStringView& name, P_TYPE type, const Prop
201201
case P_TYPE::ORNAMENT_STYLE: {
202202
element(name, TConv::toXml(data.value<OrnamentStyle>()));
203203
} break;
204+
case P_TYPE::ORNAMENT_SHOW_ACCIDENTAL:
205+
element(name, static_cast<int>(data.value<OrnamentShowAccidental>()));
206+
break;
204207
case P_TYPE::GLISS_STYLE: {
205208
element(name, TConv::toXml(data.value<GlissandoStyle>()));
206209
} break;
@@ -262,6 +265,9 @@ void XmlWriter::tagProperty(const AsciiStringView& name, P_TYPE type, const Prop
262265
case P_TYPE::CLEF_TYPE: {
263266
element(name, TConv::toXml(data.value<ClefType>()));
264267
} break;
268+
case P_TYPE::CLEF_TO_BARLINE_POS:
269+
element(name, static_cast<int>(data.value<ClefToBarlinePosition>()));
270+
break;
265271
case P_TYPE::DYNAMIC_TYPE: {
266272
element(name, TConv::toXml(data.value<DynamicType>()));
267273
} break;
@@ -280,6 +286,9 @@ void XmlWriter::tagProperty(const AsciiStringView& name, P_TYPE type, const Prop
280286
case P_TYPE::TEXT_STYLE: {
281287
element(name, TConv::toXml(data.value<TextStyleType>()));
282288
} break;
289+
case P_TYPE::SLUR_STYLE_TYPE:
290+
element(name, static_cast<int>(data.value<SlurStyleType>()));
291+
break;
283292
case P_TYPE::CHANGE_METHOD: {
284293
element(name, TConv::toXml(data.value<ChangeMethod>()));
285294
} break;

0 commit comments

Comments
 (0)