Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.10)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

project(Lab2QRCode)

set(CMAKE_CXX_STANDARD 20)
Expand All @@ -19,7 +21,7 @@ add_custom_target(
COMMAND ${CMAKE_COMMAND} -E echo "Running PowerShell script..."
COMMAND pwsh -ExecutionPolicy Bypass -File ${CMAKE_SOURCE_DIR}/scripts/build/version_info.ps1
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/version_info
COMMENT "powershell -ExecutionPolicy Bypass -File ${CMAKE_SOURCE_DIR}/version_info.ps1"
COMMENT "powershell -ExecutionPolicy Bypass -File ${CMAKE_SOURCE_DIR}/scripts/build/version_info.ps1"
BYPRODUCTS ${VERSION_CPP})

if(MSVC)
Expand All @@ -39,7 +41,14 @@ if(NOT XLSXWRITER_INCLUDE_DIR OR NOT XLSXWRITER_LIBRARY)
message(FATAL_ERROR "Could not find xlsxwriter library or include directory")
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Og")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -O0 -Wl,-O0")
endif()

file(GLOB_RECURSE SOURCES "src/*.cpp")
list(REMOVE_ITEM SOURCES "${VERSION_CPP}")

add_executable(${PROJECT_NAME} WIN32 ${SOURCES} ${VERSION_CPP} "logo.rc")
add_dependencies(${PROJECT_NAME} RunPowerShellScript)
Expand All @@ -57,6 +66,10 @@ target_link_libraries(
Boost::random
spdlog::spdlog_header_only)

if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_precompile_headers(${PROJECT_NAME} PRIVATE <spdlog/spdlog.h>)
endif()

target_include_directories(${PROJECT_NAME} PRIVATE ${XLSXWRITER_INCLUDE_DIR})
target_link_libraries(${PROJECT_NAME} PRIVATE ${XLSXWRITER_LIBRARY})

Expand Down
6 changes: 5 additions & 1 deletion src/BarcodeWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "components/message_dialog.h"
#include "convert.h"
#include "version_info/version.h"

#include <QCheckBox>
#include <QComboBox>
#include <QFileDialog>
Expand All @@ -25,9 +26,12 @@
#include <ZXing/BarcodeFormat.h>
#include <ZXing/TextUtfEncoding.h>
#include <magic_enum/magic_enum.hpp>
#include <opencv2/opencv.hpp>
#include <opencv2/core.hpp>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/imgproc.hpp>
#include <ranges>
#include <spdlog/spdlog.h>

template <typename Ret, typename... Fs>
requires(std::is_void_v<Ret> || std::is_default_constructible_v<Ret>)
struct overload_def_noop : private Fs... {
Expand Down
12 changes: 5 additions & 7 deletions src/BarcodeWidget.h
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
#pragma once

#include <vector>

#include <QWidget>
#include <ZXing/BarcodeFormat.h>
#include <opencv2/opencv.hpp>
#include <qfuturewatcher.h>

#include "CameraWidget.h"
#include "convert.h"
#include "mqtt/MQTTMessageWidget.h"
#include "mqtt/mqtt_client.h"

#include <QWidget>
#include <ZXing/BarcodeFormat.h>
#include <qfuturewatcher.h>
#include <vector>

class QLineEdit;
class QPushButton;
class QLabel;
Expand Down
8 changes: 3 additions & 5 deletions src/CameraWidget.cpp
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
#include "CameraWidget.h"
#include "sysinfo.h"

#include <QBuffer>
#include <QCameraInfo>
#include <QComboBox>
#include <QDateTime>
#include <QDir>
#include <QFile>
#include <QFileDialog>
#include <QGroupBox>
#include <QHeaderView>
#include <QLabel>
#include <QMenuBar>
#include <QMessageBox>
#include <QMetaObject>
#include <QPushButton>
#include <QStandardItemModel>
#include <QStandardPaths>
#include <QTableView>
#include <QTimer>
#include <QToolButton>
#include <QWidgetAction>
#include <ZXing/ReadBarcode.h>
#include <filesystem>
#include <magic_enum/magic_enum_format.hpp>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/imgproc.hpp>
#include <qaction.h>
#include <qcoreevent.h>
#include <spdlog/spdlog.h>
Expand Down
4 changes: 2 additions & 2 deletions src/CameraWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#include "CameraConfig.h"
#include "FrameWidget.h"
#include "commondef.h"

#include <QStatusBar>
#include <QTextEdit>
#include <QVBoxLayout>
#include <QWidget>
#include <ZXing/BarcodeFormat.h>
#include <atomic>
#include <future>
#include <opencv2/opencv.hpp>
#include <opencv2/videoio.hpp>
#include <qactiongroup.h>
#include <qcombobox.h>
#include <thread>
Expand Down
2 changes: 2 additions & 0 deletions src/FrameWidget.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#include "FrameWidget.h"

#include <QImage>
#include <QPainter>
#include <QStyleOption>
#include <spdlog/spdlog.h>

namespace {

// 输入 outer rect 和图像宽高,返回居中等比缩放后的 rect
Expand Down
2 changes: 1 addition & 1 deletion src/about_dialog.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "about_dialog.h"
#include "components/UiConfig.h"
#include <QApplication>

#include <QDateTime>
#include <QDesktopServices>
#include <QFile>
Expand Down
2 changes: 1 addition & 1 deletion src/components/UiConfig.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "UiConfig.h"
#include "../logging.h"

#include <QApplication>
#include <QFile>
#include <QFileInfo>
#include <QFont>
#include <QFontDatabase>
#include <QFontInfo>
Expand Down
2 changes: 2 additions & 0 deletions src/components/message_dialog.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "message_dialog.h"

#include <QApplication>
#include <QGraphicsDropShadowEffect>
#include <QHBoxLayout>
Expand All @@ -7,6 +8,7 @@
#include <QScreen>
#include <QScrollArea>
#include <QVBoxLayout>

MessageDialog::MessageDialog(QWidget *parent)
: QDialog(parent) {
setMinimumSize(400, 300);
Expand Down
4 changes: 2 additions & 2 deletions src/convert.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#define LAB2QRCODE_CONVERT_H

#include <variant>
#include <vector>

#include <QByteArray>
#include <QFileInfo>
Expand All @@ -16,7 +15,8 @@
#include <ZXing/ImageView.h>
#include <ZXing/MultiFormatWriter.h>
#include <ZXing/ReadBarcode.h>
#include <opencv2/opencv.hpp>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/imgproc.hpp>

/**
* @namespace convert
Expand Down
1 change: 0 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "BarcodeWidget.h"
#include "components/UiConfig.h"
#include "convert.h"
#include "logging.h"
#include <QApplication>

Expand Down
2 changes: 1 addition & 1 deletion src/mqtt/MQTTMessageWidget.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include "MQTTMessageWidget.h"

#include <QFileDialog>
#include <QTextCodec>
#include <QTextStream>
Expand Down
1 change: 1 addition & 0 deletions src/mqtt/mqtt_client.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "mqtt_client.h"

#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
Expand Down