更新与前板的使用串口连接
This commit is contained in:
@@ -28,7 +28,9 @@ struct UI_config {
|
||||
QString BACK_TEST_ITEM; // "后板测试项"
|
||||
QString BACK_CONFID_ITEM; // "后板配置项"
|
||||
QString IMAGE_DISPLAY_TAB; // "图像显示区"
|
||||
QString VIDEO_DISPLAY_TAB; // "视频显示区"
|
||||
QString VIDEO_DISPLAY_TAB; // "视频显示区"
|
||||
QString ALL_TEST_ITEM; // "整机测试项"
|
||||
QString ALL_CONFID_ITEM; // "整机配置项"
|
||||
QString LEFT_LENS; // "左边镜头"
|
||||
QString RIGHT_LENS; // "右边镜头"
|
||||
QString CAT_EYE_LENS_RGB; // "猫眼镜头(RGB)"
|
||||
|
||||
@@ -42,11 +42,11 @@ UI_config loadConfig(const QString& filePath)
|
||||
UI_config config;
|
||||
QMap<QString, QString> settings = parseIniFile(filePath);
|
||||
// 可直接修改 UI_config.ini 文件
|
||||
// 如果删除 UI_config.ini 文件中的 Labels 项,则使用如下代码的默认命名配置
|
||||
// 如果删除 UI_config.ini 文件中的 Labels 项,则使用如下代码中的默认命名配置
|
||||
// Labels 项 默认命名配置
|
||||
config.SL100_FACTORY_TOOL_W = settings.value("Window/width", "1340").toInt();
|
||||
config.SL100_FACTORY_TOOL_H = settings.value("Window/height", "900").toInt();
|
||||
config.TOOL_VERSION = settings.value("Labels/tool_version", "SL100 工厂产测工具 - V0.0.10");
|
||||
config.TOOL_VERSION = settings.value("Labels/tool_version", "SL100 工厂产测工具 - V0.0.16");
|
||||
config.START_LISTENING = settings.value("Labels/start_listening", "开始监听\n(Start Listening...)");
|
||||
config.ONE_CLICKED_TEST = settings.value("Labels/one_clicked_test", "一键功能测试");
|
||||
config.FRONT_BOARD_NAME = settings.value("Labels/front_board_name", "前 板");
|
||||
@@ -65,6 +65,8 @@ UI_config loadConfig(const QString& filePath)
|
||||
config.BACK_CONFID_ITEM = settings.value("Labels/back_config_item", "后板配置项");
|
||||
config.IMAGE_DISPLAY_TAB = settings.value("Labels/image_display_tab", "图像显示区");
|
||||
config.VIDEO_DISPLAY_TAB = settings.value("Labels/video_display_tab", "视频显示区");
|
||||
config.ALL_TEST_ITEM = settings.value("Labels/all_test_item", "整机测试项");
|
||||
config.ALL_CONFID_ITEM = settings.value("Labels/all_config_item", "整机配置项");
|
||||
config.LEFT_LENS = settings.value("Labels/left_lens", "左边镜头");
|
||||
config.RIGHT_LENS = settings.value("Labels/right_lens", "右边镜头");
|
||||
config.CAT_EYE_LENS_RGB = settings.value("Labels/cat_eye_lens_rgb", "猫眼镜头(RGB)");
|
||||
@@ -498,6 +500,9 @@ void MainWidget::addDeviceAreaTab(QTabWidget* mainTabWidget, const QString& tabN
|
||||
|
||||
// 创建整机区域布局
|
||||
void MainWidget::addAllDeviceAreaTab(QTabWidget* mainTabWidget, const QString& tabName,
|
||||
const QJsonArray& boardTest, const QJsonArray& boardFuncConfig,
|
||||
const QString& boardTestName, const QString& boardFuncConfigName,
|
||||
const QString& boardTestTitle, const QString& boardConfigTitle,
|
||||
QLabel* leftLensLabel, QLabel* rightLensLabel, QLabel* video_Label,
|
||||
QLineEdit* VideoResolutionEdit_type)
|
||||
{
|
||||
@@ -506,9 +511,9 @@ void MainWidget::addAllDeviceAreaTab(QTabWidget* mainTabWidget, const QString& t
|
||||
QGroupBox* allProductInfoGroupBox = new QGroupBox(TOOL_UI.ALL_PRODUCT_INFO, this);
|
||||
QFormLayout* formLayout = new QFormLayout(allProductInfoGroupBox);
|
||||
for (const QJsonValue& value : factoryProductInfo) {
|
||||
QJsonObject item = value.toObject();
|
||||
QString label = item["lable"].toString();
|
||||
QString cmd = item["cmd"].toString();
|
||||
QJsonObject item = value.toObject();
|
||||
QString label = item["lable"].toString();
|
||||
QString cmd = item["cmd"].toString();
|
||||
QLabel* itemLabel = new QLabel(label, this);
|
||||
QLineEdit* itemLineEdit = new QLineEdit(this);
|
||||
itemLineEdit->setReadOnly(false);
|
||||
@@ -516,13 +521,23 @@ void MainWidget::addAllDeviceAreaTab(QTabWidget* mainTabWidget, const QString& t
|
||||
formLayout->addRow(itemLabel, itemLineEdit);
|
||||
productInfoLineEdits[cmd] = itemLineEdit;
|
||||
}
|
||||
|
||||
QTabWidget* boardTabWidget = new QTabWidget(this);
|
||||
boardTabWidget->setFixedSize(900, 315);
|
||||
QWidget* functionTestTab = createFunctionTestTab(boardTest, boardTestName);
|
||||
QWidget* functionConfigTab = createFunctionConfigTab(boardFuncConfig, boardFuncConfigName);
|
||||
boardTabWidget->addTab(functionTestTab, boardTestTitle);
|
||||
boardTabWidget->addTab(functionConfigTab, boardConfigTitle);
|
||||
|
||||
groupBoxLayout->addWidget(allProductInfoGroupBox, 1);
|
||||
groupBoxLayout->addWidget(allDeviceInfoGroupBox, 1);
|
||||
|
||||
QTabWidget* mediaTabWidget = createMediaTabWidget(leftLensLabel, rightLensLabel, video_Label, VideoResolutionEdit_type, tabName);
|
||||
QWidget* allDevAreaTab = new QWidget(this);
|
||||
QVBoxLayout* allDevLayout = new QVBoxLayout(allDevAreaTab);
|
||||
allDevLayout->addLayout(groupBoxLayout, 5);
|
||||
allDevLayout->addWidget(mediaTabWidget, 3);
|
||||
allDevLayout->addLayout(groupBoxLayout, 2);
|
||||
allDevLayout->addWidget(boardTabWidget, 4);
|
||||
allDevLayout->addWidget(mediaTabWidget, 4);
|
||||
mainTabWidget->addTab(allDevAreaTab, tabName);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user