From f59e175aeaf72a0be084c161d80b3378fe293517 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Mon, 8 May 2023 08:52:42 +0800
Subject: [PATCH] fix adding range bug

---
 pc/code_twain/sln/hgjson/DlgRange.cpp        |  20 +++++++++++++++----
 pc/code_twain/sln/hgjson/hgjson.rc           | Bin 57184 -> 57224 bytes
 pc/code_twain/sln/hgjson/hgjsonDlg.cpp       |   6 +++---
 pc/code_twain/sln/usb_tools/Debug/hgjson.exe | Bin 1751040 -> 1751040 bytes
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pc/code_twain/sln/hgjson/DlgRange.cpp b/pc/code_twain/sln/hgjson/DlgRange.cpp
index a976fb7..72ba2c0 100644
--- a/pc/code_twain/sln/hgjson/DlgRange.cpp
+++ b/pc/code_twain/sln/hgjson/DlgRange.cpp
@@ -93,7 +93,7 @@ BOOL CDlgRange::OnInitDialog()
 }
 
 BEGIN_MESSAGE_MAP(CDlgRange, CDialogEx)
-	ON_BN_CLICKED(IDC_BUTTON1, &CDlgRange::OnBnClickedButton1)
+	ON_BN_CLICKED(IDC_BUTTON_ADD, &CDlgRange::OnBnClickedButton1)
 	ON_BN_CLICKED(IDOK, &CDlgRange::OnBnClickedOk)
 	ON_NOTIFY(NM_DBLCLK, IDC_LIST1, &CDlgRange::OnNMDblclkList1)
 	ON_CBN_SELCHANGE(IDC_COMBO_FIELD, &CDlgRange::OnCbnSelchangeComboField)
