lmh188
/
doc_and_tools
mirror of http://192.168.10.5:8099/sane/doc_and_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复默认值BUG

This commit is contained in:
gb 2023-12-19 11:04:33 +08:00
parent ca96b9ffe9
commit bc5981dc14
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/apps/hgjson/DlgOptJson.cpp
View File

@ -781,9 +781,9 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
known_file_util::JSONMEMW m = child->first_member();
while (m.type != known_file_util::JV_UNKNOWN)
{
if (wcscmp(m.key, L"default") == 0)
cv.cond = "";
else
//if (wcscmp(m.key, L"default") == 0)
// cv.cond = "";
//else
cv.cond = local_trans::u2a(m.key, CP_UTF8);
cv.val = std::string((char*)&m.bool_val, sizeof(m.bool_val));
m = child->next_member();
@ -795,7 +795,7 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
if (!jsn->get_value(L"default", v))
jsn->get_value(L"cur", v);
cv.val = std::string((char*)&v, sizeof(v));
cv.cond = "";
cv.cond = "default";
def_val.push_back(cv);
}
}
@ -810,9 +810,9 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
known_file_util::JSONMEMW m = child->first_member();
while (m.type != known_file_util::JV_UNKNOWN)
{
if (wcscmp(m.key, L"default") == 0)
cv.cond = "";
else
//if (wcscmp(m.key, L"default") == 0)
// cv.cond = "";
//else
cv.cond = local_trans::u2a(m.key, CP_UTF8);
if(m.type == known_file_util::JV_UINT64)
cv.val = std::string((char*)&m.uint64_val, sizeof(m.uint64_val));
@ -828,14 +828,14 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
unsigned long long n64 = 0;
if(jsn->get_value(L"default", n64) || jsn->get_value(L"cur", n64))
{
cv.cond = "";
cv.cond = "default";
cv.val = std::string((char*)&n64, sizeof(n64));
def_val.push_back(cv);
}
}
else
{
cv.cond = "";
cv.cond = "default";
cv.val = std::string((char*)&v, sizeof(v));
def_val.push_back(cv);
}
@ -851,9 +851,9 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
known_file_util::JSONMEMW m = child->first_member();
while (m.type != known_file_util::JV_UNKNOWN)
{
if (wcscmp(m.key, L"default") == 0)
cv.cond = "";
else
//if (wcscmp(m.key, L"default") == 0)
// cv.cond = "";
//else
cv.cond = local_trans::u2a(m.key, CP_UTF8);
cv.val = std::string((char*)&m.double_val, sizeof(m.double_val));
m = child->next_member();
@ -865,7 +865,7 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
if (!jsn->get_value(L"default", v))
jsn->get_value(L"cur", v);
cv.val = std::string((char*)&v, sizeof(v));
cv.cond = "";
cv.cond = "default";
def_val.push_back(cv);
}
}
@ -880,9 +880,9 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
known_file_util::JSONMEMW m = child->first_member();
while (m.type != known_file_util::JV_UNKNOWN)
{
if (wcscmp(m.key, L"default") == 0)
cv.cond = "";
else
//if (wcscmp(m.key, L"default") == 0)
// cv.cond = "";
//else
cv.cond = local_trans::u2a(m.key, CP_UTF8);
cv.val = std::string((const char*)m.str_val, lstrlenW(m.str_val) * 2 + 2);
m = child->next_member();
@ -895,7 +895,7 @@ bool CDlgOptJson::SANEOPT::from_json(known_file_util::IJsonW* jsn)
jsn->get_value(L"cur", &strv);
if(strv)
cv.val = std::string((const char*)strv, lstrlenW(strv) * 2 + 2);
cv.cond = "";
cv.cond = "default";
def_val.push_back(cv);
}
}

BIN
tools/solution/Release/hgjson.exe
View File

Binary file not shown.