添加部分截图构造功能

andrewbytecoder · andrewbytecoder · commit e2b7e4e6c215 · 2023-10-13T14:55:58.000+08:00
diff --git a/core/screen_catcher.cpp b/core/screen_catcher.cpp
@@ -0,0 +1,39 @@
+//
+// Created by wangyz38535 on 2023/10/13.
+//
+
+#include "screen_catcher.h"
+#include <QApplication>
+#include <QDesktopWidget>
+
+#include "utils/spdlog_wrapper.h"
+
+QList<QList<ScreenInfo>> ScreenCatcher::CatchScreen() {
+    QList<ScreenInfo> result;
+    QList<QScreen*> screenList = QApplication::screens();
+    for (auto & screen : screenList) {
+        auto pixelRatio = screen->devicePixelRatio();
+        QRect screenRect = screen->geometry();
+        // 抓取一张屏幕图片
+        QPixmap screenPixmap = screen->grabWindow(QApplication::desktop()->winId(), screenRect.x(), screenRect.y(),
+                                                  static_cast<int>(screenRect.width()/pixelRatio),
+                                                  static_cast<int>(screenRect.height()/pixelRatio));
+        SPD_INFO("screenPix radios{0}, height{1}, width{2}", pixelRatio, screenPixmap.size().height(), screenPixmap.size().rwidth());
+
+        ScreenInfo screenInfo;
+        screenInfo.object = screen;
+        screenInfo.boundary = screenRect;
+        screenInfo.pixmap = screenPixmap;
+        result.append(screenInfo);
+    }
+
+    QList<QList<ScreenInfo>> results;
+
+    for (auto& screenInfo : result) {
+        QList<ScreenInfo> one;
+        one.append(screenInfo);
+        results.append(one);
+    }
+
+    return results;
+}
diff --git a/core/screen_catcher.h b/core/screen_catcher.h
@@ -0,0 +1,19 @@
+//
+// Created by wangyz38535 on 2023/10/13.
+//
+
+#ifndef FIRESHOT_SCREEN_CATCHER_H
+#define FIRESHOT_SCREEN_CATCHER_H
+#include <QList>
+#include "screen_list.h"
+
+/*
+ * @brief 用来捕获所有的屏幕
+ * */
+class ScreenCatcher {
+public:
+    static QList<QList<ScreenInfo>> CatchScreen();
+};
+
+
+#endif //FIRESHOT_SCREEN_CATCHER_H
diff --git a/core/screen_list.h b/core/screen_list.h
@@ -29,7 +29,7 @@ struct ScreenInfo{
 class ScreenList
 {
 public:
-    ScreenList(QList<ScreenInfo> list);
+    explicit ScreenList(QList<ScreenInfo> list);
 
     QRect allBoundary(bool isGlobal=false) const;
     QPixmap allPixMap() const;
diff --git a/core/screen_shot.cpp b/core/screen_shot.cpp
@@ -1,11 +1,16 @@
 //
 // Created by wangyz38535 on 2023/10/12.
 //
+#include <QVBoxLayout>
 #include "utils/spdlog_wrapper.h"
 #include "screen_shot.h"
 #include "fireshot.h"
+#include "screen_catcher.h"
 
-ScreenShot::ScreenShot(FireShot *lpFireShot) : QObject(lpFireShot), m_lpFireShot(lpFireShot)
+ScreenShot::ScreenShot(FireShot *lpFireShot) : QObject(lpFireShot),
+    m_lpFireShot(lpFireShot),
+    m_lpWidgets(new QList<ScreenWidgets*>),
+    m_lpUnusedWidgets(new QList<ScreenWidgets*>)
 {
 
 }
@@ -24,13 +29,50 @@ void ScreenShot::rasie() {
 
 void ScreenShot::CaptureScreen(QWidget *parent) {
     SPD_FUNCTION();
+    // 每次开始截图之前将原先截图数据都放置到非可用列表中，后期考虑多线程情况需要进行加锁
+    std::copy(m_lpWidgets->begin(), m_lpWidgets->end(), std::back_inserter(*m_lpUnusedWidgets));
+    m_lpWidgets->clear();
+
+    // 获取所有截图信息
+    auto screenCaptureList = ScreenCatcher::CatchScreen();
+
+    // 构造截图的界面
+    for (int32_t index = 0; index < screenCaptureList.size(); ++index) {
+        auto screenList = screenCaptureList[index];
+
+        std::shared_ptr<ScreenList> alone(new ScreenList(list));
+        ScreenWidgets* w = nullptr;
+        if (m_lpUnusedWidgets->empty()) {
+            SPD_DEBUG("New screen list & widget");
+            w = new ScreenWidgets(parent);
+            connect(w->workspace(), &Workspace::quitShot, this, &ScreenShot::finishShot, Qt::DirectConnection);
+            connect(w->workspace(), &Workspace::finishConfirmArea, this, &ScreenShot::finishConfirmArea, Qt::DirectConnection);
+        }
+
+
+    }
+
+
+
 
 }
 
 void ScreenShot::finishShot(int code) {
+    SPD_FUNCTION();
+    for (auto &w : *m_lpWidgets) {
+        w->hide();
+    }
+
+    emit ShotDone(this);
+
+
 
 }
 
 void ScreenShot::finishConfirmArea() {
+    SPD_FUNCTION();
+    for (auto &w : *m_lpWidgets) {
+        w->finishConfirmArea();
+    }
 
 }
diff --git a/core/screen_shot.h b/core/screen_shot.h
@@ -9,6 +9,8 @@
 #include <QWidget>
 #include <QList>
 #include <memory>
+#include "screen_list.h"
+#include "screen_widget.h"
 //#include "widget.h"
 
 class FireShot;
@@ -26,8 +28,8 @@ class ScreenShot : public QObject {
     void rasie();
 
 private:
-    QList<Widget*>* m_widgets;
-    QList<Widget*>* m_unused_widgets;
+    QList<ScreenWidgets*>* m_lpWidgets;
+    QList<ScreenWidgets*>* m_lpUnusedWidgets;
 
 signals:
     void ShotDone(ScreenShot*);
diff --git a/core/screen_widget.cpp b/core/screen_widget.cpp
@@ -5,25 +5,19 @@
 
 #include "screen_widget.h"
 #include "utils/spdlog_wrapper.h"
-#include "uti"
 
 #define UNVISIABLE_X -819200
 #define UNVISIABLE_Y -819200
 
-ScreenWidgets::ScreenWidgets(QWidget *parent) : QWidget(parent) {
-
-}
-
 ScreenWidgets::~ScreenWidgets() {
 
 }
 
 
-ScreenWidgets::ScreenWidgets(QWidget* parent)
-        : QWidget(parent)
-        , m_screenlist(nullptr)
-        , m_status("unknown")
-{
+ScreenWidgets::ScreenWidgets(QWidget* parent) : QWidget(parent),
+        m_screenlist(nullptr),
+        m_status("unknown"),
+        m_workspace(this) {
 #ifndef USE_SPDLOG_
     setWindowFlags(Qt::Tool);
     setAttribute(Qt::WA_TranslucentBackground);
@@ -63,10 +57,10 @@ void ScreenWidgets::cleanup()
 
 void ScreenWidgets::finishConfirmArea()
 {
-    //if (m_workspace->areaConfirmed() == true)
-    //    m_status = "active";
-    //else
-    //    m_status = "giveup";
+    if (m_workspace.areaConfirmed() == true)
+        m_status = "active";
+    else
+        m_status = "giveup";
 }
 
 void ScreenWidgets::showEvent(QShowEvent* event)
@@ -152,5 +146,9 @@ void ScreenWidgets::leaveEvent(QEvent* event)
     QWidget::leaveEvent(event);
 }
 
+Workspace *ScreenWidgets::workspace() {
+    return &m_workspace;
+}
+
 
 
diff --git a/core/screen_widget.h b/core/screen_widget.h
@@ -11,6 +11,7 @@
 #include <QPainter>
 
 #include "screen_list.h"
+#include "screen_workspace.h"
 
 class ScreenWidgets : public QWidget {
     Q_OBJECT
@@ -22,6 +23,7 @@ class ScreenWidgets : public QWidget {
     void start(std::shared_ptr<ScreenList> list, int index);
     void cleanup();
 
+    Workspace* workspace();
     void finishConfirmArea();
 
 protected:
@@ -40,7 +42,7 @@ class ScreenWidgets : public QWidget {
 private:
     QString m_status;  //unknown, active, giveup
     std::shared_ptr<ScreenList> m_screenlist;
-
+    Workspace m_workspace;
 };
 
 
diff --git a/core/screen_workspace.cpp b/core/screen_workspace.cpp
@@ -3,4 +3,12 @@
 //
 
 #include "screen_workspace.h"
-#include "utils/spdlog_wrapper.h"
+#include "utils/spdlog_wrapper.h"
+
+Workspace::Workspace(QWidget *lpWidget) {
+
+}
+
+Workspace::~Workspace() {
+
+}
diff --git a/core/screen_workspace.h b/core/screen_workspace.h
@@ -11,8 +11,19 @@
 #include <QFont>
 #include <QPushButton>
 
+class Workspace : public QObject {
+Q_OBJECT
 
+public:
+    explicit Workspace(QWidget *lpWidget);
 
+    ~Workspace() override;
 
+signals:
+    void quitShot(int code);
+    void finishConfirmArea();
+
+
+}
 
 #endif //FIRESHOT_SCREEN_WORKSPACE_H

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ struct ScreenInfo{`
`29`	`29`	`class ScreenList`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`		`- ScreenList(QList<ScreenInfo> list);`
	`32`	`+ explicit ScreenList(QList<ScreenInfo> list);`
`33`	`33`
`34`	`34`	`QRect allBoundary(bool isGlobal=false) const;`
`35`	`35`	`QPixmap allPixMap() const;`