@@ -107,20 +107,32 @@ void CDlgRange::OnBnClickedButton1()
 {
 	// TODO: 在此添加控件通知处理程序代码
 	std::wstring val(get_item_text(IDC_EDIT_VAL));
+	int	ind = -1;
 
+	if (val.empty())
+	{
+		MessageBox(TEXT("NO Input!"));
+		return;
+	}
 	for (int i = 0; i < list_.GetItemCount(); ++i)
 	{
 		wchar_t	buf[25] = { 0 };
 		list_.GetItemText(i, 0, buf, _countof(buf) - 1);
 		if (val == buf)
 		{
-			list_.SetItemState(i, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
+			list_.SetItemState(i, LVIS_FOCUSED | LVIS_SELECTED | LVIS_ACTIVATING, LVIS_FOCUSED | LVIS_SELECTED | LVIS_ACTIVATING);
 			list_.SetSelectionMark(i);
-			return;
+			ind = i;
+			break;
 		}
 	}
 
-	list_.InsertItem(list_.GetItemCount(), val.c_str());
+	if(ind == -1)
+		ind = list_.InsertItem(list_.GetItemCount(), val.c_str());
+
+	list_.SetItemState(ind, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
+	list_.SetSelectionMark(ind);
+	list_.EnsureVisible(ind, FALSE);
 }
 
 
diff --git a/pc/code_twain/sln/hgjson/hgjson.rc b/pc/code_twain/sln/hgjson/hgjson.rc
index 8b4b9ed24af24250c03b03b342053bba6ca75dd6..6a00bf7df55dfac1d8d7634a9230b37d4f90a71e 100644
GIT binary patch
delta 22
ecmaE`kGW$%^M-H1lcUxsOn$XYVKZMyP&WXC&kEB3

delta 14
VcmeC!&-`E?^M-H1o8>~Xx&b!&2LAv6

diff --git a/pc/code_twain/sln/hgjson/hgjsonDlg.cpp b/pc/code_twain/sln/hgjson/hgjsonDlg.cpp
index 6f26202..d064bb0 100644
--- a/pc/code_twain/sln/hgjson/hgjsonDlg.cpp
+++ b/pc/code_twain/sln/hgjson/hgjsonDlg.cpp
@@ -124,17 +124,17 @@ namespace coding
 	std::wstring name_from_depend_exp(const std::wstring& depend_exp)
 	{
 		std::wstring	name(L"");
-		size_t			pos = depend_exp.find(L"=");
+		size_t			pos = depend_exp.find(L"!");
 
 		if (pos == std::wstring::npos)
 		{
-			pos = depend_exp.find(L"!");
+			pos = depend_exp.find(L"<");
 			if (pos == std::wstring::npos)
 			{
 				pos = depend_exp.find(L">");
 				if (pos == std::wstring::npos)
 				{
-					pos = depend_exp.find(L"<");
+					pos = depend_exp.find(L"=");
 				}
 			}
 		}
diff --git a/pc/code_twain/sln/usb_tools/Debug/hgjson.exe b/pc/code_twain/sln/usb_tools/Debug/hgjson.exe
index b7d3753828ac8d1fb155c3054f72b897e6fa95ff..0128b72e2119d435cb78a45d76597c530016c38e 100644
GIT binary patch
delta 970
zcmY+Bdq`7J9LLYucBeNrAM;KZCZ;{@!73ulHv6MX4^yv|)<5MiwROu7QF?%GI&H-m
z2@(g*NJ*T*#3JwvwOG3Hj|xMG3KB9aCMro(3Rk@S=7aRY2fpWbzQ4!$UF(!+of02M
zVCAvHXX-V$0sns5f%_tr+j~{EQjNV-g8>Dgq@^0wj^6kj$Al=Go%hb6f))gyP&IJ`
zBXlzNbhh)^Wis_8Tt^<os6$AngJCVnHIi&zt3t@h`vgaZ-~Ts7k_Y(NK;{7Nk>PV@
z`24RgNpg6Xx7J&>K|~@lf9}ph0rzhEynD%Z>V_nb#Y49N-W{kg&N_Iv&5LjIZg5w<
z*bG<xCs1o2@2;?jyF?3e)|NoF;K!#W+2#usV;2J=)OTn9&nmV^^5PW?l<n`a2K>R{
zUGHj#%JgEAm;|i?FIenS3H4S+4nYNo+~z&w%vd2bwN-d5a`~3P`!eAj%aS8t#AU~R
z=mlw_QdBy4&$5d(^G%jVzEnywjK0FvoW5d7JFiRf3CCN($u$i#naF=XpR{DDV)wH-
zl3e9G1uIIO@IMz}*zafii|Q1x$JXIY<b#RhKzl(4R<;XtFX;U8BAP9-7}vk+W9Z8v
z)z*%u*7FGpA|xx+L|e^Rf@a`vnNzAsQ#G?*eW(WxCi1G9`Lm#}kry_mVL{gsQ_YfY
zCvpw*U?J`$t+mY0p!wX7R(s=322cY*wDD%}#x})zH|g8P?obqr(qG%y-Xv@yodSCp
z7ucr-7FY#@&}ku5ZHL(0hfp94SPg^&5kMpmMdv<f8Yyn44R@l`hKbk3#gd*pE}9&-
zaZyxT%q3zn)5htk`3iSy4>7lMp>*~k_f?_ELJ8<7x`IkjIVwZzU_FSuZ{w0kcOIuF
z38S2f=v`3gpo@zmCKqR-A6?w7O-#UPuon(;v~W;skHca1$#E?ZLnp^$<qFKw$&0!R
zS8)N!8PTOjw51NF{zy$cP-JK}xD6fyZ6493D6v33ebeoY)*91{xyHN3Mx)pG(%6&c
NO+$$4zw6!%{R6aRwQT?Z

delta 800
zcmY+AZAepL6vyw~-QAq6d|A)h#IQ_ybBIVUF1H!fs3>U*jXq=!)6z?ch?0=v+|&tU
zWmr791fdrvkt7N|y7^(+EP_H?AA~4KO1Ns`h|;=*x1%o54?p;y^Zftka2|Vvvq!kT
zc$!&=6tt`84mvW>OOGZn_19QumC9A6q5%oOkSdilV;KLLmM#t0FYlAIPmHo;EG$j$
z#g_dN8RL0y374Nz8Ip$hFU1u9@q-|iZI@D%#~iY_^LW0yRlx6`(kTslX^P@I1A?eG
z55{>~DT?B<ILgypCyJs4e1hl<DLGBF!BOtKK`RVs99a$Kj|*b-$&(kd@((9g{4sGa
zCYr<5dXC{3w|Q`7Vbovh6T}UjLOvZvyf*)Zbs~)5+ujJ`+>x0J(K2gN5ZC2@`Ztt5
zShp^l57~3>cNPz-^_->nU_Z9rWHox-6G3bYorFVkzVlNs!9890vP}Y~+QAlrP064;
zL9ZO01^Pbd;+iYi$|-7A{}ZbnY=iuhzlbXP?Z=%CHch4rKye(ua<ISFv<;6q*^V_`
zi)~H+bsH9&*sisH4}RRtF34B2!GO!#!U8ftPP{EKySpVNU-76;ks(QYMt<lN!@KAb
z{M@2ALEBtQ76lLsY$8h*rOXAr<w+&58Q22E0r5ZrkVuv%RbGNC5t5Ux+gtUYvEQwZ
z#la$!iqAMvB2iyQsWk2{LYcU72+2rA1#%pe%`y}<%aFxKh?iiY8ztfF3UD0tp=50H
zAq}qfp%UEVLrR&!0zXBOun*nZ!x};Ebd`=HQaY}7CDSpk`8hSPjm*z!#Cn=0^X1yB
zH|Ts^Fr__B`lhtm41E#LeA6D@v6z!$IAl0xtTVP6?;6#nT+?~eJ(JfIG>w@8xxrj=
MU|Rb&d?!=-50o%&D*ylh