perf(WidgetDisplay): 优化图像显示速度

half-nothing · half-nothing · commit 20f51789ddd0 · 2024-04-03T01:36:13.000+08:00
* 将图片背景和前景分离,减少每次绘制工作量,增加图像显示速度
* 修复了单色位图中的调色板问题
* 修复BMP工厂类返回异常和异常无提示的问题
* 为主窗口添加了导出结果到文件的功能
------
diff --git a/docs/UML.mdj b/docs/UML.mdj
diff --git a/src/BmpFile/src/BmpImage.cpp b/src/BmpFile/src/BmpImage.cpp
@@ -38,6 +38,8 @@ BmpType BmpImage::getBmpFileType() const {
         case 1: return ONE_BIT;
         case 8: return EIGHT_BIT;
         case 24: return TWENTY_FOUR_BIT;
-        default: return UNKNOWN_BIT;
+        default:
+            LOG(ERROR) << QString::asprintf("不支持的色深度：%d位", bmpInfoHeader.bitsPerPixel).toStdString();
+            return UNKNOWN_BIT;
     }
 }
diff --git a/src/BmpFile/src/BmpImage1Bit.cpp b/src/BmpFile/src/BmpImage1Bit.cpp
@@ -49,9 +49,14 @@ void BmpImage1Bit::readImage(const std::string &filename) {
         LOG(ERROR) << "Not 1Bit Image." << std::endl;
         return;
     }
-    bmpPixelInfo.palettes = new BmpColorPalette[2]{{0x00, 0x00, 0x00, 0x00},
-                                              {0xff, 0xff, 0xff, 0x00}};
+
+    inputFile.seekg(sizeof(BmpFileHeader) + bmpInfoHeader.headerSize, std::ios::beg);
+    bmpPixelInfo.palettes = new BmpColorPalette[2];
+    memset(bmpPixelInfo.palettes, 0, sizeof(BmpColorPalette) * bmpInfoHeader.colors);
     bmpPixelInfo.paletteSize = 2;
+    for (int i = 0; i < 2; i++) {
+        inputFile.read(reinterpret_cast<char *>(bmpPixelInfo.palettes + i), sizeof(BmpColorPalette));
+    }
 
     inputFile.seekg(bmpFileHeader.offsetSize, std::ios::beg);
     bmpPixelInfo.bytePerLine = ((bmpPixelInfo.width + 7) / 8 + 3) / 4 * 4;
@@ -66,7 +71,7 @@ void BmpImage1Bit::readImage(const std::string &filename) {
                     flag = true;
                     continue;
                 }
-                bmpPixelInfo.pixels[i * bmpPixelInfo.width + k] = temp & 1 ? 0xFF : 0x00;
+                bmpPixelInfo.pixels[i * bmpPixelInfo.width + k] = temp & 1 ? bmpPixelInfo.palettes[1].blue : bmpPixelInfo.palettes[0].blue;
             }
             if (flag) break;
         }
diff --git a/src/BmpFile/src/BmpImage8Bit.cpp b/src/BmpFile/src/BmpImage8Bit.cpp
@@ -72,6 +72,6 @@ void BmpImage8Bit::readImage(const std::string &filename) {
 
 void BmpImage8Bit::toQPixMap(QPixmap &pixmap) {
     const QImage qImage(bmpPixelInfo.pixels, bmpPixelInfo.width, bmpPixelInfo.height, bmpPixelInfo.width,
-                        QImage::Format_Indexed8);
+                        QImage::Format_Grayscale8);
     pixmap = QPixmap::fromImage(qImage);
 }
diff --git a/src/Factory/src/BmpFactory.cpp b/src/Factory/src/BmpFactory.cpp
@@ -13,6 +13,7 @@
 #include <BmpImage1Bit.h>
 #include <BmpImage24Bit.h>
 #include <BmpImage8Bit.h>
