diff --git a/resources/qml/Components/SpeedFlowChart.qml b/resources/qml/Components/SpeedFlowChart.qml index f7755c5..fa479f0 100644 --- a/resources/qml/Components/SpeedFlowChart.qml +++ b/resources/qml/Components/SpeedFlowChart.qml @@ -168,8 +168,7 @@ ListView { } else { // no result yet!! - thisPair[1]["win"] = thisPair[0]["win"] = false - //console.log("got no winner yet") + //console.log("got no winner yet, rank 0: " + thisPair[0]["result_rank"+round] + " rank 1: " + thisPair[1]["result_rank"+round]) continue } @@ -307,6 +306,8 @@ ListView { columns: app.landscape() ? 2:0 rows: app.landscape() ? 0:2 + spacing: app.landscape() ? width * 0.01:0 + anchors.fill: parent anchors.margins: matchRect.radius * 0.5 @@ -323,7 +324,7 @@ ListView { Label { height: parent.height - width: parent.width * (app.landscape() ? 0.1 : 0.2) + width: parent.width * ( 0.1) verticalAlignment: Text.AlignVCenter font.pixelSize: height * 0.6 @@ -335,19 +336,31 @@ ListView { Label { height: parent.height - width: parent.width * 0.6 + width: parent.width * 0.5 verticalAlignment: Text.AlignVCenter - horizontalAlignment: app.landscape() ? Text.AlignLeft : Text.AlignHCenter - font.pixelSize: height * 0.6 - fontSizeMode: Text.Fit - minimumPixelSize: 1 + horizontalAlignment: app.landscape() ? Text.AlignLeft : Text.AlignLeft + font.pixelSize: app.landscape() ? height * 0.35 : height * 0.5 + font.bold: matchItm.winnerIndex === index + elide: "ElideRight" color: matchItm.winnerIndex === index ? "green":"black" text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]['firstname'] + " " + matchItm.thisMatchData[index]['lastname'] :"-" } + Label { + height: parent.height + width: parent.width * (app.landscape() ? 0.2 : 0.2) + + verticalAlignment: Text.AlignVCenter + font.pixelSize: height * 0.6 + fontSizeMode: Text.Fit + minimumPixelSize: 1 + + text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]['result'+matchItm.thisRound]: "" + } + /*Rectangle { id: hasWonRect