Differential D13088 Diff 34788 src/activities/piano_composition/Note.qml

Changeset View

Standalone View

View Options

src/activities/piano_composition/Note.qml

Context not available.
56 56​
57 property var noteDetails 57​ property var noteDetails
58 58​
59​ rotation: {
60​ if((noteDetails === undefined) || ((noteDetails.positonOnStaff < 0) && (noteType === "Whole")))
61​ return 0
62​ else if(noteDetails.positonOnStaff > 6 && noteType === "Whole")
jjazeixUnsubmitted
Not Done

why 6 is hardcoded?

jjazeix: why 6 is hardcoded?
amankumarguptaAuthorUnsubmitted
Not Done

because the notes whose position are more than 6 on the staff will have ledger lines and in that case the whole note image has to be inverted.

However I've added a readonly property variable for this to make it easy to understand for anyone reading the code.

amankumargupta: because the notes whose position are more than 6 on the staff will have ledger lines and in…
jjazeixUnsubmitted
Done

positionOnStaff (missing 'i')

jjazeix: positionOnStaff (missing 'i')
63​ return 180
64​ else
65​ return noteDetails.rotation
66​ }
67​
59 Image { 68​ Image {
60 id: blackTypeImage 69​ id: blackTypeImage
61 source: blackType !== "" ? "qrc:/gcompris/src/activities/piano_composition/resource/black" + blackType + ".svg" : "" 70​ source: blackType !== "" ? "qrc:/gcompris/src/activities/piano_composition/resource/black" + blackType + ".svg" : ""
Context not available.
63 anchors.right: parent.rotation === 180 ? undefined : noteImage.left 72​ anchors.right: parent.rotation === 180 ? undefined : noteImage.left
64 anchors.left: parent.rotation === 180 ? noteImage.right : undefined 73​ anchors.left: parent.rotation === 180 ? noteImage.right : undefined
65 rotation: parent.rotation === 180 ? 180 : 0 74​ rotation: parent.rotation === 180 ? 180 : 0
66 anchors.rightMargin: -width / 2 75​ anchors.rightMargin: -12
67 anchors.leftMargin: -width 76​ anchors.leftMargin: -18
68 anchors.bottom: noteImage.bottom 77​ anchors.bottom: noteImage.bottom
69 anchors.bottomMargin: height / 2 78​ anchors.bottomMargin: parent.height / 6
70 fillMode: Image.PreserveAspectFit 79​ fillMode: Image.PreserveAspectFit
71 } 80​ }
72 81​
Context not available.
92 101​
93 Image { 102​ Image {
94 id: noteImage 103​ id: noteImage
95 source: noteType != "Rest" ? "qrc:/gcompris/src/activities/piano_composition/resource/" + noteDetails.imageName + noteType + ".svg" 104​ source: (noteDetails === undefined) ? ""
96 : "qrc:/gcompris/src/activities/piano_composition/resource/" + noteDetails.imageName + ".svg" 105​ : noteType != "Rest" ? "qrc:/gcompris/src/activities/piano_composition/resource/" + noteDetails.imageName + noteType + ".svg"
106​ : "qrc:/gcompris/src/activities/piano_composition/resource/" + noteDetails.imageName + ".svg"
97 sourceSize.width: 200 107​ sourceSize.width: 200
98 width: note.width 108​ width: note.width
99 height: note.height 109​ height: note.height
Context not available.
105 source: noteImage 115​ source: noteImage
106 116​
107 readonly property int noteColorNumber: { 117​ readonly property int noteColorNumber: {
108 if(noteType === "Rest") 118​ if(noteDetails === undefined || noteType === "" || noteType === "Rest" || noteName === "")
109 return 0 119​ return -6
jjazeixUnsubmitted
Not Done

why -6, can you create a readonly property for it?

jjazeix: why -6, can you create a readonly property for it?
amankumarguptaAuthorUnsubmitted
Not Done

-6 is the returned value denoting invalid condition. Since the numbers upto -5 are already occupied, I chose -6 to be the invalid case number.

Sure, will create a readonly property for it.

amankumargupta: -6 is the returned value denoting invalid condition. Since the numbers upto -5 are already…
110 else if(blackType === "") 120​ else if((blackType === "") && (whiteNoteName[noteName[0]] != undefined))
111 return whiteNoteName[noteName[0]] 121​ return whiteNoteName[noteName[0]]
112 else 122​ else if((noteName.length > 2) && (blackNoteName[noteName.substring(0,2)] != undefined))
113 return blackNoteName[noteName.substring(0,2)] 123​ return blackNoteName[noteName.substring(0,2)]
124​ else
125​ return -6
114 } 126​ }
115 127​
116 color: noteType != "Rest" ? noteColorMap[noteColorNumber] : "black" // make image like it lays under red glass 128​ color: (noteColorNumber > -6) ? noteColorMap[noteColorNumber] : "black" // make image like it lays under red glass
117 visible: noteIsColored 129​ visible: noteIsColored
118 } 130​ }
119 131​
Context not available.