+#include <QMessageBox>
 #include <glog/logging.h>
 
 BmpImage *BmpFactory::createBmpImage(const std::string &filepath) {
@@ -26,6 +27,7 @@ BmpImage *BmpFactory::createBmpImage(const std::string &filepath) {
         case TWENTY_FOUR_BIT:
             return new BmpImage24Bit();
         case UNKNOWN_BIT:
+            QMessageBox::warning(nullptr, "无法加载图片", "不支持的BMP文件格式");
             LOG(ERROR) << "未知的bmp文件格式" << std::endl;
             return nullptr;
     }
diff --git a/src/Qt/include/ImageDisplay.h b/src/Qt/include/ImageDisplay.h
@@ -51,18 +51,18 @@ namespace QT {
 
         void drawPath();
 
-    private:
-        void paintEvent(QPaintEvent *event) override;
+    protected:
+        void updateShowImage(QPainter &painter) override;
 
-        void checkRangeLimit(QPointF &point) const;
 
-        void mousePressEvent(QMouseEvent *event) override;
+    private:
+        void checkRangeLimit(QPoint &point) const;
 
-        void drawMap(QPainter &painter);
+        void mousePressEvent(QMouseEvent *event) override;
 
         std::vector<Point> points;
-        QPointF start;
-        QPointF end;
+        QPoint start;
+        QPoint end;
         int status = 0;
         Ui::ImageDisplay *ui;
         SearchThread *thread = nullptr;
diff --git a/src/Qt/include/MainWindow.h b/src/Qt/include/MainWindow.h
@@ -25,6 +25,8 @@ namespace QT {
 
         void findPath();
 
+        void saveImage();
+
     signals:
         void searchPathSignal(PathSearchMethod);
 
diff --git a/src/Qt/include/WidgetDisplay.h b/src/Qt/include/WidgetDisplay.h
@@ -46,10 +46,14 @@ class WidgetDisplay : public QWidget {
 
     [[nodiscard]] QPointF getLocate(const QPointF &pos) const;
 
+    [[nodiscard]] QPoint getLocatePoint(const QPointF &pos) const;
+
     void paintGrid(QPainter &painter) const;
 
     void drawPixel(QPainter &painter, const QPointF &point, QColor color) const;
 
+    virtual void updateShowImage(QPainter &painter);
+
     size_t imageWidth = 0;
     size_t imageHeight = 0;
     float widthPerPix = 4;
@@ -58,7 +62,9 @@ class WidgetDisplay : public QWidget {
     bool leftMousePressed = false;
     QPointF preMousePos;
     QPointF nowMouseImagePos;
-    QPixmap currentImage;
+    QPixmap backGroundImage;
+    QPixmap showImage;
+    bool keepStatic = false;
 };
 
 #endif //WIDGETDISPLAY_H
diff --git a/src/Qt/src/GenerateDisplay.cpp b/src/Qt/src/GenerateDisplay.cpp
@@ -22,8 +22,8 @@ namespace QT {
         ui->setupUi(this);
         imageHeight = 50;
         imageWidth = 50;
-        currentImage = QPixmap(imageWidth, imageHeight);
-        currentImage.fill(Config::getInstance()->getConfigField(WALL_COLOR));
+        backGroundImage = QPixmap(imageWidth, imageHeight);
+        backGroundImage.fill(Config::getInstance()->getConfigField(WALL_COLOR));
         adjustZoom();
     }
 
@@ -45,7 +45,7 @@ namespace QT {
         thread = new GenerateThread(imageHeight, imageWidth, method);
         connect(thread, &GenerateThread::threadFinishSignal, [this] {
             result = std::move(thread->getResult());
-            currentImage = result.toQPixmap();
+            backGroundImage = result.toQPixmap();
             update();
         });
         QThreadPool::globalInstance()->start(thread);
diff --git a/src/Qt/src/GenerateMaze.cpp b/src/Qt/src/GenerateMaze.cpp
@@ -40,12 +40,10 @@ namespace QT {
         }
         switch (ui->saveTypeComboBox->currentIndex()) {
             case 0: ui->image->saveImage(filePath, QImage::Format_Mono);
-                break;
-            case 1: ui->image->saveImage(filePath, QImage::Format_Indexed8);
-                break;
+            break;
+            case 1: ui->image->saveImage(filePath, QImage::Format_Grayscale8);
+            break;
             case 2: ui->image->saveImage(filePath, QImage::Format_RGB888);
-                break;
-            default: return;
         }
     }
 
diff --git a/src/Qt/src/ImageDisplay.cpp b/src/Qt/src/ImageDisplay.cpp
@@ -32,7 +32,7 @@ namespace QT {
     }
 
     void ImageDisplay::clearPoints() {
-        start = end = QPointF(0, 0);
+        start = end = QPoint(0, 0);
         status = 0;
         points.clear();
         repaint();
@@ -48,17 +48,37 @@ namespace QT {
         this->useManhattan = useManhattan;
     }
 
-    void ImageDisplay::paintEvent(QPaintEvent *event) {
-        WidgetDisplay::paintEvent(event);
-        QPainter painter(this);
-        painter.setPen(QPen(Qt::black, 1));
-        drawMap(painter);
-        drawPixel(painter, start, QColor(Config::getInstance()->getConfigField(START_POINT_COLOR)));
-        drawPixel(painter, end, QColor(Config::getInstance()->getConfigField(END_POINT_COLOR)));
-        painter.end();
+    void ImageDisplay::updateShowImage(QPainter &painter) {
+        if (imageWidth == 0 || imageHeight == 0) {
+            return;
+        }
+        drawPixel(painter, start, Config::getInstance()->getConfigField(START_POINT_COLOR));
+        drawPixel(painter, end, Config::getInstance()->getConfigField(END_POINT_COLOR));
+        if (points.empty() || step < 0 || step >= points.size()) {
+            return;
+        }
+        if (!this->searchSequential) {
+            QPainter painter;
+            painter.begin(&showImage);
+            for (int i = step; i < points.size(); i++) {
+                painter.setPen(QPen(Config::getInstance()->getConfigField(points[i].color)));
+                painter.drawPoint(points[i].point);
+            }
+            painter.end();
+            step = points.size();
+            return;
+        }
+        if (points[step].point == start || points[step].point == end) {
+            return;
+        }
+        QPainter imagePainter;
+        imagePainter.begin(&showImage);
+        imagePainter.setPen(QPen(Config::getInstance()->getConfigField(points[step].color)));
+        imagePainter.drawPoint(points[step].point);
+        imagePainter.end();
     }
 
-    void ImageDisplay::checkRangeLimit(QPointF &point) const {
+    void ImageDisplay::checkRangeLimit(QPoint &point) const {
         if (point.x() < 0) {
             point.setX(0);
         }
@@ -78,23 +98,22 @@ namespace QT {
         if (event->button() == Qt::RightButton) {
             switch (status) {
                 case 0: {
-                    start = getLocate(event->position());
+                    start = getLocatePoint(event->position());
                     checkRangeLimit(start);
-                    LOG(INFO) << "开始坐标: (" << static_cast<int>(start.x()) << ", " << static_cast<int>(start.y()) <<
+                    LOG(INFO) << "开始坐标: (" << sc_int(start.x()) << ", " << sc_int(start.y()) <<
                             ")"
                             << std::endl;
                     emit startPointUpdate(
-                            QString::asprintf("(%d, %d)", static_cast<int>(start.x()), static_cast<int>(start.y())));
+                            QString::asprintf("(%d, %d)", sc_int(start.x()), sc_int(start.y())));
                     status++;
                     break;
                 }
                 case 1: {
-                    end = getLocate(event->position());
+                    end = getLocatePoint(event->position());
                     checkRangeLimit(end);
-                    LOG(INFO) << "结束坐标: (" << static_cast<int>(end.x()) << ", " << static_cast<int>(end.y()) << ")"
+                    LOG(INFO) << "结束坐标: (" << sc_int(end.x()) << ", " << sc_int(end.y()) << ")"
                             << std::endl;
-                    emit endPointUpdate(QString::asprintf("(%d, %d)", static_cast<int>(end.x()),
-                                                          static_cast<int>(end.y())));
+                    emit endPointUpdate(QString::asprintf("(%d, %d)", sc_int(end.x()), sc_int(end.y())));
                     status = 0;
                     break;
                 }
@@ -103,12 +122,6 @@ namespace QT {
         }
     }
 
-    void ImageDisplay::drawMap(QPainter &painter) {
-        for (int i = 0; i < step && i < points.size(); i++) {
-            drawPixel(painter, points[i].point, Config::getInstance()->getConfigField(points[i].color));
-        }
-    }
-
     void ImageDisplay::dealDestroy() const {
         if (thread != nullptr) thread->stopThread();
     }
@@ -118,27 +131,31 @@ namespace QT {
     }
 
     void ImageDisplay::clearPath() {
-        step = 0;
+        showImage.fill(Qt::transparent);
         repaint();
     }
 
     void ImageDisplay::repaintPath() {
+        if (!this->searchSequential) {
+            return;
+        }
+        showImage.fill(Qt::transparent);
         step = 0;
         timer->start();
     }
 
     void ImageDisplay::searchPath(const PathSearchMethod searchMethod) {
-        thread = new SearchThread(searchMethod, currentImage, {sc_int(start.x()), sc_int(start.y())},
+        thread = new SearchThread(searchMethod, backGroundImage, {sc_int(start.x()), sc_int(start.y())},
                                   {sc_int(end.x()), sc_int(end.y())}, useManhattan);
         connect(thread, &SearchThread::threadFinishSignal, [this] {
             points.clear();
             points = std::move(thread->getResult());
+            showImage.fill(Qt::transparent);
+            step = 0;
             if (this->searchSequential) {
-                step = 0;
                 emit drawPath();
                 return;
             }
-            step = points.size();
             repaint();
         });
         QThreadPool::globalInstance()->start(thread);
diff --git a/src/Qt/src/MainWindow.cpp b/src/Qt/src/MainWindow.cpp
@@ -123,6 +123,9 @@ namespace QT {
             return;
         }
         BmpImage *image = BmpFactory::createBmpImage(filePath.toStdString());
+        if (image == nullptr) {
+            return;
+        }
         image->readImage(filePath.toStdString());
         image->toQPixMap(pixmap);
         ui->image->displayImage(pixmap);
@@ -152,6 +155,14 @@ namespace QT {
         }
     }
 
+    void MainWindow::saveImage() {
+        const QString filePath = QFileDialog::getSaveFileName(this, tr("要保存文件的位置"), "./", tr("位图文件 (*.bmp)"));
+        if (filePath.isEmpty()) {
+            return;
+        }
+        ui->image->saveImage(filePath, QImage::Format_BGR888);
+    }
+
     MainWindow::~MainWindow() {
         delete ui;
     }
diff --git a/src/Qt/src/WidgetDisplay.cpp b/src/Qt/src/WidgetDisplay.cpp
@@ -9,6 +9,9 @@
  **********************************************/
 
 #include "WidgetDisplay.h"
+
+#include <Config.h>
+
 #include "Definition.h"
 
 #include <QPainter>
@@ -40,7 +43,11 @@ void WidgetDisplay::displayImage(const QPixmap &image) {
     if (image.height() != this->imageHeight) {
         this->imageHeight = image.height();
     }
-    currentImage = image;
+    if (showImage.width() != this->imageWidth || showImage.height() != this->imageHeight) {
+        showImage = QPixmap(this->imageWidth, this->imageWidth);
+    }
+    showImage.fill(Qt::transparent);
+    backGroundImage = image;
     adjustZoom();
 }
 
@@ -61,7 +68,11 @@ void WidgetDisplay::paintEvent(QPaintEvent *event) {
     QPainter painter(this);
     painter.drawPixmap(startPoint.x(), startPoint.y(),
                        imageWidth * widthPerPix, imageHeight * widthPerPix,
-                       currentImage);
+                       backGroundImage);
+    updateShowImage(painter);
+    painter.drawPixmap(startPoint.x(), startPoint.y(),
+                       imageWidth * widthPerPix, imageHeight * widthPerPix,
+                       showImage);
     painter.setPen(QPen(Qt::black, 1));
     drawPixel(painter, nowMouseImagePos, QColor(255, 174, 201));
     if (zoom > 1) {
@@ -73,11 +84,14 @@ void WidgetDisplay::paintEvent(QPaintEvent *event) {
 
 void WidgetDisplay::drawPixel(QPainter &painter, const QPointF &point, const QColor color) const {
     painter.setBrush(color);
-    const QRectF PixelArea(startPoint.x() + sc_int(point.x()) * widthPerPix, startPoint.y() + sc_int(point.y()) * widthPerPix, widthPerPix,
+    const QRectF PixelArea(startPoint.x() + sc_int(point.x()) * widthPerPix,
+                           startPoint.y() + sc_int(point.y()) * widthPerPix, widthPerPix,
                            widthPerPix);
     painter.drawRect(PixelArea);
 }
 
+void WidgetDisplay::updateShowImage(QPainter &painter) {}
+
 void WidgetDisplay::wheelEvent(QWheelEvent *event) {
     event->angleDelta();
     if (event->angleDelta().y() > 0) {
@@ -133,14 +147,24 @@ QPointF WidgetDisplay::getLocate(const QPointF &pos) const {
     return tmp / widthPerPix;
 }
 
+QPoint WidgetDisplay::getLocatePoint(const QPointF &pos) const {
+    QPointF tmp = pos - startPoint;
+    tmp /= widthPerPix;
+    return QPoint{sc_int(tmp.x()), sc_int(tmp.y())};
+}
+
 void WidgetDisplay::saveImage(const QString &filePath, const QImage::Format format) const {
-    QImage image = currentImage.toImage();
+    QImage image = backGroundImage.toImage();
+    QPainter painter;
+    painter.begin(&image);
+    painter.drawPixmap(0, 0, showImage);
+    painter.end();
     if (image.format() != format) {
         image = image.convertToFormat(format);
     }
     image.save(filePath, "BMP");
 }
 
 const QPixmap &WidgetDisplay::getCurrentImage() const {
-    return currentImage;
+    return backGroundImage;
 }
diff --git a/src/Qt/ui/MainWindow.ui b/src/Qt/ui/MainWindow.ui
diff --git a/src/include/BmpDefinition.h b/src/include/BmpDefinition.h

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ BmpType BmpImage::getBmpFileType() const {`
`38`	`38`	`case 1: return ONE_BIT;`
`39`	`39`	`case 8: return EIGHT_BIT;`
`40`	`40`	`case 24: return TWENTY_FOUR_BIT;`
`41`		`- default: return UNKNOWN_BIT;`
	`41`	`+ default:`
	`42`	`+ LOG(ERROR) << QString::asprintf("不支持的色深度：%d位", bmpInfoHeader.bitsPerPixel).toStdString();`
	`43`	`+ return UNKNOWN_BIT;`
`42`	`44`	`}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,14 @@ void BmpImage1Bit::readImage(const std::string &filename) {`
`49`	`49`	`LOG(ERROR) << "Not 1Bit Image." << std::endl;`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`		`- bmpPixelInfo.palettes = new BmpColorPalette[2]{{0x00, 0x00, 0x00, 0x00},`
`53`		`- {0xff, 0xff, 0xff, 0x00}};`
	`52`	`+`
	`53`	`+ inputFile.seekg(sizeof(BmpFileHeader) + bmpInfoHeader.headerSize, std::ios::beg);`
	`54`	`+ bmpPixelInfo.palettes = new BmpColorPalette[2];`
	`55`	`+ memset(bmpPixelInfo.palettes, 0, sizeof(BmpColorPalette) * bmpInfoHeader.colors);`
`54`	`56`	`bmpPixelInfo.paletteSize = 2;`
	`57`	`+ for (int i = 0; i < 2; i++) {`
	`58`	`+ inputFile.read(reinterpret_cast<char *>(bmpPixelInfo.palettes + i), sizeof(BmpColorPalette));`
	`59`	`+ }`
`55`	`60`
`56`	`61`	`inputFile.seekg(bmpFileHeader.offsetSize, std::ios::beg);`
`57`	`62`	`bmpPixelInfo.bytePerLine = ((bmpPixelInfo.width + 7) / 8 + 3) / 4 * 4;`
`@@ -66,7 +71,7 @@ void BmpImage1Bit::readImage(const std::string &filename) {`
`66`	`71`	`flag = true;`
`67`	`72`	`continue;`
`68`	`73`	`}`
`69`		`- bmpPixelInfo.pixels[i * bmpPixelInfo.width + k] = temp & 1 ? 0xFF : 0x00;`
	`74`	`+ bmpPixelInfo.pixels[i * bmpPixelInfo.width + k] = temp & 1 ? bmpPixelInfo.palettes[1].blue : bmpPixelInfo.palettes[0].blue;`
`70`	`75`	`}`
`71`	`76`	`if (flag) break;`
`72`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ void BmpImage8Bit::readImage(const std::string &filename) {`
`72`	`72`
`73`	`73`	`void BmpImage8Bit::toQPixMap(QPixmap &pixmap) {`
`74`	`74`	`const QImage qImage(bmpPixelInfo.pixels, bmpPixelInfo.width, bmpPixelInfo.height, bmpPixelInfo.width,`
`75`		`- QImage::Format_Indexed8);`
	`75`	`+ QImage::Format_Grayscale8);`
`76`	`76`	`pixmap = QPixmap::fromImage(qImage);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,10 @@ namespace QT {`
`40`	`40`	`}`
`41`	`41`	`switch (ui->saveTypeComboBox->currentIndex()) {`
`42`	`42`	`case 0: ui->image->saveImage(filePath, QImage::Format_Mono);`
`43`		`- break;`
`44`		`- case 1: ui->image->saveImage(filePath, QImage::Format_Indexed8);`
`45`		`- break;`
	`43`	`+ break;`
	`44`	`+ case 1: ui->image->saveImage(filePath, QImage::Format_Grayscale8);`
	`45`	`+ break;`
`46`	`46`	`case 2: ui->image->saveImage(filePath, QImage::Format_RGB888);`
`47`		`- break;`
`48`		`- default: return;`
`49`	`47`	`}`
`50`	`48`	`}`
`51`	`49`