From b56523fadf2851ba65064918d31d924dd7867925 Mon Sep 17 00:00:00 2001 From: Mirko Scholz Date: Thu, 10 Sep 2020 16:56:58 +0200 Subject: [PATCH] updated keyboard of Qt GUI --- qt_gui/main.qml | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/qt_gui/main.qml b/qt_gui/main.qml index fe0a913..e3bb33c 100644 --- a/qt_gui/main.qml +++ b/qt_gui/main.qml @@ -121,7 +121,7 @@ ApplicationWindow horizontalAlignment: Text.AlignHCenter font.pointSize: 16 color: "gray" - text: {getShiftedText(parent.parent.objectName, index) + "

"} + text: {getShiftedUpText(parent.parent.objectName, index) + "

"} textFormat: Text.RichText anchors.centerIn: parent } @@ -132,6 +132,14 @@ ApplicationWindow textFormat: Text.RichText anchors.centerIn: parent } + Text { + horizontalAlignment: Text.AlignHCenter + font.pointSize: 16 + color: "gray" + text: {"


" + getShiftedDownText(parent.parent.objectName, index)} + textFormat: Text.RichText + anchors.centerIn: parent + } MouseArea { //get row/column onClicked: _calculator.buttonClicked(parent.parent.objectName + "," + index) @@ -155,18 +163,30 @@ ApplicationWindow return "" + keys[row][col] + "" } - function getShiftedText(row, col) { + function getShiftedUpText(row, col) { var shifted_keys = [ ["Shift", "1/x", " √x ", "CLx"], - ["yx ", "ln(x)", "log(x)", ""], - ["🔃", "ex", "10x", ""], - ["", "", "", ""], + ["yx ", "ln(x)", "log(x)", "π"], + ["R▼", "ex", "10x", ""], + ["sin", "cos", "tan", "►rad"], ["off", "STO", "RCL", "LASTx"] ] return "" + shifted_keys[row][col] + "" } + function getShiftedDownText(row, col) { + var shifted_keys = [ + ["", "", "", ""], + ["", "", "", ""], + ["R▲", "", "", ""], + ["", "", "tan−1", "►deg"], + ["", "", "", ""] + ] + + return "" + shifted_keys[row][col] + "" + } + function getBackgroundColor(row, col) { var background_color = [ ["white", "white", "white", "#ff9494"],