Skip to content

fix(scrollshot): improve Wayland scroll capture reliability #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tianming-1996 wants to merge 1 commit into
base: release/eagle
Choose a base branch
from
Open

fix(scrollshot): improve Wayland scroll capture reliability #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 40 additions & 18 deletions src/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,15 @@ void MainWindow::initScrollShot()
}
//定时2s后滚动截图的提示消失
m_tipShowtimer = new QTimer(this);
m_waylandManualScrollTimer = new QTimer(this);
m_waylandManualScrollTimer->setSingleShot(true);
connect(m_waylandManualScrollTimer, &QTimer::timeout, this, [this] {
if (!m_scrollShot || status::scrollshot != m_functionType || m_isErrorWithScrollShot) {
return;
}
scrollShotGrabPixmap(m_waylandManualScrollPreviewPostion, m_waylandManualScrollDirection,
m_waylandManualScrollMouseTime);
});
connect(m_tipShowtimer, &QTimer::timeout, this, [ = ]() {
m_tipShowtimer->stop();
m_scrollShotTip->hide();
Expand Down Expand Up @@ -1502,6 +1511,18 @@ void MainWindow::handleManualScrollShot(int mouseTime, int direction)
m_scrollShotTip->hide();
m_isAdjustArea = false;
update();
if (Utils::isWaylandMode) {
m_waylandManualScrollPreviewPostion = m_previewPostion;
m_waylandManualScrollDirection = direction;
m_waylandManualScrollMouseTime = mouseTime;
if (m_waylandManualScrollTimer) {
m_waylandManualScrollTimer->start(320);
} else {
scrollShotGrabPixmap(m_previewPostion, direction, mouseTime);
}
return;
}

static int num = 1;
++num;
if (num % 3 == 0) {
Expand Down Expand Up @@ -1536,7 +1557,7 @@ void MainWindow::showAdjustArea()
}
#ifdef OCR_SCROLL_FLAGE_ON
//滚动截图模式，抓取当前捕捉区域的图片，传递给滚动截图处理类进行图片的拼接
void MainWindow::scrollShotGrabPixmap(PreviewWidget::PostionStatus previewPostion, int direction, int mouseTime)
void MainWindow::scrollShotGrabPixmap(PreviewWidget::PostionStatus previewPostion, int direction, qint64 mouseTime)
{

//不同的平台延时时间不同
Expand Down Expand Up @@ -2186,23 +2207,29 @@ void MainWindow::wheelEvent(QWheelEvent *event)
int y = this->cursor().pos().y();

//将当前捕捉区域画为一个矩形
QRect recordRect {
static_cast<int>(recordX * m_pixelRatio),
static_cast<int>(recordY * m_pixelRatio),
static_cast<int>(recordWidth * m_pixelRatio),
static_cast<int>(recordHeight * m_pixelRatio)
};
QRect recordRect(recordX, recordY, recordWidth, recordHeight);
//当前鼠标的点
QPoint mouseMovePoint(x * m_pixelRatio, y * m_pixelRatio);
//判断当鼠标位置是否在捕捉区域内部,不在捕捉区域内则暂停自动滚动
if (!recordRect.contains(mouseMovePoint))
return;
if (m_scrollShot) {
int time = int (QDateTime::currentDateTime().toTime_t());
float len = (event->delta() > 15.0) ? -15.0 : 15.0; // 获取滚轮方向
int direction = (fabs(double(len) - 15.0) <= EPSILON) ? 5 : 4; // 获取滚轮方向
scrollShotMouseScrollEvent(time, direction, x, y);
if (m_isErrorWithScrollShot)
return;

qint64 time = QDateTime::currentMSecsSinceEpoch();
float len = (event->delta() > 0) ? -5.0 : 5.0; // 获取滚轮方向
int direction = (fabs(double(len) - 5.0) <= EPSILON) ? 5 : 4; // 获取滚轮方向
m_scrollShotType = ScrollShotType::ManualScroll;
if (m_scrollShotStatus == 0) {
scrollShotMouseScrollEvent(time, direction, x, y);
}
m_scrollShot->sigalWheelScrolling(len);
QTimer::singleShot(200, this, [ = ] {
if (m_scrollShot && status::scrollshot == m_functionType && !m_isErrorWithScrollShot) {
scrollShotMouseScrollEvent(QDateTime::currentMSecsSinceEpoch(), direction, x, y);
}
});
qDebug() << __FUNCTION__ << __LINE__;
}
#endif
Expand Down Expand Up @@ -5295,15 +5322,10 @@ void MainWindow::scrollShotMouseMoveEvent(int x, int y)
* @param x 当前的x坐标
* @param y 当前的y坐标
*/
void MainWindow::scrollShotMouseScrollEvent(int mouseTime, int direction, int x, int y)
void MainWindow::scrollShotMouseScrollEvent(qint64 mouseTime, int direction, int x, int y)
{
#ifdef OCR_SCROLL_FLAGE_ON
QRect recordRect {
static_cast<int>(recordX * m_pixelRatio),
static_cast<int>(recordY * m_pixelRatio),
static_cast<int>(recordWidth * m_pixelRatio),
static_cast<int>(recordHeight * m_pixelRatio)
};
QRect recordRect(recordX, recordY, recordWidth, recordHeight);
//当前鼠标滚动的点
QPoint mouseScrollPoint(x * m_pixelRatio, y * m_pixelRatio);
//判断鼠标滚动的位置是否是在捕捉区域内部，不在捕捉区域内部不进行处理
Expand Down
8 changes: 6 additions & 2 deletions src/main_window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ public slots:
* @param x 当前的x坐标
* @param y 当前的y坐标
*/
void scrollShotMouseScrollEvent(int mouseTime, int direction, int x, int y);
void scrollShotMouseScrollEvent(qint64 mouseTime, int direction, int x, int y);

/**
* @brief 监听是否正在进行自动滚动
Expand Down Expand Up @@ -708,7 +708,7 @@ public slots:
* @param direction 滚动的方向
*/
#ifdef OCR_SCROLL_FLAGE_ON
void scrollShotGrabPixmap(PreviewWidget::PostionStatus previewPostion, int direction, int mosueTime = 0);
void scrollShotGrabPixmap(PreviewWidget::PostionStatus previewPostion, int direction, qint64 mouseTime = 0);
#endif
/**
* @brief 判断工具栏是否在在捕捉区域内部
Expand Down Expand Up @@ -921,6 +921,10 @@ public slots:
* @brief 滚动截图提示显示时间的定时器
*/
QTimer *m_tipShowtimer = nullptr;
QTimer *m_waylandManualScrollTimer = nullptr;
PreviewWidget::PostionStatus m_waylandManualScrollPreviewPostion = PreviewWidget::PostionStatus::RIGHT;
int m_waylandManualScrollDirection = 0;
qint64 m_waylandManualScrollMouseTime = 0;

ButtonFeedback *buttonFeedback = nullptr;
/**
Expand Down
21 changes: 9 additions & 12 deletions src/utils/pixmergethread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

PixMergeThread::PixMergeThread(QObject *parent) : QThread(parent)
{
m_lastTime = int(QDateTime::currentDateTime().toTime_t());
m_lastTime = QDateTime::currentMSecsSinceEpoch();
}

PixMergeThread::~PixMergeThread()
Expand Down Expand Up @@ -120,21 +120,21 @@
}
}
//设置是否为手动模式
void PixMergeThread::setScrollModel(bool isManualScrollMode)

Check warning on line 123 in src/utils/pixmergethread.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setScrollModel' is never used.
{
m_isManualScrollModel = isManualScrollMode;
//m_lastTime = QDateTime::currentDateTime().toTime_t();
//m_lastTime = QDateTime::currentMSecsSinceEpoch();
}

void PixMergeThread::clearCurImg()

Check warning on line 129 in src/utils/pixmergethread.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'clearCurImg' is never used.
{
m_curImg.release();
}

//计算时间差
void PixMergeThread::calculateTimeDiff(int time)
void PixMergeThread::calculateTimeDiff(qint64 time)

Check warning on line 135 in src/utils/pixmergethread.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'calculateTimeDiff' is never used.
{
m_curTimeDiff = (time - m_lastTime) * 100;
m_curTimeDiff = time - m_lastTime;
qDebug() << "time:" << time << "m_lastTime" << m_lastTime << "m_curTimeDiff" << m_curTimeDiff;
m_lastTime = time;
}
Expand Down Expand Up @@ -359,6 +359,10 @@
/*查找最大值及位置*/
cv::Point minLoc, maxLoc;
minMaxLoc(res, &minVal, &maxVal, &minLoc, &maxLoc);
if (!m_isManualScrollModel && m_MeragerCount == 1 && maxVal >= thresholdv && maxLoc.y == 0) {
qDebug() << "2 自动滚动首帧未产生位移，等待下一次滚动";
return false;
}
/*图像拼接*/
cv::Mat temp1, result;
if (maxVal >= thresholdv && maxLoc.y > 0) { //只有度量值大于阈值才认为是匹配
Expand All @@ -372,14 +376,7 @@
QRect rect = getScrollChangeRectArea(curImg, image);
if (m_isManualScrollModel == false) { //自动滚动时异常处理
if (m_MeragerCount == 1) {
if (rect.width() < 0 || rect.height() < 0) {
qDebug() << "1 拼接失败了";
emit merageError(Failed);
} else {
m_headHeight = -1;
qDebug() << "1 无效区域，点击调整捕捉区域";
emit invalidAreaError(InvalidArea, rect); //无效区域，点击调整捕捉区域
}
qDebug() << "1 自动滚动首帧位移过小，等待下一次滚动";
} else {
qDebug() << "======1==拼接到重复图片，拼接到低了=====";
emit merageError(ReachBottom);
Expand Down
6 changes: 3 additions & 3 deletions src/utils/pixmergethread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class PixMergeThread : public QThread
void setScrollModel(bool isManualScrollMode); //设置是否为手动模式

void clearCurImg();
void calculateTimeDiff(int time); //计算时间差
void calculateTimeDiff(qint64 time); //计算时间差
bool isOneWay(); //是否单向
void setIsLastImg(bool isLastImg); //设置最后一张图片标记
protected:
Expand Down Expand Up @@ -84,8 +84,8 @@ class PixMergeThread : public QThread
//bool m_successfullySplicedDwon = false;//向下拼接成功
bool m_isManualScrollModel = false;//是否手动模式
int m_bottomHeight = -1;// 长图底部固定区域高度
int m_curTimeDiff = 0; //当前时间差
int m_lastTime = 0; //上一次的时间
qint64 m_curTimeDiff = 0; //当前时间差
qint64 m_lastTime = 0; //上一次的时间
int m_upCount = 0;
int m_downCount = 0;
bool m_isLastPixmap = false; // 是否是最后一张
Expand Down
4 changes: 2 additions & 2 deletions src/utils/waylandscrollmonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "waylandscrollmonitor.h"

#define SCROLL_DOWN 15.0
#define SCROLL_DOWN 5.0

WaylandScrollMonitor::WaylandScrollMonitor(QObject *parent) : QObject(parent)
, m_connection(nullptr)
Expand Down Expand Up @@ -114,7 +114,7 @@ void WaylandScrollMonitor::releaseWaylandScrollThread()
void WaylandScrollMonitor::doWaylandAutoScroll()
{
if (m_fakeinput != nullptr) {
// Qt::Vertical 垂直滚动，15.0 代表向下滚动
// Qt::Vertical 垂直滚动，正值代表向下滚动
m_fakeinput->requestPointerAxisForCapture(Qt::Vertical, SCROLL_DOWN);
}
}
Loading