Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Minuet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Education
Minuet
Commits
8897c363
Commit
8897c363
authored
May 28, 2016
by
Sandro Andrade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor to use QML Connections rather than JavaScript connections
parent
81d1b83c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
31 deletions
+41
-31
src/qml/Main.qml
src/qml/Main.qml
+39
-29
src/qml/RhythmAnswerView.qml
src/qml/RhythmAnswerView.qml
+2
-2
No files found.
src/qml/Main.qml
View file @
8897c363
...
...
@@ -21,6 +21,7 @@
****************************************************************************/
import
QtQuick
2.4
import
"
pianoview
"
import
"
midiplayer
"
...
...
@@ -33,8 +34,8 @@ Item {
pianoView
.
visible
=
(
message
!=
"
the rhythm
"
&&
message
!=
"
exercise
"
)
rhythmAnswerView
.
visible
=
(
message
==
"
the rhythm
"
)
}
function
exerciseViewStateChanged
(
state
)
{
if
(
state
==
"
waitingForAnswer
"
)
function
exerciseViewStateChanged
()
{
if
(
exerciseView
.
state
==
"
waitingForAnswer
"
)
rhythmAnswerView
.
resetAnswers
()
}
...
...
@@ -78,12 +79,6 @@ Item {
anchors
{
top
:
background
.
top
;
horizontalCenter
:
background
.
horizontalCenter
}
}
}
Connections
{
target
:
midiPlayer
onPlayActivated
:
sequencer
.
play
()
onPauseActivated
:
sequencer
.
pause
()
onStopActivated
:
sequencer
.
stop
()
}
Binding
{
target
:
sequencer
property
:
"
pitch
"
...
...
@@ -109,26 +104,41 @@ Item {
property
:
"
sequencerState
"
value
:
sequencer
.
state
}
Component.onCompleted
:
{
minuetMenu
.
breadcrumbPressed
.
connect
(
exerciseView
.
clearExerciseGrid
)
minuetMenu
.
breadcrumbPressed
.
connect
(
rhythmAnswerView
.
resetAnswers
)
minuetMenu
.
itemChanged
.
connect
(
exerciseView
.
itemChanged
)
minuetMenu
.
userMessageChanged
.
connect
(
exerciseView
.
changeUserMessage
)
minuetMenu
.
userMessageChanged
.
connect
(
mainItem
.
userMessageChanged
)
minuetMenu
.
itemChanged
.
connect
(
rhythmAnswerView
.
resetAnswers
)
sequencer
.
noteOn
.
connect
(
pianoView
.
noteOn
)
sequencer
.
noteOff
.
connect
(
pianoView
.
noteOff
)
sequencer
.
allNotesOff
.
connect
(
pianoView
.
allNotesOff
)
exerciseView
.
answerHoverEnter
.
connect
(
pianoView
.
noteMark
)
exerciseView
.
answerHoverExit
.
connect
(
pianoView
.
noteUnmark
)
exerciseView
.
answerClicked
.
connect
(
rhythmAnswerView
.
answerClicked
)
exerciseView
.
onStateChanged
.
connect
(
mainItem
.
exerciseViewStateChanged
)
exerciseView
.
showCorrectAnswer
.
connect
(
rhythmAnswerView
.
showCorrectAnswer
)
exerciseView
.
onChosenExercisesChanged
.
connect
(
rhythmAnswerView
.
fillCorrectAnswerGrid
)
rhythmAnswerView
.
answerCompleted
.
connect
(
exerciseView
.
checkAnswers
)
Connections
{
target
:
midiPlayer
onPlayActivated
:
sequencer
.
play
()
onPauseActivated
:
sequencer
.
pause
()
onStopActivated
:
sequencer
.
stop
()
}
Connections
{
target
:
sequencer
onNoteOn
:
pianoView
.
noteOn
(
chan
,
pitch
,
vel
)
onNoteOff
:
pianoView
.
noteOff
(
chan
,
pitch
,
vel
)
onAllNotesOff
:
pianoView
.
allNotesOff
()
}
Connections
{
target
:
minuetMenu
onItemChanged
:
exerciseView
.
itemChanged
(
model
)
onBreadcrumbPressed
:
exerciseView
.
clearExerciseGrid
()
onUserMessageChanged
:
exerciseView
.
changeUserMessage
(
message
)
}
Connections
{
target
:
minuetMenu
onItemChanged
:
rhythmAnswerView
.
resetAnswers
(
model
)
onBreadcrumbPressed
:
rhythmAnswerView
.
resetAnswers
()
onUserMessageChanged
:
mainItem
.
userMessageChanged
(
message
)
}
Connections
{
target
:
exerciseView
onAnswerHoverEnter
:
pianoView
.
noteMark
(
chan
,
pitch
,
vel
,
color
)
onAnswerHoverExit
:
pianoView
.
noteUnmark
(
chan
,
pitch
,
vel
)
onAnswerClicked
:
rhythmAnswerView
.
answerClicked
(
answerImageSource
,
color
)
onStateChanged
:
mainItem
.
exerciseViewStateChanged
()
onShowCorrectAnswer
:
rhythmAnswerView
.
showCorrectAnswer
(
chosenExercises
,
chosenColors
)
onChosenExercisesChanged
:
rhythmAnswerView
.
fillCorrectAnswerGrid
()
}
Connections
{
target
:
rhythmAnswerView
onAnswerCompleted
:
exerciseView
.
checkAnswers
(
answers
)
}
}
src/qml/RhythmAnswerView.qml
View file @
8897c363
...
...
@@ -63,10 +63,10 @@ Column {
colors
=
[
"
#ffffff
"
,
"
#ffffff
"
,
"
#ffffff
"
,
"
#ffffff
"
]
correctColors
=
[
"
#ffffff
"
,
"
#ffffff
"
,
"
#ffffff
"
,
"
#ffffff
"
]
}
function
showCorrectAnswer
(
chosenExercise
,
chosenColors
)
{
function
showCorrectAnswer
(
chosenExercise
s
,
chosenColors
)
{
var
tempAnswers
=
answers
for
(
var
i
=
0
;
i
<
4
;
++
i
)
tempAnswers
[
i
]
=
"
exercise-images/
"
+
chosenExercise
[
i
]
+
"
.png
"
tempAnswers
[
i
]
=
"
exercise-images/
"
+
chosenExercise
s
[
i
]
+
"
.png
"
answers
=
tempAnswers
colors
=
chosenColors
currentAnswer
=
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment