From 455884c373cd01aa53e619bac40bda83fbb3f053 Mon Sep 17 00:00:00 2001 From: liusiyang Date: Thu, 10 Sep 2026 18:40:55 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/include/AICommonDefine.h | 36 +++---- AlgorithmModule/include/ImgCheckConfig.h | 22 ++-- AlgorithmModule/src/ImageResultJudge.cpp | 44 +++----- AlgorithmModule/src/ImgCheckAnalysisy.cpp | 76 ++++++-------- ConfigModule/include/CheckConfigDefine.h | 38 +++---- ConfigModule/src/ConfigManager.cpp | 24 ++--- ConfigModule/src/JsonConfig.cpp | 120 ++++++++-------------- 7 files changed, 135 insertions(+), 225 deletions(-) diff --git a/AlgorithmModule/include/AICommonDefine.h b/AlgorithmModule/include/AICommonDefine.h index 58e3caa..e5895e7 100644 --- a/AlgorithmModule/include/AICommonDefine.h +++ b/AlgorithmModule/include/AICommonDefine.h @@ -13,31 +13,27 @@ enum AI_CLass_QX_NAME_ { - AI_CLass_QX_NAME_aotudian, // 凹凸点 - AI_CLass_QX_NAME_other, // 其他 - AI_CLass_QX_NAME_line, // 线状 - AI_CLass_QX_NAME_zangwu, // 脏污 - AI_CLass_QX_NAME_dianzhuang, // 点状 - AI_CLass_QX_NAME_posun, // 破损 - AI_CLass_QX_NAME_xianwei, // 纤维 - AI_CLass_QX_NAME_shuizi, // 水渍 - AI_CLass_QX_NAME_danban, // 淡斑 - AI_CLass_QX_NAME_fuchen, // 浮尘 + AI_CLass_QX_NAME_PIN_PoSun, // PIN破损 + AI_CLass_QX_NAME_PIN_QueShi, // PIN缺失 + AI_CLass_QX_NAME_BTB_DuanLie, // BTB断裂 + AI_CLass_QX_NAME_LianXi, // 连锡 + AI_CLass_QX_NAME_QueXi, // 缺锡 + AI_CLass_QX_NAME_YiWu, // 异物 + AI_CLass_QX_NAME_C_BianXing, // C型卡口异常 + AI_CLass_QX_NAME_other, // 其他 AI_CLass_QX_NAME_count, }; // 缺陷项对应在参数中的名称 static const std::string AI_CLass_QX_NAME_Names[] = { - "aotudian", - "qx", - "line", - "zangwu", - "dianzhuang", - "posun", - "xianwei", - "shuizi", - "danban", - "fuchen", + "PIN_PoSun", + "PIN_QueShi", + "BTB_DuanLie", + "LianXi", + "QueXi", + "YiWu", + "C_BianXing", + "other", }; #endif \ No newline at end of file diff --git a/AlgorithmModule/include/ImgCheckConfig.h b/AlgorithmModule/include/ImgCheckConfig.h index b55b88e..f27992a 100644 --- a/AlgorithmModule/include/ImgCheckConfig.h +++ b/AlgorithmModule/include/ImgCheckConfig.h @@ -47,19 +47,15 @@ struct VERSION_INFO // 检测错误代码 enum ERROR_TYPE_ { - ERROR_TYPE_OK, // 1 疑是 - ERROR_TYPE_aotudian, // 2 凹凸点 - ERROR_TYPE_other, // 3 其他 - ERROR_TYPE_line, // 4 线状 - ERROR_TYPE_zangwu, // 5 脏污 - ERROR_TYPE_edge, // 6 边缘 - ERROR_TYPE_ymhs, // 7 研磨划伤 - ERROR_TYPE_dianzhuang, // 8 点状 - ERROR_TYPE_posun, // 9 破损 - ERROR_TYPE_xianwei, // 10 纤维 - ERROR_TYPE_shuizi, // 11 水渍 - ERROR_TYPE_danban, // 12 淡斑 - ERROR_TYPE_fuchen, // 13 浮尘 + ERROR_TYPE_OK, // 0 正常/疑是 + ERROR_TYPE_PIN_PoSun, // 1 PIN破损 + ERROR_TYPE_PIN_QueShi, // 2 PIN缺失 + ERROR_TYPE_BTB_DuanLie, // 3 BTB断裂 + ERROR_TYPE_LianXi, // 4 连锡 + ERROR_TYPE_QueXi, // 5 缺锡 + ERROR_TYPE_YiWu, // 6 异物 + ERROR_TYPE_C_BianXing, // 7 C型卡口异常 + ERROR_TYPE_other, // 8 其他 ERROR_TYPE_COUNT, }; extern std::vector QX_Result_Names; diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index 00c68f6..260d4af 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -1044,41 +1044,29 @@ int ImageResultJudge::ConfigTypeToResultType(int nconfigType) { switch (nconfigType) { - case CONFIG_QX_NAME_cell_aotudian: - resultError_type = ERROR_TYPE_aotudian; + case CONFIG_QX_NAME_cell_PIN_PoSun: + resultError_type = ERROR_TYPE_PIN_PoSun; break; - case CONFIG_QX_NAME_cell_other: - resultError_type = ERROR_TYPE_other; - break; - case CONFIG_QX_NAME_cell_line: - resultError_type = ERROR_TYPE_line; - break; - case CONFIG_QX_NAME_cell_zangwu: - resultError_type = ERROR_TYPE_zangwu; + case CONFIG_QX_NAME_cell_PIN_QueShi: + resultError_type = ERROR_TYPE_PIN_QueShi; break; - case CONFIG_QX_NAME_cell_edge: - resultError_type = ERROR_TYPE_edge; + case CONFIG_QX_NAME_cell_BTB_DuanLie: + resultError_type = ERROR_TYPE_BTB_DuanLie; break; - case CONFIG_QX_NAME_cell_ymhs: - resultError_type = ERROR_TYPE_ymhs; + case CONFIG_QX_NAME_cell_LianXi: + resultError_type = ERROR_TYPE_LianXi; break; - case CONFIG_QX_NAME_cell_dianzhuang: - resultError_type = ERROR_TYPE_dianzhuang; + case CONFIG_QX_NAME_cell_QueXi: + resultError_type = ERROR_TYPE_QueXi; break; - case CONFIG_QX_NAME_cell_posun: - resultError_type = ERROR_TYPE_posun; + case CONFIG_QX_NAME_cell_YiWu: + resultError_type = ERROR_TYPE_YiWu; break; - case CONFIG_QX_NAME_cell_xianwei: - resultError_type = ERROR_TYPE_xianwei; + case CONFIG_QX_NAME_cell_C_BianXing: + resultError_type = ERROR_TYPE_C_BianXing; break; - case CONFIG_QX_NAME_cell_shuizi: - resultError_type = ERROR_TYPE_shuizi; - break; - case CONFIG_QX_NAME_cell_danban: - resultError_type = ERROR_TYPE_danban; - break; - case CONFIG_QX_NAME_cell_fuchen: - resultError_type = ERROR_TYPE_fuchen; + case CONFIG_QX_NAME_cell_other: + resultError_type = ERROR_TYPE_other; break; default: diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index 864ffcb..4bf1fb0 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -527,8 +527,8 @@ int ImgCheckAnalysisy::CheckRun() alignErr.flen = tplRect.width * m_fImgage_Scale_X; alignErr.fbreadth = tplRect.height * m_fImgage_Scale_Y; - alignErr.nconfig_qx_type = CONFIG_QX_NAME_cell_zangwu; - alignErr.qx_name = CONFIG_QX_NAME_Names[CONFIG_QX_NAME_cell_zangwu]; + alignErr.nconfig_qx_type = CONFIG_QX_NAME_cell_other; + alignErr.qx_name = CONFIG_QX_NAME_Names[CONFIG_QX_NAME_cell_other]; alignErr.grayDis = diff_align; // 记录内外边缘夹角（度） alignErr.detRegionidxList.push_back(0); @@ -1516,7 +1516,7 @@ int ImgCheckAnalysisy::AI_QX_Class_Thread() ERROR_DOTS_BLOB_DATA *pblob = &blobs.blobTab[submitted]; if (pblob->ErrType == ERR_TYPE_2) { - pblob->AIclasstype = CONFIG_QX_NAME_cell_ymhs; + pblob->AIclasstype = CONFIG_QX_NAME_cell_YiWu; submitted++; completed++; continue; @@ -1563,47 +1563,39 @@ int ImgCheckAnalysisy::AI_QX_Class_Thread() switch (temClass) { case 0: - cls_num = AI_CLass_QX_NAME_aotudian; + cls_num = AI_CLass_QX_NAME_PIN_PoSun; break; case 1: - cls_num = AI_CLass_QX_NAME_other; + cls_num = AI_CLass_QX_NAME_PIN_QueShi; break; case 2: - cls_num = AI_CLass_QX_NAME_line; + cls_num = AI_CLass_QX_NAME_BTB_DuanLie; break; case 3: - cls_num = AI_CLass_QX_NAME_zangwu; + cls_num = AI_CLass_QX_NAME_LianXi; break; case 4: - cls_num = AI_CLass_QX_NAME_dianzhuang; + cls_num = AI_CLass_QX_NAME_QueXi; break; case 5: - cls_num = AI_CLass_QX_NAME_posun; + cls_num = AI_CLass_QX_NAME_YiWu; break; case 6: - cls_num = AI_CLass_QX_NAME_xianwei; + cls_num = AI_CLass_QX_NAME_C_BianXing; break; case 7: - cls_num = AI_CLass_QX_NAME_shuizi; - break; - - case 8: - cls_num = AI_CLass_QX_NAME_danban; - break; - - case 9: - cls_num = AI_CLass_QX_NAME_fuchen; + cls_num = AI_CLass_QX_NAME_other; break; default: - cls_num = AI_CLass_QX_NAME_zangwu; + cls_num = AI_CLass_QX_NAME_other; break; } @@ -1836,38 +1828,32 @@ int ImgCheckAnalysisy::DrawResult_Step_1() int ImgCheckAnalysisy::AIClassTypeToConfigType(int nAIQXType) { - int resultError_type = CONFIG_QX_NAME_cell_aotudian; + int resultError_type = CONFIG_QX_NAME_cell_other; switch (nAIQXType) { - case AI_CLass_QX_NAME_aotudian: - resultError_type = CONFIG_QX_NAME_cell_aotudian; + case AI_CLass_QX_NAME_PIN_PoSun: + resultError_type = CONFIG_QX_NAME_cell_PIN_PoSun; break; - case AI_CLass_QX_NAME_other: - resultError_type = CONFIG_QX_NAME_cell_other; - break; - case AI_CLass_QX_NAME_line: - resultError_type = CONFIG_QX_NAME_cell_line; + case AI_CLass_QX_NAME_PIN_QueShi: + resultError_type = CONFIG_QX_NAME_cell_PIN_QueShi; break; - case AI_CLass_QX_NAME_zangwu: - resultError_type = CONFIG_QX_NAME_cell_zangwu; + case AI_CLass_QX_NAME_BTB_DuanLie: + resultError_type = CONFIG_QX_NAME_cell_BTB_DuanLie; break; - case AI_CLass_QX_NAME_dianzhuang: - resultError_type = CONFIG_QX_NAME_cell_dianzhuang; + case AI_CLass_QX_NAME_LianXi: + resultError_type = CONFIG_QX_NAME_cell_LianXi; break; - case AI_CLass_QX_NAME_posun: - resultError_type = CONFIG_QX_NAME_cell_posun; + case AI_CLass_QX_NAME_QueXi: + resultError_type = CONFIG_QX_NAME_cell_QueXi; break; - case AI_CLass_QX_NAME_xianwei: - resultError_type = CONFIG_QX_NAME_cell_xianwei; + case AI_CLass_QX_NAME_YiWu: + resultError_type = CONFIG_QX_NAME_cell_YiWu; break; - case AI_CLass_QX_NAME_shuizi: - resultError_type = CONFIG_QX_NAME_cell_shuizi; + case AI_CLass_QX_NAME_C_BianXing: + resultError_type = CONFIG_QX_NAME_cell_C_BianXing; break; - case AI_CLass_QX_NAME_danban: - resultError_type = CONFIG_QX_NAME_cell_danban; - break; - case AI_CLass_QX_NAME_fuchen: - resultError_type = CONFIG_QX_NAME_cell_fuchen; + case AI_CLass_QX_NAME_other: + resultError_type = CONFIG_QX_NAME_cell_other; break; default: break; @@ -1988,8 +1974,8 @@ int ImgCheckAnalysisy::Pin_Qx_Det(const cv::Mat &img) int shortSide = (r.width < r.height) ? r.width : r.height; pinErr.flen = longSide * m_fImgage_Scale_X; pinErr.fbreadth = shortSide * m_fImgage_Scale_Y; - pinErr.nconfig_qx_type = CONFIG_QX_NAME_cell_ymhs; - pinErr.qx_name = CONFIG_QX_NAME_Names[CONFIG_QX_NAME_cell_ymhs]; + pinErr.nconfig_qx_type = CONFIG_QX_NAME_cell_PIN_QueShi; + pinErr.qx_name = CONFIG_QX_NAME_Names[CONFIG_QX_NAME_cell_PIN_QueShi]; pinErr.detRegionidxList.push_back(0); pinErr.detlog->AddCheckstr(PrintLevel_1, DET_LOG_LEVEL_3, "Pin Check", "pin %d center(%d,%d) %s", diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index 5b57582..71a51c1 100644 --- a/ConfigModule/include/CheckConfigDefine.h +++ b/ConfigModule/include/CheckConfigDefine.h @@ -39,35 +39,27 @@ static const std::string WHITE_BLCAK_Names[] = // 检测缺陷的种类 enum CONFIG_QX_NAME_ { - CONFIG_QX_NAME_cell_aotudian, // 分类 凹凸点 - CONFIG_QX_NAME_cell_other, // 分类 其他 - CONFIG_QX_NAME_cell_line, // 分类 线状 - CONFIG_QX_NAME_cell_zangwu, // 分类 脏污 - CONFIG_QX_NAME_cell_edge, // 分类 边缘 - CONFIG_QX_NAME_cell_ymhs, // 分类 异物 - CONFIG_QX_NAME_cell_dianzhuang, // 分类 点状 - CONFIG_QX_NAME_cell_posun, // 分类 破损 - CONFIG_QX_NAME_cell_xianwei, // 分类 纤维 - CONFIG_QX_NAME_cell_shuizi, // 分类 水渍 - CONFIG_QX_NAME_cell_danban, // 分类 淡斑 - CONFIG_QX_NAME_cell_fuchen, // 分类 浮尘 + CONFIG_QX_NAME_cell_PIN_PoSun, // 分类 PIN破损 + CONFIG_QX_NAME_cell_PIN_QueShi, // 分类 PIN缺失 + CONFIG_QX_NAME_cell_BTB_DuanLie, // 分类 BTB断裂 + CONFIG_QX_NAME_cell_LianXi, // 分类 连锡 + CONFIG_QX_NAME_cell_QueXi, // 分类 缺锡 + CONFIG_QX_NAME_cell_YiWu, // 分类 异物 + CONFIG_QX_NAME_cell_C_BianXing, // 分类 C型卡口异常 + CONFIG_QX_NAME_cell_other, // 分类 其他 CONFIG_QX_NAME_count, }; // 缺陷项对应在参数中的名称 static std::vector CONFIG_QX_NAME_Names = { - "aotudian", + "PIN_PoSun", + "PIN_QueShi", + "BTB_DuanLie", + "LianXi", + "QueXi", + "YiWu", + "C_BianXing", "other", - "line", - "zangwu", - "edge", - "ymhs", - "dianzhuang", - "posun", - "xianwei", - "shuizi", - "danban", - "fuchen", }; // 分析类型 diff --git a/ConfigModule/src/ConfigManager.cpp b/ConfigModule/src/ConfigManager.cpp index 047864e..f28263d 100644 --- a/ConfigModule/src/ConfigManager.cpp +++ b/ConfigModule/src/ConfigManager.cpp @@ -25,18 +25,14 @@ std::vector m_FlawCodeList; std::vector QX_Result_Names = { "OK", - "aotudian", + "PIN_PoSun", + "PIN_QueShi", + "BTB_DuanLie", + "LianXi", + "QueXi", + "YiWu", + "C_BianXing", "other", - "line", - "zangwu", - "edge", - "ymhs", - "dianzhuang", - "posun", - "xianwei", - "shuizi", - "danban", - "fuchen", }; std::vector QX_Result_Code = { @@ -44,15 +40,11 @@ std::vector QX_Result_Code = "MA507", "MA508", "MA506", - "MA504", + "MA504", "MA503", "MA502", "MA505", "MA501", - "P0001", - "P0002", - "P0003", - "P0004", }; int ReadFlawCodeConfig(std::string json_path) diff --git a/ConfigModule/src/JsonConfig.cpp b/ConfigModule/src/JsonConfig.cpp index 3e75448..b1f37cc 100644 --- a/ConfigModule/src/JsonConfig.cpp +++ b/ConfigModule/src/JsonConfig.cpp @@ -862,125 +862,85 @@ int BaseFuntonConfigJson::GetFunction(Json::Value value) _config.bigNG.bOpen = value_f["isOpen"].asBool(); if (_config.bigNG.bOpen) { - if (value_f["form"]["aotudian"]["open"]) + if (value_f["form"]["PIN_PoSun"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_aotudian].bOpen = value_f["form"]["aotudian"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_PIN_PoSun].bOpen = value_f["form"]["PIN_PoSun"]["open"].asBool(); } - if (value_f["form"]["aotudian"]["Area"]) + if (value_f["form"]["PIN_PoSun"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_aotudian].fArea = value_f["form"]["aotudian"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_PIN_PoSun].fArea = value_f["form"]["PIN_PoSun"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_aotudian].strname = "aotudian"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_PIN_PoSun].strname = "PIN_PoSun"; - if (value_f["form"]["other"]["open"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_other].bOpen = value_f["form"]["other"]["open"].asBool(); - } - if (value_f["form"]["other"]["Area"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_other].fArea = value_f["form"]["other"]["Area"].asFloat(); - } - _config.bigNG.qx[CONFIG_QX_NAME_cell_other].strname = "other"; - - if (value_f["form"]["line"]["open"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_line].bOpen = value_f["form"]["line"]["open"].asBool(); - } - if (value_f["form"]["line"]["Area"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_line].fArea = value_f["form"]["line"]["Area"].asFloat(); - } - _config.bigNG.qx[CONFIG_QX_NAME_cell_line].strname = "line"; - - if (value_f["form"]["zangwu"]["open"]) + if (value_f["form"]["PIN_QueShi"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_zangwu].bOpen = value_f["form"]["zangwu"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_PIN_QueShi].bOpen = value_f["form"]["PIN_QueShi"]["open"].asBool(); } - if (value_f["form"]["zangwu"]["Area"]) + if (value_f["form"]["PIN_QueShi"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_zangwu].fArea = value_f["form"]["zangwu"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_PIN_QueShi].fArea = value_f["form"]["PIN_QueShi"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_zangwu].strname = "zangwu"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_PIN_QueShi].strname = "PIN_QueShi"; - if (value_f["form"]["edge"]["open"]) + if (value_f["form"]["BTB_DuanLie"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_edge].bOpen = value_f["form"]["edge"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_BTB_DuanLie].bOpen = value_f["form"]["BTB_DuanLie"]["open"].asBool(); } - if (value_f["form"]["edge"]["Area"]) + if (value_f["form"]["BTB_DuanLie"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_edge].fArea = value_f["form"]["edge"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_BTB_DuanLie].fArea = value_f["form"]["BTB_DuanLie"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_edge].strname = "edge"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_BTB_DuanLie].strname = "BTB_DuanLie"; - if (value_f["form"]["ymhs"]["open"]) + if (value_f["form"]["LianXi"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_ymhs].bOpen = value_f["form"]["ymhs"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_LianXi].bOpen = value_f["form"]["LianXi"]["open"].asBool(); } - if (value_f["form"]["ymhs"]["Area"]) + if (value_f["form"]["LianXi"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_ymhs].fArea = value_f["form"]["ymhs"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_LianXi].fArea = value_f["form"]["LianXi"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_ymhs].strname = "ymhs"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_LianXi].strname = "LianXi"; - if (value_f["form"]["dianzhuang"]["open"]) + if (value_f["form"]["QueXi"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_dianzhuang].bOpen = value_f["form"]["dianzhuang"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_QueXi].bOpen = value_f["form"]["QueXi"]["open"].asBool(); } - if (value_f["form"]["dianzhuang"]["Area"]) + if (value_f["form"]["QueXi"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_dianzhuang].fArea = value_f["form"]["dianzhuang"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_QueXi].fArea = value_f["form"]["QueXi"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_dianzhuang].strname = "dianzhuang"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_QueXi].strname = "QueXi"; - if (value_f["form"]["posun"]["open"]) + if (value_f["form"]["YiWu"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_posun].bOpen = value_f["form"]["posun"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_YiWu].bOpen = value_f["form"]["YiWu"]["open"].asBool(); } - if (value_f["form"]["posun"]["Area"]) + if (value_f["form"]["YiWu"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_posun].fArea = value_f["form"]["posun"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_YiWu].fArea = value_f["form"]["YiWu"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_posun].strname = "posun"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_YiWu].strname = "YiWu"; - if (value_f["form"]["xianwei"]["open"]) + if (value_f["form"]["C_BianXing"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_xianwei].bOpen = value_f["form"]["xianwei"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_C_BianXing].bOpen = value_f["form"]["C_BianXing"]["open"].asBool(); } - if (value_f["form"]["xianwei"]["Area"]) + if (value_f["form"]["C_BianXing"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_xianwei].fArea = value_f["form"]["xianwei"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_C_BianXing].fArea = value_f["form"]["C_BianXing"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_xianwei].strname = "xianwei"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_C_BianXing].strname = "C_BianXing"; - if (value_f["form"]["shuizi"]["open"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_shuizi].bOpen = value_f["form"]["shuizi"]["open"].asBool(); - } - if (value_f["form"]["shuizi"]["Area"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_shuizi].fArea = value_f["form"]["shuizi"]["Area"].asFloat(); - } - _config.bigNG.qx[CONFIG_QX_NAME_cell_shuizi].strname = "shuizi"; - - if (value_f["form"]["danban"]["open"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_danban].bOpen = value_f["form"]["danban"]["open"].asBool(); - } - if (value_f["form"]["danban"]["Area"]) - { - _config.bigNG.qx[CONFIG_QX_NAME_cell_danban].fArea = value_f["form"]["danban"]["Area"].asFloat(); - } - _config.bigNG.qx[CONFIG_QX_NAME_cell_danban].strname = "danban"; - - if (value_f["form"]["fuchen"]["open"]) + if (value_f["form"]["other"]["open"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_fuchen].bOpen = value_f["form"]["fuchen"]["open"].asBool(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_other].bOpen = value_f["form"]["other"]["open"].asBool(); } - if (value_f["form"]["fuchen"]["Area"]) + if (value_f["form"]["other"]["Area"]) { - _config.bigNG.qx[CONFIG_QX_NAME_cell_fuchen].fArea = value_f["form"]["fuchen"]["Area"].asFloat(); + _config.bigNG.qx[CONFIG_QX_NAME_cell_other].fArea = value_f["form"]["other"]["Area"].asFloat(); } - _config.bigNG.qx[CONFIG_QX_NAME_cell_fuchen].strname = "fuchen"; + _config.bigNG.qx[CONFIG_QX_NAME_cell_other].strname = "other"; } else {