hehaoyang/IVA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

格式整理

Browse Source
This commit is contained in:
hehaoyang 2023-10-20 23:48:21 +08:00
parent 150b54e268
commit e52b388f6b
5 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
app/HxDataBase.cpp
View File

@ -37,16 +37,16 @@ QSqlDatabase DataBase::open(QString filepath, QString connectionName)
}
/**
* @brief 关闭数据库
* @param connectionName 连接名
*/
* @brief 关闭数据库
* @param connectionName 连接名
*/
void DataBase::close(QString connectionName) { QSqlDatabase::removeDatabase(connectionName); }
/**
* @brief 读取 Setting 表数据
* @param name name字段值
* @return 返回对应参数
*/
* @brief 读取 Setting 表数据
* @param name name字段值
* @return 返回对应参数
*/
QVariant DataBase::read_setting(QString name)
{
QVariant value;
@ -69,11 +69,11 @@ QVariant DataBase::read_setting(QString name)
}
/**
* @brief 读取 Setting 表数据(int)
* @param name name字段值
* @param defaultValue 默认值(int)
* @return 返回对应参数(int)
*/
* @brief 读取 Setting 表数据(int)
* @param name name字段值
* @param defaultValue 默认值(int)
* @return 返回对应参数(int)
*/
int DataBase::read_setting(QString name, int defaultValue)
{
auto value = read_setting(name);
@ -82,11 +82,11 @@ int DataBase::read_setting(QString name, int defaultValue)
}
/**
* @brief 读取 Setting 表数据(bool)
* @param name name字段值
* @param defaultValue 默认值(bool)
* @return 返回对应参数(bool)
*/
* @brief 读取 Setting 表数据(bool)
* @param name name字段值
* @param defaultValue 默认值(bool)
* @return 返回对应参数(bool)
*/
bool DataBase::read_setting(QString name, bool defaultValue)
{
auto value = read_setting(name);
@ -95,11 +95,11 @@ bool DataBase::read_setting(QString name, bool defaultValue)
}
/**
* @brief 读取 Setting 表数据(string)
* @param name name字段值
* @param defaultValue 默认值(string)
* @return 返回对应参数(string)
*/
* @brief 读取 Setting 表数据(string)
* @param name name字段值
* @param defaultValue 默认值(string)
* @return 返回对应参数(string)
*/
QString DataBase::read_setting(QString name, QString defaultValue)
{
auto value = read_setting(name);
@ -108,10 +108,10 @@ QString DataBase::read_setting(QString name, QString defaultValue)
}
/**
* @brief 写入 Setting 表数据
* @param name name字段值
* @param value 对应参数
*/
* @brief 写入 Setting 表数据
* @param name name字段值
* @param value 对应参数
*/
void DataBase::write_setting(QString name, QString value)
{
QMutexLocker lock(&mutex);
@ -175,14 +175,14 @@ void DataBase::initialization()
bsd_video_input_source = read_setting("bsd_video_input_source", QString(";;;;;;")).split(";");
bsd_warn_regions = read_setting(
"bsd_warn_regions",
QString("0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0"))
.split("*");
"bsd_warn_regions",
QString("0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0*"
"0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0$0,0 0,0 0,0 0,0"))
.split("*");
}
bool DataBase::save_setting()
@ -203,10 +203,10 @@ bool DataBase::save_setting()
}
/**
* @brief 获取BSD报警区域
* @param channel 通道号
* @return 返回 BsdWarnRegion 结构体
*/
* @brief 获取BSD报警区域
* @param channel 通道号
* @return 返回 BsdWarnRegion 结构体
*/
BsdWarnRegion DataBase::get_bsd_warn_region(int channel)
{
BsdWarnRegion ret;

12
app/HxTaskDispatch.cpp
View File

@ -140,7 +140,7 @@ QString TaskDispatch::get_video_frame_data(int type, int channel, int id)
{
Q_UNUSED(channel);
switch(type)
switch (type)
{
case 0:
return adas_video_device.build_image(id);
@ -155,7 +155,7 @@ QString TaskDispatch::get_video_frame_data(int type, int channel, int id)
QString TaskDispatch::build_alarm_image(int type, int channel, int frame_id)
{
switch(type)
switch (type)
{
case 0:
return adas_video_device.build_image(frame_id);
@ -170,7 +170,7 @@ QString TaskDispatch::build_alarm_image(int type, int channel, int frame_id)
QString TaskDispatch::build_alarm_video(int type, int channel, int frame_id)
{
switch(type)
switch (type)
{
case 0:
return adas_video_device.build_video(frame_id);
@ -251,7 +251,6 @@ void TaskDispatch::parsing_vehiclue_status(void)
else
status = 1;
/* 车辆状态发生改变 */
if (status != 0 && vehicle_status != status)
{
@ -306,14 +305,14 @@ void TaskDispatch::parsing_vehiclue_status(void)
bsd_video_device[3].set(true);
/* 后侧, 左前, 左后 */
_detect_channel |=(REAR_BSD_DETECT_CHANNEL | LEFT_BSD_FRONT_DETECT_CHANNEL | RIGHT_BSD_FRONT_DETECT_CHANNEL);
_detect_channel |= (REAR_BSD_DETECT_CHANNEL | LEFT_BSD_FRONT_DETECT_CHANNEL | RIGHT_BSD_FRONT_DETECT_CHANNEL);
break;
}
}
}
/* 确保状态改变后才调用该函数 */
if(detect_channel != _detect_channel)
if (detect_channel != _detect_channel)
{
detect_channel = _detect_channel;
@ -464,7 +463,6 @@ void TaskDispatch::data_receive_event(QByteArray data)
debug_tool_response_event(type, {{"status", DataBase::save_setting()}});
break;
case 0xFFFF:
adas_video_device.test();
break;

6
app/HxTaskDispatch.h
View File

@ -7,9 +7,9 @@
#include "HxUtils.h"
#include "MvObjectEventDetect.h"
#define ALGORITHM_TYPE_ADAS 0
#define ALGORITHM_TYPE_BSD 1
#define ALGORITHM_TYPE_DSM 2
#define ALGORITHM_TYPE_ADAS 0
#define ALGORITHM_TYPE_BSD 1
#define ALGORITHM_TYPE_DSM 2
class TaskDispatch : public QThread
{

9
app/HxVideoDevice.h
View File

@ -15,7 +15,6 @@ using namespace cv;
using namespace std;
#if ALGORITHM_ENABLE
#include "rkrga/rga.h"
#include "rkrga/im2d.hpp"
#endif
@ -45,10 +44,10 @@ private:
protected:
void run() override;
private:
int MvGetFrameBlkInfo(VideoFrameDataInfo *pImageDataInfo);
int MvReleaseFrameBlkInfo(VideoFrameDataInfo *pImageDataInfo);
int MvConvertImage(VideoFrameDataInfo *pSrcImageDataInfo, VideoFrameDataInfo *pDstImageDataInfo);
private:
int MvGetFrameBlkInfo(VideoFrameDataInfo *pImageDataInfo);
int MvReleaseFrameBlkInfo(VideoFrameDataInfo *pImageDataInfo);
int MvConvertImage(VideoFrameDataInfo *pSrcImageDataInfo, VideoFrameDataInfo *pDstImageDataInfo);
private:
int type;

1
app/main.cpp
View File

@ -16,7 +16,6 @@ int main(int argc, char *argv[])
TaskDispatch::listern(9031);
TaskDispatch::connect_to_host("192.168.10.10", 9031);
// TaskDispatch::connect_to_host("10.211.55.2", 9031);
return a.exec();
}