Add .cache/ to .gitignore and update aboutscreen.h, sysinfo.h, titlescreen.h, mainwindow.h, sysinfo.cpp, and main.cpp

trv3wood · trv3wood · commit 47951731b9c3 · 2024-07-29T20:10:59.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -73,4 +73,5 @@ CMakeLists.txt.user*
 *.exe
 
 build/
-.vscode/
+.vscode/
+.cache/
diff --git a/aboutscreen.cpp b/aboutscreen.cpp
@@ -18,6 +18,10 @@ AboutScreen::AboutScreen(QWidget *parent)
 
 AboutScreen::~AboutScreen()
 {
+    disconnect(ui->pushButton_1, &QPushButton::clicked, this, &AboutScreen::showMoreInfo);
+    disconnect(ui->pushButton_2, &QPushButton::clicked, this, &AboutScreen::backToTitleScreen);
+    disconnect(ui->pushButton_1, &QPushButton::clicked, this, &AboutScreen::playClickSound);
+    disconnect(ui->pushButton_2, &QPushButton::clicked, this, &AboutScreen::playClickSound);
     delete ui;
 }
 
@@ -31,6 +35,11 @@ void AboutScreen::initUI() {
     }
     this->resize(screenSize);
     ui->frame->resize(screenSize);
+    ui->layoutWidget->setGeometry(screenSize.width() * 0.25, screenSize.height() * 0.2,
+                                  screenSize.width() * 0.5, screenSize.height() * 0.5);
+    ui->label->resize(screenSize.width() * 0.3, screenSize.height() * 0.1);
+    ui->label_2->resize(screenSize.width() * 0.3, screenSize.height() * 0.3);
+
     QSize btnSize(screenSize.width() / 5, screenSize.height() / 25);
     // 设置圆角
     int radius = btnSize.height() / 2;
@@ -40,20 +49,15 @@ void AboutScreen::initUI() {
     QString fontName = QFontDatabase::applicationFontFamilies(fontID).at(0);
     QFont btnFont(fontName, btnSize.height() / 3);
     // 设置按钮样式
-    QString btnName = "pushButton_";
-    for (int i = 0; i < 2; i++) {
-        QString btn = btnName + QString::number(i + 1);
-        QPushButton *btnPtr = this->findChild<QPushButton *>(btn);
-        btnPtr->setFixedSize(btnSize);
-        btnPtr->setFont(btnFont);
-        btnPtr->setStyleSheet(btnStyle);
-        connect(btnPtr, &QPushButton::clicked, this,
-                [this]() { QSound::play(":/res/click.wav"); });
-    }
-    ui->layoutWidget->setGeometry(screenSize.width() * 0.25, screenSize.height() * 0.2,
-                                  screenSize.width() * 0.5, screenSize.height() * 0.5);
-    ui->label->resize(screenSize.width() * 0.3, screenSize.height() * 0.1);
-    ui->label_2->resize(screenSize.width() * 0.3, screenSize.height() * 0.3);
+    ui->pushButton_1->setFixedSize(btnSize);
+    ui->pushButton_1->setFont(btnFont);
+    ui->pushButton_1->setStyleSheet(btnStyle);
+    connect(ui->pushButton_1, &QPushButton::clicked, this, &AboutScreen::playClickSound);
+    ui->pushButton_2->setFixedSize(btnSize);
+    ui->pushButton_2->setFont(btnFont);
+    ui->pushButton_2->setStyleSheet(btnStyle);
+    connect(ui->pushButton_2, &QPushButton::clicked, this, &AboutScreen::playClickSound);
+
     ui->label->setFont(QFont(fontName, btnSize.height()));
     ui->label_2->setFont(QFont(fontName, btnSize.height() / 3));
     ui->label_3->setFont(QFont(fontName, btnSize.height() / 3));
@@ -77,4 +81,8 @@ void AboutScreen::showMoreInfo() {
                          "作者b站主页</a>");
     ui->label_3->show();
     ui->pushButton_1->hide();
+}
+
+void AboutScreen::playClickSound() {
+    QSound::play(":/res/click.wav");
 }
