diff --git a/src/activities/family/Dataset.qml b/src/activities/family/Dataset.qml index 75faf6676..4a8917a98 100644 --- a/src/activities/family/Dataset.qml +++ b/src/activities/family/Dataset.qml @@ -1,547 +1,565 @@ /* GCompris - Dataset.qml * * Copyright (C) RUDRA NIL BASU (Qt Quick port) * * Authors: * Holger Kaelberer * RUDRA NIL BASU (Qt Quick port) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 QtObject { property real nodeWidth: background.nodeWidthRatio property real nodeHeight: background.nodeHeightRatio /* * Vertically, the screen is divided into three parts: * gen_1: stands for Generation 1 * gen_2: stands for Generation 2 * gen_3: stands for Generation 3 */ readonly property real gen_1: 0.10 readonly property real gen_2: 0.40 readonly property real gen_3: 0.70 /* * Horizontally, the screen is divided into left, center * and right */ readonly property real left: 0.2 readonly property real center: 0.4 readonly property real right: 0.6 readonly property real left_1: 0.1 readonly property real left_2: 0.3 readonly property real right_1: 0.5 readonly property real right_2: 0.7 + readonly property int pair_1: -1 + readonly property int pair_2: 1 + readonly property int no_pair: 0 + function rightXEdge(xPosition) { /* * Returns the x coordinate of the * right edge of a node */ return xPosition + nodeWidth } function nodeMidPointY(yPosition) { /* * Returns the y coordinate of the * midpoint of a node */ return yPosition + nodeHeight / 2 } function nodeMidPointX(xLeftPosition, xRightPosition) { /* * Returns the x coordinate of the * midpoint of two nodes */ return ((xLeftPosition + nodeWidth) + xRightPosition) / 2 } property var levelElements: [ // level 1 { edgeList: [ [left + nodeWidth, gen_1 + nodeHeight / 2, right, gen_1 + nodeHeight / 2], [((left + nodeWidth) + right) / 2, gen_1 + nodeHeight / 2, ((left + nodeWidth) + right) / 2, gen_2] ], nodePositions: [ [left, gen_1], [right, gen_1], [center, gen_2] ], captions: [ [center - (nodeWidth * 3 / 4), gen_2 + nodeHeight / 2], [left - nodeWidth / 2, gen_1] ], nodeleave: ["man3.svg", "lady2.svg", "boy1.svg"], + nodeWeights: [pair_1, no_pair, pair_2], currentState: ["activeTo", "deactive", "active"], edgeState:["married","others"], answer: [qsTr("Father")], options: [qsTr("Father"), qsTr("Grandfather"), qsTr("Uncle")] }, // level 2 { edgeList: [ [left + nodeWidth, gen_1 + nodeHeight / 2, right, gen_1 + nodeHeight / 2], [((left + nodeWidth) + right) / 2, gen_1 + nodeHeight / 2, ((left + nodeWidth) + right) / 2, gen_2] ], nodePositions: [ [left, gen_1], [right, gen_1], [center, gen_2] ], captions: [ [center - (nodeWidth * 3 / 4), gen_2 + nodeHeight / 2], [right + nodeWidth, gen_1] ], nodeleave: ["man3.svg", "lady2.svg", "boy1.svg"], + nodeWeights: [no_pair, pair_1, pair_2], currentState: ["deactive", "activeTo", "active"], edgeState:["married","others"], answer: [qsTr("Mother")], options: [qsTr("Mother"), qsTr("Grandmother"), qsTr("Aunt")] }, // level 3 { edgeList: [ [rightXEdge(left), nodeMidPointY(gen_1), right, nodeMidPointY(gen_1)], [nodeMidPointX(left, right), nodeMidPointY(gen_1), nodeMidPointX(left, right), gen_2 - nodeHeight / 4], [left + nodeWidth / 2, gen_2 - nodeHeight / 4, right + nodeWidth / 2, gen_2 - nodeHeight / 4], [left + nodeWidth / 2, gen_2 - nodeHeight / 4, left + nodeWidth / 2, gen_2], [right + nodeWidth / 2, gen_2 - nodeHeight / 4, right + nodeWidth / 2, gen_2] ], nodePositions: [ [left, gen_1], [right, gen_1], [left, gen_2], [right, gen_2] ], captions:[ [left - (nodeWidth * 3 / 4), gen_2 + nodeHeight / 2], [right + nodeWidth, gen_2] - /* - [0.21, 0.59], - [0.740, 0.595] - */ ], nodeleave: ["man3.svg", "lady2.svg", "boy1.svg", "boy2.svg"], + nodeWeights: [no_pair, no_pair, pair_1, pair_2], currentState: ["deactive", "deactive", "active", "activeTo"], edgeState:["married","others","others","others"], answer: [qsTr("Brother")], options: [qsTr("Cousin"), qsTr("Brother"), qsTr("Sister")] }, // level 4 { edgeList: [ [rightXEdge(left), nodeMidPointY(gen_1), right, nodeMidPointY(gen_1)], [nodeMidPointX(left, right), nodeMidPointY(gen_1), nodeMidPointX(left, right), gen_2 - nodeHeight / 4], [left + nodeWidth / 2, gen_2 - nodeHeight / 4, right + nodeWidth / 2, gen_2 - nodeHeight / 4], [left + nodeWidth / 2, gen_2 - nodeHeight / 4, left + nodeWidth / 2, gen_2], [center + nodeWidth / 2, gen_2 - nodeHeight / 4, center + nodeWidth / 2, gen_2], [right + nodeWidth / 2, gen_2 - nodeHeight / 4, right + nodeWidth / 2, gen_2] ], nodePositions: [ [left, gen_1], [right, gen_1], [left, gen_2], [center, gen_2], [right, gen_2] ], captions: [ [left - (nodeWidth * 3 / 4), gen_2 + nodeHeight / 2], [center + nodeWidth / 2, (gen_2 + nodeHeight)] ], nodeleave: ["man3.svg", "lady2.svg", "boy1.svg", "girl1.svg", "boy2.svg"], + nodeWeights: [no_pair, no_pair, pair_1, pair_2, pair_1], currentState: ["deactive", "deactive", "active", "activeTo", "deactive"], edgeState:["married", "others", "others", "others", "others", "others"], answer: [qsTr("Sister")], options: [qsTr("Cousin"), qsTr("Brother"), qsTr("Sister")] }, // level 5 { edgeList: [ [left_1 + nodeWidth, gen_1 + nodeHeight / 2, right_1, gen_1 + nodeHeight / 2], [((left_1 + nodeWidth) + right_1) / 2, gen_1 + nodeHeight / 2, ((left_1 + nodeWidth) + right_1) / 2, gen_2], [left_2 + nodeWidth, gen_2 + nodeHeight / 2, right, gen_2 + nodeHeight / 2], [((left_2 + nodeWidth) + right) / 2, gen_2 + nodeHeight / 2, ((left_2 + nodeWidth) + right) / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, left + nodeWidth / 2, gen_3], [center + nodeWidth / 2, gen_3 - nodeWidth / 4, center + nodeWidth / 2, gen_3], [right + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3] ], nodePositions: [ [left_1, gen_1], [right_1, gen_1], [left_2, gen_2], [right, gen_2], [left, gen_3], [center, gen_3], [right, gen_3] ], captions: [ [left_1, gen_3 + nodeHeight / 4], [left_1, gen_1 + nodeHeight] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man2.svg", "lady1.svg", "girl1.svg", "boy1.svg", "boy2.svg"], + nodeWeights: [pair_1, no_pair, no_pair, no_pair, pair_2, pair_2, pair_2], currentState: ["activeTo", "deactive", "deactive", "deactive", "active", "deactive", "deactive"], edgeState:["married","others","married","others","others","others","others","others" ], answer: [qsTr("Grandfather")], options: [qsTr("Granddaughter"), qsTr("Grandson"), qsTr("Grandfather"), qsTr("Grandmother")] }, // level 6 { edgeList: [ [left_1 + nodeWidth, gen_1 + nodeHeight / 2, right_1, gen_1 + nodeHeight / 2], [((left_1 + nodeWidth) + right_1) / 2, gen_1 + nodeHeight / 2, ((left_1 + nodeWidth) + right_1) / 2, gen_2], [left_2 + nodeWidth, gen_2 + nodeHeight / 2, right, gen_2 + nodeHeight / 2], [((left_2 + nodeWidth) + right) / 2, gen_2 + nodeHeight / 2, ((left_2 + nodeWidth) + right) / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, left + nodeWidth / 2, gen_3], [center + nodeWidth / 2, gen_3 - nodeWidth / 4, center + nodeWidth / 2, gen_3], [right + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3] ], nodePositions: [ [left_1, gen_1], [right_1, gen_1], [left_2, gen_2], [right, gen_2], [left, gen_3], [center, gen_3], [right, gen_3] ], captions: [ [right + nodeWidth, gen_3 + (nodeHeight * 3 / 4)], [right_1, gen_1 + nodeHeight] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man2.svg", "lady1.svg", "boy1.svg", "girl1.svg", "boy2.svg"], + nodeWeights: [no_pair, pair_1, no_pair, no_pair, pair_2, pair_2, pair_2], currentState: ["deactive", "activeTo", "deactive", "deactive", "deactive", "deactive", "active", "active"], edgeState:["married","others","married","others","others","others","others","others" ], answer: [qsTr("Grandmother")], options: [qsTr("Granddaughter"), qsTr("Grandson"), qsTr("Grandfather"), qsTr("Grandmother")], }, // level 7 { edgeList: [ [left_1 + nodeWidth, gen_1 + nodeHeight / 2, right_1, gen_1 + nodeHeight / 2], [((left_1 + nodeWidth) + right_1) / 2, gen_1 + nodeHeight / 2, ((left_1 + nodeWidth) + right_1) / 2, gen_2], [left_2 + nodeWidth, gen_2 + nodeHeight / 2, right, gen_2 + nodeHeight / 2], [((left_2 + nodeWidth) + right) / 2, gen_2 + nodeHeight / 2, ((left_2 + nodeWidth) + right) / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, left + nodeWidth / 2, gen_3], [center + nodeWidth / 2, gen_3 - nodeWidth / 4, center + nodeWidth / 2, gen_3], [right + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3] ], nodePositions: [ [left_1, gen_1], [right_1, gen_1], [left_2, gen_2], [right, gen_2], [left, gen_3], [center, gen_3], [right, gen_3] ], captions: [ [left_1 + nodeWidth, gen_1], [right + nodeWidth, gen_3] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man2.svg", "lady1.svg", "boy1.svg", "boy2.svg","girl1.svg" ], + nodeWeights: [pair_1, pair_1, no_pair, no_pair, no_pair, no_pair, pair_2], currentState: ["active", "deactive", "deactive", "deactive", "deactive", "deactive", "activeTo"], edgeState:["married","others","married","others","others","others","others","others" ], answer: [qsTr("Granddaughter")], options: [qsTr("Granddaughter"), qsTr("Grandson"), qsTr("Grandfather"), qsTr("Grandmother")] }, // level 8 { edgeList: [ [left_1 + nodeWidth, gen_1 + nodeHeight / 2, right_1, gen_1 + nodeHeight / 2], [((left_1 + nodeWidth) + right_1) / 2, gen_1 + nodeHeight / 2, ((left_1 + nodeWidth) + right_1) / 2, gen_2], [left_2 + nodeWidth, gen_2 + nodeHeight / 2, right, gen_2 + nodeHeight / 2], [((left_2 + nodeWidth) + right) / 2, gen_2 + nodeHeight / 2, ((left_2 + nodeWidth) + right) / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3 - nodeWidth / 4], [left + nodeWidth / 2, gen_3 - nodeWidth / 4, left + nodeWidth / 2, gen_3], [center + nodeWidth / 2, gen_3 - nodeWidth / 4, center + nodeWidth / 2, gen_3], [right + nodeWidth / 2, gen_3 - nodeWidth / 4, right + nodeWidth / 2, gen_3] ], nodePositions: [ [left_1, gen_1], [right_1, gen_1], [left_2, gen_2], [right, gen_2], [left, gen_3], [center, gen_3], [right, gen_3] ], captions: [ [right_1 + nodeWidth, gen_1], [right + nodeWidth, gen_3] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man2.svg", "lady1.svg", "boy1.svg", "girl1.svg", "boy2.svg"], + nodeWeights: [pair_1, pair_1, no_pair, no_pair, pair_2, no_pair, pair_2], currentState: ["deactive", "active", "deactive", "deactive", "deactive", "deactive", "activeTo", "active"], edgeState:["married","others","married","others","others","others","others","others" ], answer: [qsTr("Grandson")], options: [qsTr("Granddaughter"), qsTr("Grandson"), qsTr("Grandfather"), qsTr("Grandmother")] }, // level 9 { edgeList: [ [center + nodeWidth / 2, gen_1 + nodeHeight, center + nodeWidth / 2, gen_2 + nodeHeight / 2], [rightXEdge(left), nodeMidPointY(gen_2), right, nodeMidPointY(gen_2)], [left + nodeWidth / 2, gen_2 + nodeHeight, left + nodeWidth / 2, gen_3], [right + nodeWidth / 2, gen_2 + nodeHeight, right + nodeWidth / 2, gen_3] ], nodePositions: [ [center, gen_1], [left, gen_2], [right, gen_2], [left, gen_3], [right, gen_3] ], captions: [ [(right + nodeWidth * 1.1), gen_3 + nodeHeight / 4], [left - nodeWidth / 2, gen_3 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "man3.svg", "man2.svg", "boy1.svg","boy2.svg"], + nodeWeights: [no_pair, no_pair, no_pair, pair_2, pair_1], currentState: ["deactive", "deactive", "deactive", "activeTo","active"], edgeState:["others","others","others","others"], answer: [qsTr("Cousin")], options: [qsTr("Brother"), qsTr("Sister"), qsTr("Cousin")] }, // level 10 { edgeList: [ [center + nodeWidth / 2, gen_1 + nodeHeight, center + nodeWidth / 2, gen_2 + nodeHeight / 2], [rightXEdge(left), nodeMidPointY(gen_2), right, nodeMidPointY(gen_2)], [left + nodeWidth / 2, gen_2 + nodeHeight, left + nodeWidth / 2, gen_3] ], nodePositions: [ [center, gen_1], [left, gen_2], [right, gen_2], [left, gen_3] ], captions: [ [left - nodeWidth * 3 / 4, gen_3 + nodeHeight / 4], [right + nodeWidth * 1.1, gen_2 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "man3.svg", "man2.svg", "boy1.svg"], + nodeWeights: [no_pair, no_pair, pair_1, pair_2], currentState: ["deactive", "deactive", "activeTo", "active"], edgeState:["others","others","others"], answer: [qsTr("Uncle")], options: [qsTr("Uncle"), qsTr("Aunt"), qsTr("Nephew"), qsTr("Niece")] }, // level 11 { edgeList: [ [center + nodeWidth / 2, gen_1 + nodeHeight, center + nodeWidth / 2, gen_2 + nodeHeight / 2], [rightXEdge(left), nodeMidPointY(gen_2), right, nodeMidPointY(gen_2)], [left + nodeWidth / 2, gen_2 + nodeHeight, left + nodeWidth / 2, gen_3] ], nodePositions: [ [center, gen_1], [left, gen_2], [right, gen_2], [left, gen_3] ], captions: [ [right + nodeWidth * 1.1, gen_2 + nodeHeight / 4], [left - nodeWidth * 3 / 4, gen_3 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "man3.svg", "man2.svg", "boy1.svg"], + nodeWeights: [no_pair, no_pair, pair_2, pair_1], currentState: ["deactive", "deactive", "active", "activeTo"], edgeState:["others","others","others"], answer: [qsTr("Nephew")], options: [qsTr("Uncle"), qsTr("Aunt"), qsTr("Nephew"), qsTr("Niece")] }, // level 12 { edgeList: [ [rightXEdge(left), gen_1 + nodeHeight / 2, right, gen_1 + nodeHeight / 2], [nodeMidPointX(left, right), nodeMidPointY(gen_1), nodeMidPointX(left, right), nodeMidPointY(gen_2)], [rightXEdge(left), nodeMidPointY(gen_2), right, nodeMidPointY(gen_2)], [left + nodeWidth / 2, gen_2 + nodeHeight, left + nodeWidth / 2, gen_3] ], nodePositions: [ [left, gen_1], [right, gen_1], [left, gen_2], [right, gen_2], [left, gen_3] ], captions: [ [left - nodeWidth * 3 / 4, gen_3 + nodeHeight / 4], [right + nodeWidth * 1.1, gen_2 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man3.svg", "lady1.svg", "babyboy.svg"], + nodeWeights: [no_pair, no_pair, no_pair, pair_1, pair_2], currentState: ["deactive", "deactive", "deactive", "activeTo", "active"], edgeState:["married","others","siblings","others","others","others"], answer: [qsTr("Aunt")], options: [qsTr("Uncle"), qsTr("Aunt"), qsTr("Nephew"), qsTr("Niece")] }, // level 13 { edgeList: [ [rightXEdge(left), gen_1 + nodeHeight / 2, right, gen_1 + nodeHeight / 2], [nodeMidPointX(left, right), nodeMidPointY(gen_1), nodeMidPointX(left, right), nodeMidPointY(gen_2)], [rightXEdge(left), nodeMidPointY(gen_2), right, nodeMidPointY(gen_2)], [left + nodeWidth / 2, gen_2 + nodeHeight, left + nodeWidth / 2, gen_3] ], nodePositions: [ [left, gen_1], [right, gen_1], [left, gen_2], [right, gen_2], [left, gen_3] ], captions: [ [right + nodeWidth * 1.1, gen_2 + nodeHeight / 4], [left - nodeWidth / 2, gen_3 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man3.svg", "lady1.svg", "babygirl.svg"], + nodeWeights: [no_pair, no_pair, no_pair, pair_2, pair_1], currentState: ["deactive", "deactive", "deactive", "active", "activeTo"], edgeState:["married","others","siblings","others","others","others"], answer: [qsTr("Niece")], options: [qsTr("Uncle"), qsTr("Aunt"), qsTr("Nephew"), qsTr("Niece")] }, // level 14 { edgeList: [ [rightXEdge(center), nodeMidPointY(gen_1), right_2, nodeMidPointY(gen_1)], [nodeMidPointX(center, right_2), nodeMidPointY(gen_1), nodeMidPointX(center, right_2), nodeMidPointY(gen_2)], [rightXEdge(center), nodeMidPointY(gen_2), right_2, nodeMidPointY(gen_2)], [rightXEdge(left_1), nodeMidPointY(gen_2), center, nodeMidPointY(gen_2)] ], nodePositions: [ [center, gen_1], [right_2, gen_1], [center, gen_2], [right_2, gen_2], [left_1, gen_2] ], captions: [ [left_1 - nodeWidth / 2, gen_2 + nodeHeight * 3 / 4], [center - nodeWidth * 3 / 4, gen_1 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man3.svg", "man1.svg", "lady2.svg"], + nodeWeights: [pair_1, no_pair, no_pair, no_pair, pair_2], currentState: ["activeTo", "deactive", "deactive", "deactive", "active"], edgeState:["married","others","others","married"], answer: [qsTr("Father-in-law")], options: [qsTr("Father-in-law"), qsTr("Mother-in-law"), qsTr("Sister-in-law"), qsTr("Brother-in-law"), qsTr("Daughter-in-law")] }, // level 15 { edgeList: [ [rightXEdge(center), nodeMidPointY(gen_1), right_2, nodeMidPointY(gen_1)], [nodeMidPointX(center, right_2), nodeMidPointY(gen_1), nodeMidPointX(center, right_2), nodeMidPointY(gen_2)], [rightXEdge(center), nodeMidPointY(gen_2), right_2, nodeMidPointY(gen_2)], [rightXEdge(left_1), nodeMidPointY(gen_2), center, nodeMidPointY(gen_2)] ], nodePositions: [ [center, gen_1], [right_2, gen_1], [center, gen_2], [right_2, gen_2], [left_1, gen_2] ], captions: [ [left_1 - nodeWidth / 2, gen_2 + nodeHeight * 3 / 4], [right_2 + nodeWidth * 1.1, gen_1 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man3.svg", "man1.svg", "lady2.svg"], + nodeWeights: [no_pair, pair_1, no_pair, no_pair, pair_2], currentState: ["deactive", "activeTo", "deactive", "deactive", "active"], edgeState:["married","others","others","married","others"], answer: [qsTr("Mother-in-law")], options: [qsTr("Father-in-law"), qsTr("Mother-in-law"), qsTr("Sister-in-law"), qsTr("Brother-in-law"), qsTr("Daughter-in-law")] }, // level 16 { edgeList: [ [rightXEdge(center), nodeMidPointY(gen_1), right_2, nodeMidPointY(gen_1)], [nodeMidPointX(center, right_2), nodeMidPointY(gen_1), nodeMidPointX(center, right_2), nodeMidPointY(gen_2)], [rightXEdge(center), nodeMidPointY(gen_2), right_2, nodeMidPointY(gen_2)], [rightXEdge(left_1), nodeMidPointY(gen_2), center, nodeMidPointY(gen_2)] ], nodePositions: [ [center, gen_1], [right_2, gen_1], [center, gen_2], [right_2, gen_2], [left_1, gen_2] ], captions: [ [left_1 - nodeWidth / 2, gen_2 + nodeHeight * 3 / 4], [right_2 + nodeWidth * 1.1, gen_2 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man3.svg", "man1.svg", "lady2.svg"], + nodeWeights: [no_pair, no_pair, no_pair, pair_1, pair_2], currentState: ["deactive", "deactive", "deactive", "activeTo", "active"], edgeState:["married","others","others","married","others"], answer: [qsTr("Brother-in-law")], options: [qsTr("Father-in-law"), qsTr("Mother-in-law"), qsTr("Sister-in-law"), qsTr("Brother-in-law"), qsTr("Daughter-in-law")] }, // level 17 { edgeList: [ [rightXEdge(left_2), nodeMidPointY(gen_1), right_1, nodeMidPointY(gen_1)], [nodeMidPointX(left_2, right_1), nodeMidPointY(gen_1), nodeMidPointX(left_2, right_1), nodeMidPointY(gen_2)], [rightXEdge(left_2), nodeMidPointY(gen_2), right_1, nodeMidPointY(gen_2)], [rightXEdge(left_1), nodeMidPointY(gen_2), left_2, nodeMidPointY(gen_2)], [rightXEdge(right_1), nodeMidPointY(gen_2), right_2, nodeMidPointY(gen_2)] ], nodePositions: [ [left_2, gen_1], [right_1, gen_1], [left_2, gen_2], [left_1, gen_2], [right_1, gen_2], [right_2, gen_2] ], captions: [ [left_1 - nodeWidth / 2, gen_2], [right_2 + nodeWidth, gen_2 + nodeHeight / 4] ], nodeleave: ["grandfather.svg", "old-lady.svg", "man3.svg", "lady2.svg", "man1.svg", "lady1.svg"], + nodeWeights: [no_pair, no_pair, no_pair, pair_1, no_pair, pair_2], currentState: ["dective", "deactive", "deactive", "active", "deactive", "activeTo"], edgeState:["married","others","others","married","married"], answer: [qsTr("Sister-in-law")], options: [qsTr("Father-in-law"), qsTr("Mother-in-law"), qsTr("Sister-in-law"), qsTr("Brother-in-law"), qsTr("Daughter-in-law")] }, // level 18 { edgeList: [ [rightXEdge(center), nodeMidPointY(gen_1), right_2, nodeMidPointY(gen_1)], [nodeMidPointX(center, right_2), nodeMidPointY(gen_1), nodeMidPointX(center, right_2), nodeMidPointY(gen_2)], [rightXEdge(center), nodeMidPointY(gen_2), right_2, nodeMidPointY(gen_2)], [rightXEdge(left_1), nodeMidPointY(gen_2), center, nodeMidPointY(gen_2)] ], nodePositions: [ [center, gen_1], [right_2, gen_1], [center, gen_2], [left_1, gen_2], [right_2, gen_2] ], captions: [ [center - (nodeWidth * 3/ 4), gen_1 + nodeHeight / 4], [left_1 - nodeWidth / 2, gen_2 + nodeHeight / 2] ], nodeleave: ["grandfather.svg", "old-lady.svg", "lady2.svg", "man3.svg", "man1.svg"], + nodeWeights: [pair_1, pair_1, no_pair, pair_2, no_pair], currentState: ["active", "deactive", "deactive", "activeTo", "deactive", "deactive"], edgeState:["married","others","others","married","others"], answer: [qsTr("Son-in-law")], options: [qsTr("Son-in-law"), qsTr("Mother-in-law"), qsTr("Sister-in-law"), qsTr("Brother-in-law"), qsTr("Daughter-in-law")] } ] } diff --git a/src/activities/family/Family.qml b/src/activities/family/Family.qml index c19bc87ca..aa5bb15c2 100644 --- a/src/activities/family/Family.qml +++ b/src/activities/family/Family.qml @@ -1,306 +1,315 @@ /* GCompris - family.qml * * Copyright (C) 2016 RAJDEEP KAUR * * Authors: * * RAJDEEP KAUR * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.1 import GCompris 1.0 import QtGraphicalEffects 1.0 import "../../core" import "family.js" as Activity ActivityBase { id: activity property string mode: "normal" onStart: focus = true onStop: {} pageComponent: Image { id: background anchors.fill: parent source: Activity.url + "back.svg" sourceSize.width: parent.width height: parent.height fillMode: Image.PreserveAspectCrop property bool horizontalLayout: background.width > background.height signal start signal stop Component.onCompleted: { activity.start.connect(start) activity.stop.connect(stop) } property real treeAreaWidth: background.horizontalLayout ? background.width * 0.65 : background.width property real treeAreaHeight: background.horizontalLayout ? background.height : background.height * 0.65 property real nodeWidth: (0.8 * treeAreaWidth) / 5 property real nodeHeight: (0.8 * treeAreaWidth) / 5 property real nodeWidthRatio: nodeWidth / treeAreaWidth property real nodeHeightRatio: nodeHeight / treeAreaHeight onWidthChanged: loadDatasetDelay.start() onHeightChanged: if (!loadDatasetDelay.running) { loadDatasetDelay.start() } /* * Adding a delay before reloading the datasets * needed for fast width / height changes */ Timer { id: loadDatasetDelay running: false repeat: false interval: 100 onTriggered: Activity.loadDatasets() } // Add here the QML items you need to access in javascript QtObject { id: items property Item main: activity.main property alias background: background property alias bar: bar property alias bonus: bonus property alias nodeCreator: nodeCreator property alias answersChoice: answersChoice property alias edgeCreator: edgeCreator property alias wringcreator: wringcreator property alias dataset: dataset + property alias nodePreviouslySelected: background.nodePreviouslySelected + property alias firstNodeValue: background.firstNodeValue + property alias secondNodeValue: background.secondNodeValue + property string mode: activity.mode } + property bool nodePreviouslySelected: false + property int firstNodeValue + property int secondNodeValue + onStart: { Activity.start(items) } onStop: { Activity.stop() } Dataset { id: dataset } Item { id: partition width: background.width height: background.height Rectangle { id: treeArea color: "transparent" width: background.horizontalLayout ? background.width * 0.65 : background.width height: background.horizontalLayout ? background.height : background.height * 0.65 border.color: "black" border.width: 5 Item { id: treeItem Repeater { id: nodeCreator model: ListModel{} delegate: Node { id: currentPointer x: xPosition * treeArea.width y: yPosition * treeArea.height width: treeArea.width / 5 height: treeArea.width / 5 nodeWidth: currentPointer.width nodeHeight: currentPointer.height nodeImageSource: Activity.url + nodeValue borderColor: "black" borderWidth: 4 color: "transparent" radius: nodeWidth / 2 - state: activity.mode == "normal" ? currentState : "deactive" + state: currentState + weight: nodeWeight states: [ State { name: "active" PropertyChanges { target: currentPointer borderColor: "blue" } }, State { name: "deactive" PropertyChanges { target: currentPointer } }, State { name: "activeTo" PropertyChanges { target: currentPointer borderColor: "red" } } ] } } Rectangle { id: me visible: dataset.levelElements[bar.level-1].captions[0] !== undefined && activity.mode == "normal" x: dataset.levelElements[bar.level-1].captions[0][0]*treeArea.width y: dataset.levelElements[bar.level-1].captions[0][1]*treeArea.height width: treeArea.width/12 height: treeArea.height/14 radius: 5 border.color: "black" GCText { id: meLabel text: qsTr("Me") anchors { horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } } } Image { id: questionmark source: Activity.url + "questionmark.svg" visible: dataset.levelElements[bar.level-1].captions[1] !== undefined && activity.mode == "normal" x: dataset.levelElements[bar.level-1].captions[1][0]*treeArea.width y: dataset.levelElements[bar.level-1].captions[1][1]*treeArea.height } Repeater { id: edgeCreator model: ListModel {} delegate: Rectangle { id: edge opacity: 1 antialiasing: true transformOrigin: Item.TopLeft x: x1*treeArea.width y: y1*treeArea.height property var x2: x22*treeArea.width property var y2: y22*treeArea.height width: Math.sqrt(Math.pow(x - x2, 2) + Math.pow(y- y2, 2)) height: 4 * ApplicationInfo.ratio rotation: (Math.atan((y2 - y)/(x2-x)) * 180 / Math.PI) + (((y2-y) < 0 && (x2-x) < 0) * 180) + (((y2-y) >= 0 && (x2-x) < 0) * 180) color: "black" Behavior on height { NumberAnimation { duration: 2000 easing.type: Easing.OutExpo } } Behavior on width { NumberAnimation { duration: 2000 easing.type: Easing.OutExpo } } } } Repeater { id: wringcreator model: ListModel{} delegate: Image { id: wring source: Activity.url + "rings.svg" width: treeArea.width*0.04 height: treeArea.width*0.04 x:ringx*treeArea.width y:ringy*treeArea.height } } } } Rectangle { id: answers color: "transparent" width: background.horizontalLayout ? background.width*0.35 : background.width height: background.horizontalLayout ? background.height : background.height*0.35 anchors.left: background.horizontalLayout ? treeArea.right : partition.left anchors.top: background.horizontalLayout ? partition.top: treeArea.bottom border.color: "black" border.width: 5 Rectangle { width: parent.width * 0.99 height: parent.height * 0.99 anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter color: "transparent" GCText { id: question visible: activity.mode == "expert" ? true : false width: parent.width height: parent.height anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignHCenter wrapMode: Text.WordWrap - text: qsTr("Select the pair which denote the following relation: \n" + dataset.levelElements[bar.level - 1].answer[0]) + text: qsTr("Select the pair which denote the following relation: %1").arg(dataset.levelElements[bar.level - 1].answer[0]) } Grid { visible: activity.mode == "normal" ? true : false columns: 1 rowSpacing: 20 anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter Repeater { id: answersChoice model: ListModel {} delegate: AnswerButton { id: options width: answers.width*0.75 height: answers.height*Activity.answerButtonRatio textLabel: optionn isCorrectAnswer: textLabel === answer onCorrectlyPressed: bonus.good("lion") onIncorrectlyPressed: bonus.bad("lion") } } } } } } DialogHelp { id: dialogHelp onClose: home() } Bar { id: bar content: BarEnumContent { value: help | home | level } onHelpClicked: { displayDialog(dialogHelp) } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHomeClicked: activity.home() } Bonus { id: bonus Component.onCompleted: win.connect(Activity.nextLevel) } } } diff --git a/src/activities/family/Node.qml b/src/activities/family/Node.qml index a3d4f72b8..8cd5b70b5 100644 --- a/src/activities/family/Node.qml +++ b/src/activities/family/Node.qml @@ -1,83 +1,98 @@ /* GCompris - Node.qml * * Copyright (C) RAJDEEP KAUR (Qt Quick port) * * Authors: * Holger Kaelberer * RAJDEEP KAUR (Qt Quick port) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.0 import GCompris 1.0 import "../../core" import "family.js" as Activity Item { id: node property int nodeWidth property int nodeHeight property string nodeImageSource property string borderColor property real borderWidth property string color property real radius + property int weight Rectangle { id: content color: node.color width: 0.8 * nodeWidth height: 0.8 * nodeHeight border.color: borderColor border.width: borderWidth radius: node.radius Image { id: nodeImage source: nodeImageSource anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter width: parent.width * 0.6 height: parent.height * 0.6 SequentialAnimation { id: activeAnimation running: (currentPointer.state === "active" || currentPointer.state === "activeTo") && activity.mode == "normal" loops: Animation.Infinite alwaysRunToEnd: true NumberAnimation { target: nodeImage property: "rotation" from: 0; to: 10 duration: 200 easing.type: Easing.OutQuad } NumberAnimation { target: nodeImage property: "rotation" from: 10; to: -10 duration: 400 easing.type: Easing.InOutQuad } NumberAnimation { target: nodeImage property: "rotation" from: -10; to: 0 duration: 200 easing.type: Easing.InQuad } } } + + MouseArea { + visible: activity.mode == "expert" ? true : false + anchors.fill: parent + onClicked: { + if (!items.nodePreviouslySelected) { + items.nodePreviouslySelected = true + items.firstNodeValue = currentPointer.weight + } else { + items.secondNodeValue = currentPointer.weight + Activity.checkPairs() + } + } + } } } diff --git a/src/activities/family/family.js b/src/activities/family/family.js index 9c1da9e7b..484bdd7a2 100644 --- a/src/activities/family/family.js +++ b/src/activities/family/family.js @@ -1,114 +1,124 @@ /* GCompris - family.js * * Copyright (C) 2016 RAJDEEP KAUR * * Authors: * RAJDEEP KAUR * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ .pragma library .import QtQuick 2.0 as Quick .import GCompris 1.0 as GCompris var currentLevel = 0 var items; var barAtStart; var url = "qrc:/gcompris/src/activities/family/resource/" var numberOfLevel var answerButtonRatio = 0; function start(items_) { items = items_ currentLevel = 0 numberOfLevel = items.dataset.levelElements.length barAtStart = GCompris.ApplicationSettings.isBarHidden; GCompris.ApplicationSettings.isBarHidden = true; initLevel() } function stop() { GCompris.ApplicationSettings.isBarHidden = barAtStart; } function initLevel() { items.bar.level = currentLevel + 1 loadDatasets() } function loadDatasets() { if (!items) { return } var levelTree = items.dataset.levelElements[currentLevel] answerButtonRatio = 1 / (levelTree.options.length + 4); items.nodeCreator.model.clear(); items.answersChoice.model.clear(); items.edgeCreator.model.clear(); items.wringcreator.model.clear(); for(var i = 0 ; i < levelTree.nodePositions.length ; i++) { items.nodeCreator.model.append({ "xPosition": levelTree.nodePositions[i][0], "yPosition": levelTree.nodePositions[i][1], "nodeValue": levelTree.nodeleave[i], - "currentState": levelTree.currentState[i] + "currentState": items.mode == "normal" ? levelTree.currentState[i] : "deactive", + "nodeWeight": levelTree.nodeWeights[i] }); } for(var j = 0 ; j * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import GCompris 1.0 ActivityInfo { name: "family_expert/Family_expert.qml" difficulty: 2 icon: "family_expert/family_expert.svg" author: "Rudra Nil Basu <rudra.nil.basu.1996@gmail.com>" demo: true - title: "Family pair matching" + title: qsTr("Family pair matching") description: "" //intro: "put here in comment the text for the intro voice" goal: "" prerequisite: "" manual: "" credit: "" section: "fun" createdInVersion: 8000 }