|
[-]
[+]
|
Changed |
harbour-math-teacher.spec
|
|
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/harbour-math-teacher.qml
^
|
| @@ -35,12 +35,14 @@
allowedOrientations: Orientation.Portrait
//allowedOrientations: defaultAllowedOrientations
+ // Common start
property int coins: 0 // Global property for money
property int level_points : 0 // Normally increase when you get a point when answering right
property int level: 0 //
property int questions_count: 4
property string asset_path : "./assets/asset1/" //Asset number
property string player_name: "Horse rider" // Default player name
+ property bool developer: false //Developer setting to prevent console logs in production
ListModel {
id: mistakesModel
@@ -49,6 +51,20 @@
second: 2
}
}
+ ListModel {
+ id:harnesses
+ ListElement {
+ label:"Halter"
+ index: 5
+ fill: "#502d16"
+ stroke:"#502d16"
+ width:0.1
+ painted:false
+ path:""
+ }
+ }
+ // Common end
+
Component.onCompleted: {
Mysets.loadSettings()
//pageStack.push(Qt.resolvedUrl(startPageTxt))
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/About.qml
^
|
| @@ -69,7 +69,7 @@
margins: Theme.paddingLarge
}
//: The name of the app followed with a version number
- text: {qsTr("Math teacher, version") + " 0.0.8"}
+ text: {qsTr("Math teacher, version") + " 0.0.9"}
}
SectionHeader { text: qsTr("Idea") }
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/FunPage.qml
^
|
| @@ -38,13 +38,18 @@
{msg:qsTr("Forelock")},
{msg:qsTr("Mane")},
{msg:qsTr("Tail")},
+ {msg:qsTr("Shoes")},
{msg:qsTr("Halter")},
{msg:qsTr("Bridle")},
+ {msg:qsTr("Saddle blanket")},
{msg:qsTr("Saddle")},
- {msg:qsTr("Leg wraps")}
+ {msg:qsTr("Leg wraps")},
+ //: Rosette is a prize which is attached to the horses bridle after a winned race
+ {msg:qsTr("Rosette")}
]
property string blotch_color: "transparent"
property var myColors: [ "#000000", "#ffffff", "#ffd633", "#cca300", "#cc4400", "#bf4040", "#cc6600", "#8a8a5c", "#990000", "#999900", "#808000", "#e65c00", "#997300", "#862d59", "#992600"]
+ property string folder_file : "$HOME/horse1.png" //Folder for layer images.
SilicaFlickable {
anchors.fill: parent
@@ -62,6 +67,23 @@
}
}
}
+ MenuItem {
+ text:qsTr("Share my horse")
+ onClicked:{
+ console.log(folder_file)
+ saddle.save("/home/nemo/horse.png")
+ pageStack.push("Sailfish.TransferEngine.SharePage",
+
+ {
+ "source": "/home/nemo/horse.png",
+ "mimeType": "image/png",
+ "content": { "type": "text/x-uri", "status": "Sent from SailfishOS app Math teacher" },
+ "serviceFilter": ["sharing", "e-mail"]
+ }
+ )
+ }
+
+ }
}
contentHeight: column.height
@@ -145,6 +167,7 @@
enabled: coins > index*20 ? true: false
onClicked: {
+ console.log(harnesses.count)
for (var i = 0; i < harnesses.count; i++) {
if (harnesses.get(i).index === index && harnesses.get(i).painted === true) {
harnesses.set(i,{"painted":false});
@@ -192,7 +215,7 @@
}
}
- ListModel {
+ /*ListModel {
id:harnesses
ListElement {
label:"Halter"
@@ -203,69 +226,91 @@
painted:false
path:""
}
- }
+ }*/
ListModel {
id: horse_harness
ListElement {
- hh_name: "Horse"
- hh_source:"0.svg"
+ //hh_name: "Horse"
+ //hh_source:"0.svg"
hh_source_l:"0_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Spots"
- hh_source:"1.svg"
+ //hh_name: "Patches"
+ //hh_source:"1.svg"
hh_source_l:"1_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Forelock"
- hh_source:"2.svg"
+ //hh_name: "Forelock"
+ //hh_source:"2.svg"
hh_source_l:"2_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Mane"
- hh_source:"3.svg"
+ //hh_name: "Mane"
+ //hh_source:"3.svg"
hh_source_l:"3_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Tail"
- hh_source:"4.svg"
+ //hh_name: "Tail"
+ //hh_source:"4.svg"
hh_source_l:"4_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Halter"
- hh_source:"5.svg"
+ //hh_name: "Shoes"
+ //hh_source:"5.svg"
+ hh_source_l:"5_ll.svg"
+ hh_enabled:false
+ }
+ ListElement {
+ //hh_name: "Halter"
+ //hh_source:"5.svg"
hh_source_l:"5_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Bridle"
- hh_source:"6.svg"
+ //hh_name: "Bridle"
+ //hh_source:"6.svg"
hh_source_l:"6_l.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Saddle"
- hh_source:"7.svg"
- hh_source_l:"7_l.svg"
+ //hh_name: "Saddle blanket"
+ //hh_source:"8.svg"
+ hh_source_l:"8.svg"
hh_enabled:false
}
ListElement {
- hh_name: "Leg wraps"
- hh_source:"8.svg"
+ //hh_name: "Saddle"
+ //hh_source:"9.svg"
+ hh_source_l:"9.svg"
+ hh_enabled:false
+ }
+ ListElement {
+ //hh_name: "Leg wraps"
+ //hh_source:"8.svg"
hh_source_l:"8_l.svg"
hh_enabled:false
}
+ ListElement {
+ //hh_name: "Rosette"
+ //hh_source:"8.svg"
+ hh_source_l:"11_l.svg"
+ hh_enabled:false
+ }
}
+
+
Component.onCompleted: {
- harnesses.clear();
- Horse.fill_harness();
+ if (harnesses.count === 1){
+ harnesses.clear();
+ Horse.fill_harness();
+ }
}
}
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/LearningPage.qml
^
|
| @@ -30,6 +30,19 @@
// The effective value will be restricted by ApplicationWindow.allowedOrientations
allowedOrientations: Orientation.All
property int re_sult
+ Canvas { //testing for future
+ id:bird_backround
+ visible:false
+ width: 100
+ height: 200
+ onPaint: {
+ var ctx = getContext("2d");
+ ctx.fillStyle = Qt.rgba(1, 0, 0, 1);
+ ctx.fillRect(0, 0, width, height);
+ }
+
+
+ }
SilicaListView {
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/QuizPage.qml
^
|
| @@ -105,27 +105,32 @@
onClicked: {
quiz_started = true
if (answers.get(index).answer === a * b){
+ time_slider.value = 0;
answers.set(index,{"box_color":"green"})
MyFunc.not_enable();
- break_timer.start()
- if (time_slider.value < time_slider.maximumValue) {
- coins = coins + 1;
- Mysets.saveCoins();
- level_points = level_points + 1;
- Mysets.saveLevelPoints();
- }
- time_slider.value = 0;
questions_count = questions_count - 1;
if (questions_count < 1) {
+ MyFunc.fill_answers(a, b, c, level)
questions_count = Math.round(4 + Math.log(level+1) * 5);
//console.log("Fun page", questions_count)
pageStack.push(Qt.resolvedUrl("FunPage.qml"))
}
else if (MyFunc.level_check(level, level_points) > level) {
+ MyFunc.fill_answers(a, b, c, level)
level = MyFunc.level_check(level, level_points);
Mysets.saveLevelPoints();
pageStack.push(Qt.resolvedUrl("LevelChange.qml"))
}
+ else if (time_slider.value < time_slider.maximumValue) {
+ coins = coins + 1;
+ //Mysets.saveCoins();
+ level_points = level_points + 1;
+ Mysets.saveLevelPoints();
+ break_timer.start()
+ }
+ else {
+ break_timer.start()
+ }
}
else {
answers.set(index,{"box_color":"red"})
@@ -148,10 +153,14 @@
value: 0
Timer {
id:timer_slider
- running: quiz_started && mistakesModel.count < 6 && Qt.application.active
+ running: true
+ //running: quiz_started && mistakesModel.count < 6 && Qt.application.active
repeat: true
- interval: 100
- onTriggered: time_slider.value = time_slider.value + interval/1000
+ interval: 250
+ onTriggered: {
+ if(developer) {console.log("test5")}
+ time_slider.value = time_slider.value + interval/1000
+ }
}
}
Row{
@@ -227,8 +236,9 @@
repeat: false
interval: 500
onTriggered: {
- a = Math.floor(Math.random() * 11);
- b = MyFunc.multiplier_lottery(level)
+ if(developer) {console.log("test6")}
+ //a = Math.floor(Math.random() * (Math.max(11, level)));
+ //b = MyFunc.multiplier_lottery(level)
MyFunc.fill_answers(a, b, c, level)
}
}
@@ -251,7 +261,43 @@
box_color: "blue"
answer: 2
click: true
- box_visible:2
+ box_visible:true
+ }
+ ListElement {
+ box_color: "blue"
+ answer: 1
+ click: true
+ box_visible:false
+ }
+ ListElement {
+ box_color: "blue"
+ answer: 1
+ click: true
+ box_visible:false
+ }
+ ListElement {
+ box_color: "blue"
+ answer: 1
+ click: true
+ box_visible:false
+ }
+ ListElement {
+ box_color: "blue"
+ answer: 1
+ click: true
+ box_visible:false
+ }
+ ListElement {
+ box_color: "blue"
+ answer: 1
+ click: true
+ box_visible:false
+ }
+ ListElement {
+ box_color: "blue"
+ answer: 1
+ click: true
+ box_visible:false
}
}
}
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset1/11.svg
^
|
| @@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="163.75856"
+ height="299.93671"
+ viewBox="0 0 43.327781 79.358255"
+ version="1.1"
+ id="svg845"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="11.svg">
+ <defs
+ id="defs839" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="-686.69214"
+ inkscape:cy="344.25405"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ units="px" />
+ <metadata
+ id="metadata842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Taso 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-60.734914,-160.55897)">
+ <path
+ style="fill:#aa0000;stroke-width:1.28999448"
+ d="M 69.400465,170.59276 68.488284,162.83938 75.785599,168.31235 81.714662,160.55897 84.756687,167.99028 92.204549,162.38331 92.660662,170.59276 100.87012,171.04886 96.751392,178.96551 104.0627,185.18738 96.364951,187.29606 99.957973,195.67727 89.915658,193.23499 93.696029,238.20897 86.943809,227.70489 84.674309,238.83991 81.135362,203.61358 75.296887,238.80626 73.56854,228.01727 68.032219,239.91722 73.121558,194.7356 64.383572,194.30908 68.267303,186.53182 61.191004,183.36308 66.921081,177.88354 60.734914,172.41715 Z"
+ id="rect3775"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+ inkscape:label="Rosette_background" />
+ <ellipse
+ style="fill:#000080;stroke-width:1.28999448"
+ id="path3784"
+ cx="81.942688"
+ cy="182.90698"
+ rx="12.542251"
+ ry="12.314219"
+ inkscape:label="Rosette" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset1/11_l.svg
^
|
| @@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="163.75856"
+ height="299.93671"
+ viewBox="0 0 43.327781 79.358255"
+ version="1.1"
+ id="svg845"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="11_l.svg">
+ <defs
+ id="defs839" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="-686.69214"
+ inkscape:cy="344.25405"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ units="px" />
+ <metadata
+ id="metadata842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Taso 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-60.734914,-160.55897)">
+ <path
+ style="fill:#aa0000;stroke-width:1.28999448"
+ d="M 69.400465,170.59276 68.488284,162.83938 75.785599,168.31235 81.714662,160.55897 84.756687,167.99028 92.204549,162.38331 92.660662,170.59276 100.87012,171.04886 96.751392,178.96551 104.0627,185.18738 96.364951,187.29606 99.957973,195.67727 89.915658,193.23499 93.696029,238.20897 86.943809,227.70489 84.674309,238.83991 81.135362,203.61358 75.296887,238.80626 73.56854,228.01727 68.032219,239.91722 73.121558,194.7356 64.383572,194.30908 68.267303,186.53182 61.191004,183.36308 66.921081,177.88354 60.734914,172.41715 Z"
+ id="rect3775"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+ inkscape:label="Rosette_background" />
+ <ellipse
+ style="fill:#000080;stroke-width:1.28999448"
+ id="path3784"
+ cx="81.942688"
+ cy="182.90698"
+ rx="12.542251"
+ ry="12.314219"
+ inkscape:label="Rosette" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset1/5_ll.svg
^
|
| @@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="183.97906mm"
+ height="151.4261mm"
+ viewBox="0 0 183.97906 151.4261"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="5_ll.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.72337262"
+ inkscape:cx="387.67542"
+ inkscape:cy="244.43305"
+ inkscape:document-units="mm"
+ inkscape:current-layer="svg8"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke-width:0.26458332"
+ id="rect840"
+ width="183.97906"
+ height="151.4261"
+ x="0"
+ y="0" />
+ <g
+ inkscape:label="Taso 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(16.409278,-61.74681)">
+ <path
+ style="fill:#ff00ff;fill-opacity:1;stroke-width:1.05833328"
+ d="M 34.431204,113.38365 45.740584,108.07709 65.756556,106.12205 85.772528,107.42541 93.68224,111.61481 101.50244,121.40893 108.85714,146.45217 V 181.71725 H 89.682624 L 95.047036,157.62309 90.762084,133.65641 79.964384,126.82525 66.501336,123.06581 54.269088,125.19997 43.787784,128.14313 40.573648,139.68657 40.364088,154.24773 47.323244,181.71725 28.752256,181.25177 28.514284,173.95377 27.355792,165.53717 24.190476,144.96261 25.121452,130.25321 Z"
+ id="rect815"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccc" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset1/8.svg
^
|
| @@ -1,19 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
- height="500"
- width="750"
->
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="222.11841"
+ width="299.94751"
+ version="1.1"
+ id="svg5222"
+ sodipodi:docname="8.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+ id="metadata5228">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+</metadata>
+<defs
+ id="defs5226" />
+<sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ id="namedview5224"
+ showgrid="false"
+ inkscape:zoom="0.472"
+ inkscape:cx="104.91373"
+ inkscape:cy="93.469197"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg5222" />
+
+ width="28.926252"
+>
+ height="4.7347498"
+ width="31.199766"
+>
+ height="4.8135695"
<path
- style="fill:#375833;fill-opacity:1"
- d="M 269.26096,408.97512 268.98475,405.66056 276.81959,411.50564 284.14672,416.97195 284.41835,422.79272 289.39935,423.20759 289.44775,429.13179 284.47669,429.42189 284.34232,434.39875 289.038,434.40275 288.9691,440.15424 284.7302,440.6263 283.84767,452.72211 268.06875,452.49694 269.32875,438.32782 269.47956,425.87012 V 417.87839 Z"
- id="08_forward_leg_wraps"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccccccccccc"
- inkscape:label="Forward leg wraps" />
- <path
- style="fill:#375833;fill-opacity:1"
- d="M 526.56125,427.60401 526.7789,417.13146 535.28243,417.18166 544.5184,417.23618 542.84279,429.97263 540.43411,443.52572 C 536.04763,448.58134 532.19107,450.99287 527.51507,444.38342 524.56483,441.50965 526.80981,437.27514 526.03763,433.78624 L 523.53695,433.88949 524.25729,427.3514 Z"
- id="08_rear_leg_wraps"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccc"
- inkscape:label="Rear leg wraps" />
-</svg>
\ No newline at end of file
+ style="display:inline;fill:#c83737;stroke-width:2.24600005"
+ d="M 9.0339986,2.8763109 28.302522,16.451495 79.91778,19.62781 H 176.79564 L 242.70436,14.863326 278.43802,0.56987093 C 300.13058,-2.9784041 306.62296,10.755931 292.33683,22.022406 L 285.58477,42.65616 275.2617,92.68325 269.70314,137.94585 264.14458,181.62027 243.49843,210.2072 183.9424,216.55985 134.70935,222.11841 83.888169,216.55985 55.301261,207.82495 39.419661,195.11965 25.126207,171.29727 13.214996,145.0926 10.038635,105.38856 8.4504876,68.860826 4.9565426,32.968376 C 2.6801776,19.257243 -6.9535004,4.6762109 9.0339986,2.8763109 Z"
+ id="08_saddle_blanket"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccc"
+ inkscape:label="Saddle blanket" />
+</svg>
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset1/9.svg
^
|
| @@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="300.04782"
+ width="220.91426"
+ version="1.1"
+ id="svg5872"
+ sodipodi:docname="9.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+ id="metadata5878">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+</metadata>
+<defs
+ id="defs5876" />
+<sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ id="namedview5874"
+ showgrid="false"
+ inkscape:zoom="0.472"
+ inkscape:cx="67.921105"
+ inkscape:cy="159.73825"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg5872" />
+
+ width="28.926252"
+>
+ height="4.7347498"
+ width="31.199766"
+>
+ height="4.8135695"
+ <path
+ d="M 21.569729,10.374644 40.373786,20.749326 65.66206,23.342987 114.29332,22.694576 164.22143,17.507235 208.31379,0 C 225.17264,6.051888 223.22739,17.291099 213.50113,26.585077 L 191.45495,43.443902 181.7287,75.864767 180.43186,98.559343 172.65086,125.79287 162.27619,150.43271 135.04266,169.8852 102.62182,177.01779 103.23903,254.62315 116.65412,274.32282 117.8336,291.32567 113.44856,297.17641 105.22492,299.90485 81.889512,300.04772 77.970034,291.76833 92.278205,293.87844 101.3658,294.57701 108.03606,290.59235 109.71329,278.9717 102.2212,269.5306 89.653494,268.44487 82.760589,274.52713 80.180426,284.2397 81.889512,300.04781 74.647358,297.59194 71.238649,279.16699 87.054533,252.41934 85.114564,178.3147 51.396896,168.58845 37.131696,159.51061 26.108659,142.65177 22.218139,105.69201 19.624478,77.161662 18.976068,49.279727 12.491887,27.881972 0,11.609587 C 6.350005,-4.198961 17.798768,9.951522 21.569729,10.374644 Z"
+ id="09_saddle"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccc"
+ style="display:inline;stroke-width:1.83399999"
+ sodipodi:insensitive="true"
+ inkscape:label="Saddle" />
+</svg>
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset2/11.svg
^
|
| @@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="163.75856"
+ height="299.93671"
+ viewBox="0 0 43.327781 79.358255"
+ version="1.1"
+ id="svg845"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="11.svg">
+ <defs
+ id="defs839" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="-686.69214"
+ inkscape:cy="344.25405"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ units="px" />
+ <metadata
+ id="metadata842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Taso 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-60.734914,-160.55897)">
+ <path
+ style="fill:#aa0000;stroke-width:1.28999448"
+ d="M 69.400465,170.59276 68.488284,162.83938 75.785599,168.31235 81.714662,160.55897 84.756687,167.99028 92.204549,162.38331 92.660662,170.59276 100.87012,171.04886 96.751392,178.96551 104.0627,185.18738 96.364951,187.29606 99.957973,195.67727 89.915658,193.23499 93.696029,238.20897 86.943809,227.70489 84.674309,238.83991 81.135362,203.61358 75.296887,238.80626 73.56854,228.01727 68.032219,239.91722 73.121558,194.7356 64.383572,194.30908 68.267303,186.53182 61.191004,183.36308 66.921081,177.88354 60.734914,172.41715 Z"
+ id="rect3775"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+ inkscape:label="Rosette_background" />
+ <ellipse
+ style="fill:#000080;stroke-width:1.28999448"
+ id="path3784"
+ cx="81.942688"
+ cy="182.90698"
+ rx="12.542251"
+ ry="12.314219"
+ inkscape:label="Rosette" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset2/11_l.svg
^
|
| @@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="163.75856"
+ height="299.93671"
+ viewBox="0 0 43.327781 79.358255"
+ version="1.1"
+ id="svg845"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="11_l.svg">
+ <defs
+ id="defs839" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="-686.69214"
+ inkscape:cy="344.25405"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ units="px" />
+ <metadata
+ id="metadata842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Taso 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-60.734914,-160.55897)">
+ <path
+ style="fill:#aa0000;stroke-width:1.28999448"
+ d="M 69.400465,170.59276 68.488284,162.83938 75.785599,168.31235 81.714662,160.55897 84.756687,167.99028 92.204549,162.38331 92.660662,170.59276 100.87012,171.04886 96.751392,178.96551 104.0627,185.18738 96.364951,187.29606 99.957973,195.67727 89.915658,193.23499 93.696029,238.20897 86.943809,227.70489 84.674309,238.83991 81.135362,203.61358 75.296887,238.80626 73.56854,228.01727 68.032219,239.91722 73.121558,194.7356 64.383572,194.30908 68.267303,186.53182 61.191004,183.36308 66.921081,177.88354 60.734914,172.41715 Z"
+ id="rect3775"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+ inkscape:label="Rosette_background" />
+ <ellipse
+ style="fill:#000080;stroke-width:1.28999448"
+ id="path3784"
+ cx="81.942688"
+ cy="182.90698"
+ rx="12.542251"
+ ry="12.314219"
+ inkscape:label="Rosette" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset2/5_ll.svg
^
|
| @@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="183.97906mm"
+ height="151.4261mm"
+ viewBox="0 0 183.97906 151.4261"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="5_ll.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.72337262"
+ inkscape:cx="387.67542"
+ inkscape:cy="244.43305"
+ inkscape:document-units="mm"
+ inkscape:current-layer="svg8"
+ showgrid="false"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke-width:0.26458332"
+ id="rect840"
+ width="183.97906"
+ height="151.4261"
+ x="0"
+ y="0" />
+ <g
+ inkscape:label="Taso 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(16.409278,-61.74681)">
+ <path
+ style="fill:#ff00ff;fill-opacity:1;stroke-width:1.05833328"
+ d="M 34.431204,113.38365 45.740584,108.07709 65.756556,106.12205 85.772528,107.42541 93.68224,111.61481 101.50244,121.40893 108.85714,146.45217 V 181.71725 H 89.682624 L 95.047036,157.62309 90.762084,133.65641 79.964384,126.82525 66.501336,123.06581 54.269088,125.19997 43.787784,128.14313 40.573648,139.68657 40.364088,154.24773 47.323244,181.71725 28.752256,181.25177 28.514284,173.95377 27.355792,165.53717 24.190476,144.96261 25.121452,130.25321 Z"
+ id="rect815"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccc" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/assets/asset2/8.svg
^
|
| @@ -1,19 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
- height="500"
- width="750"
->
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="222.11841"
+ width="299.94751"
+ version="1.1"
+ id="svg5222"
+ sodipodi:docname="8.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+ id="metadata5228">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+</metadata>
+<defs
+ id="defs5226" />
+<sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ id="namedview5224"
+ showgrid="false"
+ inkscape:zoom="0.472"
+ inkscape:cx="104.91373"
+ inkscape:cy="93.469197"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg5222" />
+
+ width="28.926252"
+>
+ height="4.7347498"
+ width="31.199766"
+>
+ height="4.8135695"
<path
- style="fill:#375833;fill-opacity:1"
- d="M 269.12285,407.04162 268.84664,403.72706 276.68148,409.57214 284.00861,415.03845 284.28024,420.85922 289.26124,421.27409 289.30964,427.19829 284.33858,427.48839 284.20421,432.46525 288.89989,432.46925 288.83099,438.22074 284.59209,438.6928 283.70956,450.78861 267.93064,450.56344 269.19064,436.39432 269.34145,423.93662 V 415.94489 Z"
- id="08_forward_leg_wraps"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccccccccccc"
- inkscape:label="Forward leg wraps" />
- <path
- style="fill:#375833;fill-opacity:1"
- d="M 526.56125,427.60401 526.7789,417.13146 535.28243,417.18166 544.5184,417.23618 542.84279,429.97263 540.43411,443.52572 C 536.04763,448.58134 532.19107,450.99287 527.51507,444.38342 524.56483,441.50965 526.80981,437.27514 526.03763,433.78624 L 523.53695,433.88949 524.25729,427.3514 Z"
- id="08_rear_leg_wraps"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccc"
- inkscape:label="Rear leg wraps" />
-</svg>
\ No newline at end of file
+ style="display:inline;fill:#c83737;stroke-width:2.24600005"
+ d="M 9.0339986,2.8763109 28.302522,16.451495 79.91778,19.62781 H 176.79564 L 242.70436,14.863326 278.43802,0.56987093 C 300.13058,-2.9784041 306.62296,10.755931 292.33683,22.022406 L 285.58477,42.65616 275.2617,92.68325 269.70314,137.94585 264.14458,181.62027 243.49843,210.2072 183.9424,216.55985 134.70935,222.11841 83.888169,216.55985 55.301261,207.82495 39.419661,195.11965 25.126207,171.29727 13.214996,145.0926 10.038635,105.38856 8.4504876,68.860826 4.9565426,32.968376 C 2.6801776,19.257243 -6.9535004,4.6762109 9.0339986,2.8763109 Z"
+ id="08_saddle_blanket"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccc"
+ inkscape:label="Saddle blanket" />
+</svg>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/functions.js
^
|
| @@ -13,6 +13,7 @@
}
}
+/// multiplier_lottery() brings new numbers in order to do the multiplication
function multiplier_lottery(_a) {
var skipped_numbers = [];
@@ -81,7 +82,7 @@
lower = 0;
break;
default:
- upper = 11;
+ upper = _a;
lower = 0;
}
@@ -93,13 +94,17 @@
}
// This function sets right and wrong answers to the list model
-function fill_answers(a,b,c,_level) {
+function fill_answers(_a,_b,_c,_level) {
+ _a = Math.floor(Math.random() * (Math.max(11, level)));
+ a = _a
+ _b = MyFunc.multiplier_lottery(level)
+ b = _b
var valuearray = [];
var skipped_numbers = [];
- c = a * b;
+ _c = _a * _b;
var sum_visible = 1; //counts the sum of visible answers
var right_position = Math.floor(Math.random() * 9);
- valuearray.push(c);
+ valuearray.push(_c);
// used numbers by levels
switch (_level) {
case 0:
@@ -127,11 +132,13 @@
break;
default:
num_visible = 5;
- upper = 11;
+ upper = _level;
lower = 0;
}
- for (i=0;i<9;i++){ //TBD to be used while loop later to get more valid answers
+ i=0;
+ var round = 0; // To limit while loops
+ while (i<9 && round < 12){
var _visible = Math.random();
if (_visible < 0.6+i*0.05 && sum_visible < num_visible) {
var __visible = true;
@@ -139,11 +146,18 @@
}
else {__visible = false};
if (i === right_position) {
- answers.set(i,{"box_color":"blue", "answer":c, "click": true, "box_visible":true})
+ answers.set(i,{"box_color":"blue", "answer":_c, "click": true, "box_visible":true})
+ }
+ else if (answers.get(i).box_visible === true && round ===1){
+ //Do nothing
}
+
else {
- var z = Math.floor(Math.random() * (11)) * Math.floor(Math.random() * (upper + 1))
- if (isInArray(z, valuearray)) {
+ var z = Math.floor(Math.random() * (Math.max(11,_level))) * Math.floor(Math.random() * (upper + 1))
+ if ((Math.abs(z-_c)/_c > 0.2) && (Math.abs(z-_c)>_level)) {
+ answers.set(i,{"box_color":"blue", "answer":z, "click": true, "box_visible":false})
+ }
+ else if (isInArray(z, valuearray)) {
answers.set(i,{"box_color":"blue", "answer":z, "click": true, "box_visible":false})
}
else if (__visible) {
@@ -155,6 +169,13 @@
answers.set(i,{"box_color":"blue", "answer":z, "click": true, "box_visible":false})
}
}
+ if (i===8 && sum_visible < num_visible) {
+ i = 0;
+ round = round + 1;
+ }
+ else {
+ i++;
+ }
}
}
@@ -192,6 +213,7 @@
if (_level_points > 89) {return _level + 1};
break;
default:
- return 0
+ if (_level_points > _level*_level) {return _level + 1};
+ //return 0
}
}
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/horse.js
^
|
| @@ -30,29 +30,54 @@
}
,
{
- "label":"Halter" ,"index": 5, "fill": "#502d16", "stroke":"#502d16", "width":0.1,
+ "label":"Shoe front" ,"index": 5, "fill": "#502d16", "stroke":"#502d16", "width":0.1,
+ "path":"M 254.62357,473.34494 H 283.54982 V 478.07969 H 254.62357 Z"
+ }
+ ,
+ {
+ "label":"Shoe rear" ,"index": 5, "fill": "#502d16", "stroke":"#502d16", "width":0.1,
+ "path":"M 510.79759,472.20547 H 540.58314 C 540.97488,472.20547 541.29025,472.52084 541.29025,472.91258 V 476.31194 C 541.29025,476.70367 540.97488,477.01904 540.58314,477.01904 H 510.79759 C 510.40585,477.01904 510.09048,476.70367 510.09048,476.31194 V 472.91258 C 510.09048,472.52084 510.40585,472.20547 510.79759,472.20547 Z"
+ }
+ ,
+ {
+ "label":"Halter" ,"index": 6, "fill": "#502d16", "stroke":"#502d16", "width":0.1,
"path":"M 146.01757,135.13291 178.52229,111.95896 205.01661,92.674096 223.93365,65.758298 227.82274,68.233172 208.95005,97.302699 194.33021,139.11832 189.38046,140.88609 201.34398,103.00855 148.13726,139.50838 153.79573,148.56793 149.55309,150.3357 128.99271,124.00006 133.73772,119.79649 Z"
}
,
{
- "label":"Bridle" ,"index": 6, "fill": "#502d16", "stroke":"#502d16", "width":0.1,
+ "label":"Bridle" ,"index": 7, "fill": "#000000", "stroke":"#000000", "width":0.1,
"path":"M 146.03081,135.3673 176.57598,110.77388 208.60219,87.661502 198.20678,69.91836 205.22068,67.668839 213.06817,79.491907 223.93365,65.758298 228.96919,69.016591 215.78791,84.567537 197.95616,136.31517 189.99185,140.05481 204.32497,98.144448 152.66958,138.57376 C 184.71811,210.37224 253.49649,222.04038 323.45971,181.27962 L 328.00379,187.7786 C 258.83014,225.37334 188.1199,219.37357 147.97468,142.0394 V 142.0394 L 150.58502,148.80035 146.0234,149.8667 133.22719,121.48253 136.11523,119.14988 Z"
}
,
{
- "label":"Saddle" ,"index": 7, "fill": "#502d16", "stroke":"#502d16", "width":0.1,
- "path":"M 409.9526,209.86372 402.38765,230.4913 396.30921,248.56361 C 387.68146,267.20259 386.83161,265.70871 381.00148,271.27003 377.80381,274.05364 377.27201,273.87516 366.96533,277.8436 342.10077,279.29234 359.15283,278.1398 352.72881,278.43601 341.5634,277.83657 346.98566,279.60681 336.11646,275.74908 336.28591,276.96983 332.80989,273.19308 330.55435,269.50795 328.29881,265.82282 328.07179,265.90396 325.82938,259.47868 L 324.64454,245.55686 V 219.63861 L 329.08767,197.20082 C 331.59372,194.45904 336.40373,176.21788 336.60582,188.97548 331.17836,178.04994 344.18259,190.16402 347.97097,190.75829 L 366.96533,191.94312 377.94974,190.65321 387.14454,189.57345 405.13921,187.7962 433.01983,177.72512 C 438.91459,173.70961 451.60728,185.16988 440.89586,180.09478 447.58632,179.43485 446.94599,185.6868 441.48828,188.79699 L 423.28198,200.23696"
+ "label":"Saddle blanket" ,"index": 8, "fill": "#c83737", "stroke":"#c83737", "width":0.1,
+ "path":"M 325.52892,184.24307 334.10796,190.28723 357.08893,191.70144 H 400.22244 L 429.56737,189.58012 445.47728,183.21616 C 455.13559,181.63634 458.02623,187.75136 451.66553,192.7676 L 448.65927,201.95449 444.06307,224.22835 441.5882,244.38089 439.11333,263.82631 429.92092,276.55424 403.40443,279.38267 381.48411,281.85754 358.85669,279.38267 346.12877,275.49358 339.05771,269.83672 332.69375,259.23014 327.39045,247.56288 325.97622,229.88521 325.26912,213.62175 323.71349,197.64114 C 322.69997,191.53645 318.41071,185.04445 325.52892,184.24307 Z"
}
,
{
- "label":"Forward leg wraps" ,"index": 8, "fill": "#375833", "stroke":"#375833", "width":0.1,
+ "label":"Saddle" ,"index": 9, "fill": "#000000", "stroke":"#000000", "width":0.1,
+ "path":"M 337.28995,183.56971 347.54298,189.22657 361.33157,190.64078 387.84807,190.28723 415.07168,187.4588 439.11332,177.91287 C 448.30571,181.2127 447.24505,187.34095 441.94175,192.40855 L 429.92093,201.60093 424.61763,219.27861 423.91052,231.65297 419.66788,246.50222 414.01103,259.93725 399.16178,270.54384 381.48411,274.43293 381.82065,316.74774 389.13531,327.48911 389.77843,336.76002 387.38746,339.95017 382.90347,341.43787 370.17969,341.51577 368.04257,337.00138 375.84419,338.15193 380.79926,338.53283 384.43626,336.36017 385.35078,330.02394 381.26567,324.87612 374.41305,324.28412 370.65465,327.60051 369.2478,332.89635 370.17969,341.51582 366.23086,340.17674 364.37224,330.13042 372.99595,315.5461 371.93817,275.14008 353.5534,269.83678 345.77521,264.88703 339.76483,255.69464 337.6435,235.5421 336.22929,219.98575 335.87574,204.78295 332.3402,193.11569 325.52892,184.24307 C 328.9913,175.62336 335.23381,183.339 337.28995,183.56971 Z"
+ }
+ ,
+ {
+ "label":"Forward leg wraps" ,"index": 10, "fill": "#375833", "stroke":"#375833", "width":0.1,
"path":"M 269.26096,408.97512 268.98475,405.66056 276.81959,411.50564 284.14672,416.97195 284.41835,422.79272 289.39935,423.20759 289.44775,429.13179 284.47669,429.42189 284.34232,434.39875 289.038,434.40275 288.9691,440.15424 284.7302,440.6263 283.84767,452.72211 268.06875,452.49694 269.32875,438.32782 269.47956,425.87012 V 417.87839 Z"
}
,
{
- "label":"Rear leg wraps" ,"index": 8, "fill": "#375833", "stroke":"#375833", "width":0.1,
+ "label":"Rear leg wraps" ,"index": 10, "fill": "#375833", "stroke":"#375833", "width":0.1,
"path":"M 526.56125,427.60401 526.7789,417.13146 535.28243,417.18166 544.5184,417.23618 542.84279,429.97263 540.43411,443.52572 C 536.04763,448.58134 532.19107,450.99287 527.51507,444.38342 524.56483,441.50965 526.80981,437.27514 526.03763,433.78624 L 523.53695,433.88949 524.25729,427.3514 Z"
}
+ ,
+ {
+ "label":"Rosette background" ,"index": 11, "fill": "#aa0000", "stroke":"#aa0000", "width":0.1,
+ "path":"M 198.4594,84.29309 197.75228,78.282687 203.40914,82.52533 208.00533,76.51492 210.3635,82.27566 216.13706,77.929134 216.49064,84.29309 222.85459,84.64665 219.66176,90.78363 225.32947,95.60681 219.36219,97.241423 222.14749,103.73854 214.36272,101.8453 217.29325,136.70896 212.05895,128.56625 210.29964,137.19806 207.55626,109.89074 203.03029,137.172 201.69048,128.80839 197.39874,138.03321 201.34398,103.00855 194.57032,102.6779 197.58098,96.64901 192.09545,94.19262 196.53739,89.94486 191.74189,85.707331 Z"
+ }
+ ,
+ {
+ "label":"Rosette mid" ,"index": 11, "fill": "#000080", "stroke":"#000080", "width":0.1,
+ "path":"M 217.90483,93.839043 A 9.7227154,9.5459471 0 0 1 208.18211,103.38499 9.7227154,9.5459471 0 0 1 198.4594,93.839043 9.7227154,9.5459471 0 0 1 208.18211,84.293096 9.7227154,9.5459471 0 0 1 217.90483,93.839043 Z"
+ }
];
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/qml/pages/settings.js
^
|
| @@ -136,6 +136,7 @@
db.transaction(
function(tx) {
// Create the table, if not existing
+ if(developer) {console.log("test0")}
tx.executeSql('CREATE TABLE IF NOT EXISTS Settings(name TEXT, subname TEXT, valte TEXT, valre REAL, valint INTEGER)');
var rs = tx.executeSql('SELECT * FROM Settings WHERE name = ? and subname = ?', ['level_points', player_name]);
if (rs.rows.length > 0) {
@@ -144,14 +145,15 @@
else {
tx.executeSql('INSERT INTO Settings VALUES(?, ?, ?, ?, ?)', [ 'level_points', player_name, '', '', level_points ])
}
-
- rs = tx.executeSql('SELECT * FROM Settings WHERE name = ? and subname = ?', ['level', player_name]);
- if (rs.rows.length > 0) {
+ if(developer) {console.log("test1")}
+ var rt = tx.executeSql('SELECT * FROM Settings WHERE name = ? and subname = ?', ['level', player_name]);
+ if (rt.rows.length > 0) {
tx.executeSql('UPDATE Settings SET valint=? WHERE name=? AND subname =?', [level, 'level', player_name])
}
else {
tx.executeSql('INSERT INTO Settings VALUES(?, ?, ?, ?, ?)', [ 'level', player_name, '', '', level ])
}
+ if(developer) {console.log("test2")}
}
)
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/rpm/harbour-math-teacher.changes
^
|
| @@ -11,6 +11,11 @@
# * date Author's Name <author's email> version-release
# - Summary of changes
+* Tue Sep 08 2020 Riku Lahtinen <rikul.lajolla@kiu.as> 0.0.9-1
+- Your horse can be shared e.g. by e-mail
+- Added horse harnesses to the Fun page
+- On upper levels multiplications are not so easy any more
+
* Sat Oct 26 2019 Riku Lahtinen <rikul.lajolla@kiu.as> 0.0.8-1
- Fun page indicator added
- Fun page is now easier to reach
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/rpm/harbour-math-teacher.spec
^
|
| @@ -9,7 +9,7 @@
# << macros
Summary: Math teacher application
-Version: 0.0.8
+Version: 0.0.9
Release: 1
Group: Qt/Qt
License: LICENSE
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/rpm/harbour-math-teacher.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-math-teacher
Summary: Math teacher application
-Version: 0.0.8
+Version: 0.0.9
Release: 1
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/translations/harbour-math-teacher-fi.ts
^
|
| @@ -149,6 +149,23 @@
<extracomment>These patches mean large coloured areas on horse skin, e.g. https://en.wikipedia.org/wiki/Pinto_horse</extracomment>
<translation>Laikut</translation>
</message>
+ <message>
+ <source>Share my horse</source>
+ <translation>Jaa hevoskuva</translation>
+ </message>
+ <message>
+ <source>Shoes</source>
+ <translation>Kengät</translation>
+ </message>
+ <message>
+ <source>Saddle blanket</source>
+ <translation>Satulahuopa</translation>
+ </message>
+ <message>
+ <source>Rosette</source>
+ <extracomment>Rosette is a prize which is attached to the horses bridle after a winned race</extracomment>
+ <translation>Ruusuke</translation>
+ </message>
</context>
<context>
<name>LearningPage</name>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/translations/harbour-math-teacher-fr.ts
^
|
| @@ -149,6 +149,23 @@
<extracomment>These patches mean large coloured areas on horse skin, e.g. https://en.wikipedia.org/wiki/Pinto_horse</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Share my horse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Shoes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Saddle blanket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Rosette</source>
+ <extracomment>Rosette is a prize which is attached to the horses bridle after a winned race</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>LearningPage</name>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/translations/harbour-math-teacher-sv.ts
^
|
| @@ -149,6 +149,23 @@
<extracomment>These patches mean large coloured areas on horse skin, e.g. https://en.wikipedia.org/wiki/Pinto_horse</extracomment>
<translation>Fläckar</translation>
</message>
+ <message>
+ <source>Share my horse</source>
+ <translation>Dela min häst</translation>
+ </message>
+ <message>
+ <source>Shoes</source>
+ <translation>Skor</translation>
+ </message>
+ <message>
+ <source>Saddle blanket</source>
+ <translation>Sadeltäcke</translation>
+ </message>
+ <message>
+ <source>Rosette</source>
+ <extracomment>Rosette is a prize which is attached to the horses bridle after a winned race</extracomment>
+ <translation>Rosett</translation>
+ </message>
</context>
<context>
<name>LearningPage</name>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/translations/harbour-math-teacher-zh_cn.ts
^
|
| @@ -45,12 +45,12 @@
</message>
<message>
<source>Chinese (China) (Historyscholar)</source>
- <translation>汉语 (中国) (Historyscholar)</translation>
+ <translation>汉语 (中国) (Luchy Kon)</translation>
</message>
<message>
<source>Math teacher, version</source>
<extracomment>The name of the app followed with a version number</extracomment>
- <translation>数学教师版本</translation>
+ <translation>数学老师版本</translation>
</message>
<message>
<source>French (Quentin)</source>
@@ -99,14 +99,14 @@
<name>CoverPage</name>
<message>
<source>Math teacher</source>
- <translation>数学教师</translation>
+ <translation>数学老师</translation>
</message>
</context>
<context>
<name>FunPage</name>
<message>
<source>Fun page</source>
- <translation>Fun页</translation>
+ <translation>趣味页</translation>
</message>
<message>
<source>Change horse</source>
@@ -149,6 +149,23 @@
<extracomment>These patches mean large coloured areas on horse skin, e.g. https://en.wikipedia.org/wiki/Pinto_horse</extracomment>
<translation>马饰</translation>
</message>
+ <message>
+ <source>Share my horse</source>
+ <translation>分享我的马儿</translation>
+ </message>
+ <message>
+ <source>Shoes</source>
+ <translation>马蹄铁</translation>
+ </message>
+ <message>
+ <source>Saddle blanket</source>
+ <translation>鞍毡</translation>
+ </message>
+ <message>
+ <source>Rosette</source>
+ <extracomment>Rosette is a prize which is attached to the horses bridle after a winned race</extracomment>
+ <translation>玫瑰花环</translation>
+ </message>
</context>
<context>
<name>LearningPage</name>
@@ -169,7 +186,7 @@
</message>
<message>
<source>Fun</source>
- <translation>Fun </translation>
+ <translation>趣味</translation>
</message>
<message>
<source>Play</source>
@@ -196,7 +213,7 @@
</message>
<message>
<source>Level</source>
- <translation>水平</translation>
+ <translation>游戏难度</translation>
</message>
<message>
<source>Coins</source>
@@ -205,7 +222,7 @@
<message>
<source>Next fun</source>
<extracomment>Progress bar shows when you reach the Fun page next time</extracomment>
- <translation>再次来到 fun 页!</translation>
+ <translation>再次来到趣味页!</translation>
</message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.9.tar.bz2/translations/harbour-math-teacher.ts
^
|
| @@ -149,6 +149,23 @@
<extracomment>These patches mean large coloured areas on horse skin, e.g. https://en.wikipedia.org/wiki/Pinto_horse</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Share my horse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Shoes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Saddle blanket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Rosette</source>
+ <extracomment>Rosette is a prize which is attached to the horses bridle after a winned race</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>LearningPage</name>
|
