V20260122-2.3.9
调整图片阅览的缩放逻辑。 调整柱状图文本倾斜角度。 部分小改动。
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include <backendInterface.h>
|
||||
#include <generalJsonParsing.hpp>
|
||||
#include <serviceManager.h>
|
||||
#include <future>
|
||||
triggerManager::triggerManager(ServiceManager* _serviceManager, bSignalHub* bridgeIn,nlohmann::ordered_json& triggerJson){
|
||||
|
||||
bridge = bridgeIn;
|
||||
@@ -161,17 +162,17 @@ void triggerManager::checkCallback(readAllStruct _struct, QByteArray& byteArray)
|
||||
if (checkTrigger(callback.triggerAddress, callback.triggerValue, _struct, byteArray) == true)
|
||||
{
|
||||
qDebug() << "func:" << QString::fromStdString(callback.funcName) << "->已触发 " << callback.triggerValue;
|
||||
std::thread([callback, byteArray]() mutable {
|
||||
std::async(std::launch::async, [callback, byteArray]() mutable {
|
||||
try {
|
||||
callback.func(callback.triggerAddress, callback.triggerValue, byteArray); // 执行回调函数
|
||||
}
|
||||
catch (const std::exception& e) {
|
||||
qCritical() << "Error in union callback " << QString::fromStdString(callback.funcName) << ": " << QString::fromStdString(e.what());
|
||||
qCritical() << "Error in callback " << QString::fromStdString(callback.funcName) << ": " << QString::fromStdString(e.what());
|
||||
}
|
||||
catch (...) {
|
||||
qCritical() << "Error in union callback : unexpected" << QString::fromStdString(callback.funcName);
|
||||
qCritical() << "Error in callback : unexpected" << QString::fromStdString(callback.funcName);
|
||||
}
|
||||
}).detach();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -215,7 +216,7 @@ void triggerManager::checkUnionCallback(readAllStruct& _struct, QByteArray& byte
|
||||
}
|
||||
}
|
||||
qDebug() << "Union func:" << QString::fromStdString(cb.funcName) << "->已触发 ("<< triggerSource <<")";
|
||||
std::thread([cb, copyByte = byteArray, triggerSource]() mutable {
|
||||
std::async(std::launch::async, [cb, copyByte = byteArray, triggerSource]() mutable {
|
||||
try {
|
||||
cb.func(triggerSource, copyByte);
|
||||
}
|
||||
@@ -225,7 +226,7 @@ void triggerManager::checkUnionCallback(readAllStruct& _struct, QByteArray& byte
|
||||
catch (...) {
|
||||
qCritical() << "Error in union callback : unexpected" << QString::fromStdString(cb.funcName);
|
||||
}
|
||||
}).detach();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user