From f922b97e5bb23ca6168524a5208ade02aaf9f28b Mon Sep 17 00:00:00 2001 From: matzman666 Date: Sat, 17 Dec 2016 00:39:48 +0100 Subject: [PATCH] Bugfixes and Improvements. --- bin/win64/res/qml/ChaperonePage.qml | 3 --- bin/win64/res/qml/PlayspacePage.qml | 7 +++---- bin/win64/res/qml/SteamVRPage.qml | 2 -- src/main.cpp | 10 +++++----- src/tabcontrollers/MoveCenterTabController.cpp | 8 ++++---- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/bin/win64/res/qml/ChaperonePage.qml b/bin/win64/res/qml/ChaperonePage.qml index 34edeba..de12834 100644 --- a/bin/win64/res/qml/ChaperonePage.qml +++ b/bin/win64/res/qml/ChaperonePage.qml @@ -275,7 +275,6 @@ MyStackViewPage { keyBoardUID: 301 Layout.preferredWidth: 100 Layout.leftMargin: 10 - Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter function onInputEvent(input) { var val = parseFloat(input) @@ -336,7 +335,6 @@ MyStackViewPage { keyBoardUID: 302 Layout.preferredWidth: 100 Layout.leftMargin: 10 - Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter function onInputEvent(input) { var val = parseFloat(input) @@ -396,7 +394,6 @@ MyStackViewPage { keyBoardUID: 303 Layout.preferredWidth: 100 Layout.leftMargin: 10 - Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter function onInputEvent(input) { var val = parseFloat(input) diff --git a/bin/win64/res/qml/PlayspacePage.qml b/bin/win64/res/qml/PlayspacePage.qml index c7f4ac8..e8ffce9 100644 --- a/bin/win64/res/qml/PlayspacePage.qml +++ b/bin/win64/res/qml/PlayspacePage.qml @@ -67,7 +67,7 @@ MyStackViewPage { id: playSpaceMoveXText text: "0.00" keyBoardUID: 101 - Layout.preferredWidth: 100 + Layout.preferredWidth: 140 Layout.leftMargin: 10 Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter @@ -108,7 +108,7 @@ MyStackViewPage { id: playSpaceMoveYText text: "0.00" keyBoardUID: 102 - Layout.preferredWidth: 100 + Layout.preferredWidth: 140 Layout.leftMargin: 10 Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter @@ -148,7 +148,7 @@ MyStackViewPage { id: playSpaceMoveZText text: "0.00" keyBoardUID: 103 - Layout.preferredWidth: 100 + Layout.preferredWidth: 140 Layout.leftMargin: 10 Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter @@ -248,7 +248,6 @@ MyStackViewPage { keyBoardUID: 104 Layout.preferredWidth: 100 Layout.leftMargin: 10 - Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter function onInputEvent(input) { var val = parseInt(input) diff --git a/bin/win64/res/qml/SteamVRPage.qml b/bin/win64/res/qml/SteamVRPage.qml index a68a4ae..d3aa79f 100644 --- a/bin/win64/res/qml/SteamVRPage.qml +++ b/bin/win64/res/qml/SteamVRPage.qml @@ -59,7 +59,6 @@ MyStackViewPage { keyBoardUID: 401 Layout.preferredWidth: 100 Layout.leftMargin: 10 - Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter function onInputEvent(input) { var val = parseFloat(input) @@ -127,7 +126,6 @@ MyStackViewPage { keyBoardUID: 402 Layout.preferredWidth: 100 Layout.leftMargin: 10 - Layout.rightMargin: 10 horizontalAlignment: Text.AlignHCenter function onInputEvent(input) { var val = parseFloat(input) diff --git a/src/main.cpp b/src/main.cpp index da989e6..5691449 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,19 +29,19 @@ void myQtMessageHandler(QtMsgType type, const QMessageLogContext &context, const QByteArray localMsg = msg.toLocal8Bit(); switch (type) { case QtDebugMsg: - LOG(DEBUG) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; + LOG(DEBUG) << localMsg.constData() << " (" << context.file << ":" << context.line << ")"; break; case QtInfoMsg: - LOG(INFO) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; + LOG(INFO) << localMsg.constData() << " (" << context.file << ":" << context.line << ")"; break; case QtWarningMsg: - LOG(WARNING) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; + LOG(WARNING) << localMsg.constData() << " (" << context.file << ":" << context.line << ")"; break; case QtCriticalMsg: - LOG(ERROR) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; + LOG(ERROR) << localMsg.constData() << " (" << context.file << ":" << context.line << ")"; break; case QtFatalMsg: - LOG(FATAL) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; + LOG(FATAL) << localMsg.constData() << " (" << context.file << ":" << context.line << ")"; break; } } diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp index 38db764..e29e1de 100644 --- a/src/tabcontrollers/MoveCenterTabController.cpp +++ b/src/tabcontrollers/MoveCenterTabController.cpp @@ -95,10 +95,10 @@ void MoveCenterTabController::setAdjustChaperone(bool value, bool notify) { parent->AddOffsetToCollisionBounds(0, -m_offsetX, false); } if (m_offsetY != 0.0f) { - parent->AddOffsetToCollisionBounds(0, -m_offsetY, false); + parent->AddOffsetToCollisionBounds(1, -m_offsetY, false); } if (m_offsetZ != 0.0f) { - parent->AddOffsetToCollisionBounds(0, -m_offsetZ, false); + parent->AddOffsetToCollisionBounds(2, -m_offsetZ, false); } if (m_rotation != 0) { parent->RotateCollisionBounds(-m_rotation, false); @@ -108,10 +108,10 @@ void MoveCenterTabController::setAdjustChaperone(bool value, bool notify) { parent->AddOffsetToCollisionBounds(0, m_offsetX, false); } if (m_offsetY != 0.0f) { - parent->AddOffsetToCollisionBounds(0, m_offsetY, false); + parent->AddOffsetToCollisionBounds(1, m_offsetY, false); } if (m_offsetZ != 0.0f) { - parent->AddOffsetToCollisionBounds(0, m_offsetZ, false); + parent->AddOffsetToCollisionBounds(2, m_offsetZ, false); } if (m_rotation != 0) { parent->RotateCollisionBounds(m_rotation, false);