git_user/arc
1
0
Fork 0
forked from BRT/arc
Code Pull Requests Activity

Fix for windows

Browse Source
This commit is contained in:
slava 2025-06-18 20:02:38 +07:00
parent 9c6d1bd4e5
commit 93bf00352a
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -17,8 +17,8 @@ add_compile_definitions(QT_MESSAGELOGCONTEXT)
if (WIN32)
# Укажи путь к Qt6
#set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_arm64")
set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_64")
set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_arm64")
# set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_64")
# list(APPEND CMAKE_PREFIX_PATH "C:/Users/User/.vcpkg-clion/vcpkg/installed/arm64-windows")
#vcpkg install tesseract:arm64-windows
#set(Tesseract_DIR "C:/Users/User/.vcpkg-clion/vcpkg/installed/arm64-windows/share/tesseract")
@ -97,7 +97,7 @@ if (WIN32)
)
# Копирование изображений в директорию сборки
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/database/app_data.db" DESTINATION "${CMAKE_BINARY_DIR}/database")
# file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/database/app_data.db" DESTINATION "${CMAKE_BINARY_DIR}/database")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tutorials" DESTINATION "${CMAKE_BINARY_DIR}")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/images" DESTINATION "${CMAKE_BINARY_DIR}")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/rus.traineddata" DESTINATION "${CMAKE_BINARY_DIR}")

2
config.ini
View File

@ -20,6 +20,8 @@ android_package_name=com.ziraat.ziraatmobil
name=Santander
android_package_name=ar.com.santander.rio.mbanking
[db]
dbPath=C:/Users/User/CLionProjects/ARCDeskProject/database/app_data.db
[net]
appInfoUpdate=http://localhost:9999/api/v1/device/update

6
database/DatabaseManager.cpp
View File

@ -2,6 +2,7 @@
#include <QCoreApplication>
#include <QSqlError>
#include <QDebug>
#include <QSettings>
#include <QThread>
DatabaseManager::DatabaseManager() = default;
@ -27,7 +28,10 @@ QSqlDatabase DatabaseManager::database() {
// Создаем новое соединение, если его ещё нет
if (!connectionPool.contains(name)) {
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", name);
db.setDatabaseName(QCoreApplication::applicationDirPath() + "/database/app_data.db");
const QSettings settings("config.ini", QSettings::IniFormat);
// qDebug() << settings.value("db/dbPath").toString();
// db.setDatabaseName(QCoreApplication::applicationDirPath() + "/database/app_data.db");
db.setDatabaseName(settings.value("db/dbPath").toString());
if (!db.open()) {
qWarning() << "Ошибка открытия базы данных:" << db.lastError().text();

9
views/bank/BankSettingsWindow.cpp
View File

@ -105,16 +105,11 @@ void BankSettingsWindow::reloadContent(QTableWidget *tableWidget) {
tableWidget->setWordWrap(true);
tableWidget->setTextElideMode(Qt::ElideNone);
QMargins cellPadding{8, 4, 8, 4};
auto *delegate = new PaddedItemDelegate(cellPadding, tableWidget);
// tableWidget->setItemDelegateForColumn(1, delegate);
// tableWidget->setItemDelegateForColumn(2, delegate);
// tableWidget->setItemDelegateForColumn(3, delegate);
// tableWidget->setItemDelegateForColumn(4, delegate);
tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
for (int i = 0; i < 7; ++i) {
tableWidget->horizontalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
}
for (int i = 0; i < applications.length(); ++i) {
tableWidget->verticalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
}
tableWidget->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Stretch);