diff --git a/aboutscreen.h b/aboutscreen.h
@@ -21,6 +21,7 @@ class AboutScreen : public QWidget
     void initUI();
     void backToTitleScreen();
     void showMoreInfo();
+    void playClickSound();
 };
 
 #endif // ABOUTSCREEN_H
diff --git a/main.cpp b/main.cpp
@@ -1,8 +1,35 @@
+#include <QApplication>
+#include <QDebug>
+#include <QObject>
+#include <cstddef>
+
 #include "mainwindow.h"
+struct MemoryManager {
+    size_t totalAllocated = 0;
+    size_t totalFreed = 0;
+} memoryManager;
 
-#include <QApplication>
-int main(int argc, char *argv[])
-{
+void* operator new(size_t size) {
+    void* p = malloc(size);
+    memoryManager.totalAllocated += size;
+    qDebug() << "allocated at " << p;
+    qDebug() << "total allocated " << memoryManager.totalAllocated << " bytes. Using "
+             << memoryManager.totalAllocated - memoryManager.totalFreed
+             << " bytes";
+    // qDebug() << "Allocated " << size << " bytes";
+    return p;
+}
+
+void operator delete(void* p, size_t size) noexcept {
+    free(p);
+    qDebug() << "Freed at " << p;
+    memoryManager.totalFreed += size;
+    qDebug() << "total freed " << memoryManager.totalFreed << " bytes. Using "
+             << memoryManager.totalAllocated - memoryManager.totalFreed
+             << " bytes";
+}
+
+int main(int argc, char* argv[]) {
     QApplication a(argc, argv);
     MainWindow w;
     w.show();
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent)
       ui(new Ui::MainWindow),
       m_timer(new QTimer(this)),
       m_sysinfo(new SYSinfo()),
-      m_bootScreen(nullptr),
+    //   m_bootScreen(nullptr),
       m_effect(nullptr),
       m_animation(nullptr),
       m_label(nullptr),
@@ -102,49 +102,59 @@ void MainWindow::codePrintUpdate() {
 }
 
 void MainWindow::loadBootScreen() {
+    disconnect(this, &MainWindow::bootCompleted, this, &MainWindow::loadBootScreen);
     ui->textEdit->hide();
     // 设置启动画面
     m_label = new QLabel(this);
-    m_bootScreen = new QPixmap(":/res/bootScreen.png");
-    m_bootScreen->scaled(this->size(), Qt::KeepAspectRatio,
-                         Qt::SmoothTransformation);
-    m_label->setPixmap(*m_bootScreen);
+    // m_bootScreen = new QPixmap(":/res/bootScreen.png");
+    // m_bootScreen->scaled(this->size(), Qt::KeepAspectRatio,
+                        //  Qt::SmoothTransformation);
+    // m_label->setPixmap(*m_bootScreen);
+    QPixmap bootScreen(":/res/bootScreen.png");
+    bootScreen = bootScreen.scaled(this->size(), Qt::KeepAspectRatio,
+                                   Qt::SmoothTransformation);
+    m_label->setPixmap(bootScreen);
     m_label->setScaledContents(true);
     m_label->resize(this->size());
     m_label->show();
 
     // 淡入图片动画
-    m_effect = new QGraphicsOpacityEffect(this);
-    m_label->setGraphicsEffect(m_effect);
-    m_animation = new QPropertyAnimation(m_effect, "opacity");
-    m_animation->setDuration(3000);
-    m_animation->setStartValue(0);
-    m_animation->setEndValue(1);
-    m_animation->start();
+    fadeIn();
 
     // 淡出图片动画
-    QTimer::singleShot(5000, this, [this]() {
-        connect(m_animation, &QPropertyAnimation::finished, this, [this]() {
-            delete m_animation;
-            delete m_effect;
-            delete m_label;
-            delete m_bootScreen;
-            m_animation = nullptr;
-            m_effect = nullptr;
-            m_label = nullptr;
-            m_bootScreen = nullptr;
-            // 动画结束后加载标题界面
-            loadTitleScreen();
-        });
-        m_animation->setDuration(3000);
-        m_animation->setStartValue(1);
-        m_animation->setEndValue(0);
-        m_animation->start();
-    });
+    QTimer::singleShot(5000, this, &MainWindow::fadeOut);
 }
 
 void MainWindow::loadTitleScreen() {
+    disconnect(m_animation, &QPropertyAnimation::finished, this, &MainWindow::loadTitleScreen);
+    delete m_animation;
+    delete m_effect;
+    delete m_label;
+    // delete m_bootScreen;
+    m_animation = nullptr;
+    m_effect = nullptr;
+    m_label = nullptr;
+    // m_bootScreen = nullptr;
     m_titlescreen = new TitleScreen(this);
     m_titlescreen->show();
     this->centralWidget()->hide();
 }
+
+void MainWindow::fadeOut() {
+    connect(m_animation, &QPropertyAnimation::finished, this,
+            &MainWindow::loadTitleScreen);
+    m_animation->setDuration(3000);
+    m_animation->setStartValue(1);
+    m_animation->setEndValue(0);
+    m_animation->start();
+}
+
+void MainWindow::fadeIn() {
+    m_effect = new QGraphicsOpacityEffect(this);
+    m_label->setGraphicsEffect(m_effect);
+    m_animation = new QPropertyAnimation(m_effect, "opacity");
+    m_animation->setDuration(3000);
+    m_animation->setStartValue(0);
+    m_animation->setEndValue(1);
+    m_animation->start();
+}
diff --git a/mainwindow.h b/mainwindow.h
@@ -29,7 +29,7 @@ class MainWindow : public QMainWindow {
     Ui::MainWindow* ui;
     QTimer* m_timer = nullptr;
     SYSinfo* m_sysinfo = nullptr;
-    QPixmap* m_bootScreen = nullptr;
+    // QPixmap* m_bootScreen = nullptr;
     QGraphicsOpacityEffect* m_effect = nullptr;
     QPropertyAnimation* m_animation = nullptr;
     QLabel* m_label = nullptr;
@@ -40,6 +40,8 @@ class MainWindow : public QMainWindow {
     void codePrintUpdate();
     void loadBootScreen();
     void loadTitleScreen();
+    void fadeOut();
+    void fadeIn();
 signals:
     void bootCompleted();
     // void animationFinished();
diff --git a/sysinfo.cpp b/sysinfo.cpp
@@ -62,7 +62,7 @@ SYSinfo::SYSinfo() {
 
     // CPU cores
     int nCores = 0;
-    getCPUInfo(nCores);
+    getCPUCore(nCores);
     m_data[2] += ": " + std::to_string(nCores);
 
     // CPU threads
@@ -95,7 +95,7 @@ SYSinfo::SYSinfo() {
         " GB";
 }
 
-void SYSinfo::getCPUInfo(int& cpu_cores) {
+void SYSinfo::getCPUCore(int& cpu_cores) {
     DWORD bufferSize = 0;
     GetLogicalProcessorInformation(nullptr, &bufferSize);
     std::vector<SYSTEM_LOGICAL_PROCESSOR_INFORMATION> buffer(bufferSize / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION));
diff --git a/sysinfo.h b/sysinfo.h
@@ -9,7 +9,7 @@ struct SYSinfo {
         "CPU_THREADS",         "MEMORY",    "DISK",     "// COMPLETE."};
 
     SYSinfo();
-    void getCPUInfo(int& cpu_cores);
+    void getCPUCore(int& cpu_cores);
     void getCPUname(std::string& cpuName);
 };
 #endif  // SYSINFO_H
diff --git a/titlescreen.cpp b/titlescreen.cpp
diff --git a/titlescreen.h b/titlescreen.h
