diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index dd69711..916d816 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -22,7 +22,7 @@ this->setWindowFlags(Qt::FramelessWindowHint); // 窗口大小为占满一屏 - QRect screenRect = QApplication::desktop()->screenGeometry(); + QRect screenRect = QApplication::desktop()->availableGeometry(); resize(screenRect.width(), screenRect.height()); // 将窗口移动到左上角 diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index dd69711..916d816 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -22,7 +22,7 @@ this->setWindowFlags(Qt::FramelessWindowHint); // 窗口大小为占满一屏 - QRect screenRect = QApplication::desktop()->screenGeometry(); + QRect screenRect = QApplication::desktop()->availableGeometry(); resize(screenRect.width(), screenRect.height()); // 将窗口移动到左上角 diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index 68ed68a..79b70ce 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -40,13 +40,20 @@ dataObj->channelData.append(0.00); dataObj->channelDataStr.append("0.00"); dataObj->channelRawDataStr.append(QString::number(CALCULATE_OFFSET)); - } else + } else if (channelRawData > CALCULATE_OFFSET) { double phase = (channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR; dataObj->channelActive.append("1"); dataObj->channelData.append(phase); dataObj->channelDataStr.append(QString::number(phase, 'f', 15)); dataObj->channelRawDataStr.append(QString::number((channelRawData - CALCULATE_OFFSET))); + } else + { + double phase = (CALCULATE_OFFSET - channelRawData) * CALCULATE_FACTOR; + dataObj->channelActive.append("1"); + dataObj->channelData.append(phase); + dataObj->channelDataStr.append(QString::number(phase, 'f', 15)); + dataObj->channelRawDataStr.append(QString::number((channelRawData - CALCULATE_OFFSET))); } }