From dfb0ae6fd794216bb77bb74f45afdb5fd7636d7c Mon Sep 17 00:00:00 2001 From: CaoYuHui <1152604503@qq.com> Date: Wed, 3 Jul 2024 17:14:45 +0800 Subject: [PATCH] =?UTF-8?q?20240703=EF=BC=8C1=E3=80=81=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E9=80=9A=E4=BF=A1=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CH91PayloadSoftware.rc | Bin 82190 -> 83328 bytes Src/CH91PayloadSoftware/DlgWHTJDCNew.cpp | 69 +++++++++++++++++- Src/CH91PayloadSoftware/DlgWHTJDCNew.h | 9 ++- .../MulticastSocketReceiveDlg.cpp | 6 +- Src/CH91PayloadSoftware/resource.h | Bin 77340 -> 77800 bytes 5 files changed, 81 insertions(+), 3 deletions(-) diff --git a/Src/CH91PayloadSoftware/CH91PayloadSoftware.rc b/Src/CH91PayloadSoftware/CH91PayloadSoftware.rc index 7333b33702c1fd17fb896e4ae5325a8ac6b5fbc2..a06d6a73569394d8fa3477bf4e6d06a2db489723 100644 GIT binary patch delta 1855 zcmZWpZA_b06uy_f)k66yUxm3LRAS0R===8VR{{evnQ=x2l<_s7rC0_g!!BfTa{*yS zjWaH@C!=cofyTwSggMhJBu35tnD~Pz_=_J45;3|NL&lWN!Wf=&-?xKl2yO3k&VBAV z&w1`Wcg8sWj`7O5Lq?T(m=j9Bl3`!Y7<_*qC*Imr!OdRgWfe?eF6M*z&LS9ZvBm5r zUJSo9kEN>r30=-|BjRKZCW~(uthVOT7Kr#?P1RxwbHl2CRbRQ7f~z8^v?|~}T&6SP zq0o2u#|+{pHXnY=@J+21GG!IsY*R#@lVX^+A0oTbp=qd4uynNB^(b-gjNWP=NOcKD z5A#5v<8`w~FgvkxS{K2}J{#COKS_09R_MjFD4bvo^ypgA&eMT_UbBj){~Q<!>yKURcZaEB3*HeysCm+hm49*Y ziTI77Z-)&s^Tj`3fHau9T>+706G}&pSD80HvHYDO!;Rz6s*;%!Z~pysipaco(}dF? zr(-76u9ZXZHydQ0+znHI7R1l~5t7hqIK24kibcX3;Snmy`00g-<>%uae=Tw}3Q6Zf zxoX#rTI8MY|;wrk(d_43ROkHXN$DKMeT0z(nD}jlG53by)%h<-yIKUGlFnsqB zY=Rn=(K?%VM_}avf|f<(6b_AgqRa8xKc}#c9oboAd@7ePE#CuUdu(t$kp_;uT^M%= ziDa#PSe?#=%76{3mkXgWm}#XrJtUfHXaf9A*Xa13Dv10o!KL+LA&7P+UQw7|??f?a z4|0OM;m>gD3Sg&L1T2=@zwwR{CH5 zHk!<*7v`lz+J$j0nZEXJ;}L*XKU{dNvy=)2(e6wg2ToZ6-5WMa9T9_83N=jmCx zy!yeyP!>%u6kVV@Op@}`+Yp@IZBDXj^VCENZWbE}_v&@*h1uJA3m=l}@Cs|**CvlTfaOprbT4GjbQ!p6HaclcvF0@X)TEi4;Koql%wi^2 XCA{EDY(9(U$5t%7V5TmY|M2v`-m>I2 delta 1535 zcmZ`&T}WI<6rM4=S=P<6m~`EZbr-Yvpwz_sxA)$qX-r8f)KH?vpJ?j8(IlWHNFNL+ zNlNq3TBALc3#Bgxl0cy}_F|>bZS}2$2<=-XkVKFolr|Q`+PY18&dfE5l(OvX&NnmX zeCIpgx%{Dj{Hp)X_({LUOlCoN@0ajH^b4=DYDIqI9rHO`J;&xjGs@zt@a|1waPRv zTQwrG0}7}eZK7_9<#cp_Qsd(aJna~vf7m=?@P6lr&_lyY(r~>i4M)4GcOWCdv|vl( zCwgY#Zg&lKnfN2(CVKYsXBRZ6>Yd)Pv!LW`O#uZ!(Qq|HA5pSc6?}WPEUe;QmZ+dO zlgHkK;^sKi_N5Z#E%&eIH>g){_n7qunbO?tEM013$5|~anpg%k_j1tiqUtc+cQd47 zobAGAzK;r#uJxDs2{&M-zY7aiP^Rqp7<5ih%j3{@u2h`s@X@)U|KTFVt_X_Pm{Etw z$#OS$;k&_I7PH*!668bcRvbE4N>LW7F^xjo;j)aLLrN2<6Ric-69u!S$v zVj!uc$v+1oRG#IvjEGQdawbg+ok`4sAOEh%t7Oh#fG2T)=?1xlq|u-)_g0i*&|WYQ ztA(sCCMscV-3NEKlE_~dnQh2E@umw;@|WTv%4P~~wsVp57!2kP3n3_&0&}_7U?Nu( zwJ{kbCKLt26$_#iZtFiyT*yhYOf!&uG87U@VV3 ztVsw*&@fgax3aIKeM+#uvltIQ*UC#Gyzi9wc(?QQVO}SetFont(&m_font2); GetDlgItem(IDC_EDIT_WHTD_11)->SetWindowText("50"); + CWnd* pWnd13 = GetDlgItem(IDC_EDIT_WHTD_12); + pWnd13->SetFont(&m_font2); + GetDlgItem(IDC_EDIT_WHTD_12)->SetWindowText("100"); + + CWnd* pWnd14 = GetDlgItem(IDC_EDIT_WHTD_13); + pWnd14->SetFont(&m_font2); + GetDlgItem(IDC_EDIT_WHTD_13)->SetWindowText("5"); + + ((CComboBox * )GetDlgItem(IDC_COMBO_TJDC_1))->InsertString(0,_TEXT("自定义大小")); ((CComboBox * )GetDlgItem(IDC_COMBO_TJDC_1))->InsertString(1,_TEXT("小模版(16*16)")); ((CComboBox * )GetDlgItem(IDC_COMBO_TJDC_1))->InsertString(2,_TEXT("中模版(32*32)")); @@ -397,6 +411,9 @@ afx_msg LRESULT DlgWHTJDCNew::OnUpdateWHTJDCFrame(WPARAM wParam, LPARAM lParam) case 45: UpdateFrame45((int&)lParam); break; + case 46: + UpdataFrame46((int&)lParam); + break; case 100: UpdateFrame100((int&)lParam); break; @@ -689,6 +706,12 @@ void DlgWHTJDCNew::UpdateWHTJDCCmdBuffer(HWND hwnd) hCheckThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)ThreadWHTJDCNew, NULL, 0, &ThreadCheckIDRegion);//开启线程 CloseHandle(hCheckThread); } + if(hwnd ==GetDlgItem(IDC_BTN_WHTJDC_NEW46)->m_hWnd) + { + g_WHTJDCCmdNum = 46; + hCheckThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)ThreadWHTJDCNew, NULL, 0, &ThreadCheckIDRegion);//开启线程 + CloseHandle(hCheckThread); + } } void DlgWHTJDCNew::UpdateDataZ70_TJDC() { @@ -1651,6 +1674,50 @@ void DlgWHTJDCNew::UpdateFrame45(int &sendEnd) } } +//扫描设置 130吊舱 +void DlgWHTJDCNew::UpdataFrame46(int &sendEnd) +{ + if(sendEnd==0) + { + if(!UpdateData(TRUE))//更新对话框对应的变量内容 + { + MessageBox(_T("请输入正确数据！！！")); + return; + } + if(!IsPositiveInteger(m_SCanModelRange)||!IsPositiveInteger(m_SCanModelSpeed)) + { + MessageBox(_T("请输入正整数！")); + return; + } + UINT16 SCanModelRange,SCanModelSpeed; + SCanModelRange = _ttoi(m_SCanModelRange); + SCanModelSpeed = _ttoi(m_SCanModelSpeed); + if(SCanModelRange<0||SCanModelRange>360) + { + MessageBox(_T("扫描角度设置范围[0,360]！")); + return; + } + if(SCanModelSpeed<0||SCanModelSpeed>100) + { + MessageBox(_T("扫描速度设置范围[0,100]！")); + return; + } + TJDCCmdBuffer[0]=0x02; + TJDCCmdBuffer[1]=0x79; + TJDCCmdBuffer[2]=SCanModelRange; + TJDCCmdBuffer[3]=SCanModelRange>>8; + TJDCCmdBuffer[4]=SCanModelSpeed; + TJDCCmdBuffer[5]=SCanModelSpeed>>8; + UpdateDataZ70_TJDC(); + g_bBindData = true; + } + else + { + g_bBindData = false; + } +} + + void DlgWHTJDCNew::UpdateFrame100(int &sendEnd) { UpdateFrame28(sendEnd);//垂直下视 diff --git a/Src/CH91PayloadSoftware/DlgWHTJDCNew.h b/Src/CH91PayloadSoftware/DlgWHTJDCNew.h index 09f1aa7..d27b969 100644 --- a/Src/CH91PayloadSoftware/DlgWHTJDCNew.h +++ b/Src/CH91PayloadSoftware/DlgWHTJDCNew.h @@ -28,7 +28,7 @@ protected: public: CCMDBtn m_DCFlyCmd[12]; - CMFCButton DC13InsBtn[45]; + CMFCButton DC13InsBtn[46]; BYTE TJDCCmdBuffer[15]; public: UINT8 SwitchCmd; //开关指令 @@ -54,6 +54,10 @@ public: CString m_PitchSCanSetCentre;//俯仰扫描设置 中心 CString m_PitchSCanSetRange;//俯仰扫描设置 范围 int FocalDistanceSIZE;//调焦/变倍等级（1-7） + + CString m_SCanModelRange;//扫描范围设置130吊舱 + CString m_SCanModelSpeed;//扫描速度设置130吊舱 + public: void UpdateWHTJDCCmdBuffer(HWND);//更新控制指令到吊舱协议 void DlgWHTJDCNew::UpdateDataZ70_TJDC();//更新数据注入指令Z70 @@ -104,6 +108,9 @@ public: void UpdateFrame44(int&); //俯仰扫描设置 void UpdateFrame45(int&); //自动调焦 + + void UpdataFrame46(int&); //吊舱扫描设置130吊舱 + void UpdateFrame100(int&); //吊舱行为1 void UpdateFrame101(int&); //吊舱行为2 void UpdateTJDCAction(int); //吊舱行为控制 diff --git a/Src/CH91PayloadSoftware/MulticastSocketReceiveDlg.cpp b/Src/CH91PayloadSoftware/MulticastSocketReceiveDlg.cpp index 7d365f2..906afaf 100644 --- a/Src/CH91PayloadSoftware/MulticastSocketReceiveDlg.cpp +++ b/Src/CH91PayloadSoftware/MulticastSocketReceiveDlg.cpp @@ -156,7 +156,11 @@ BOOL CMulticastSocketReceiveDlg::OnInitDialog() m_WHTJCmdUDPLocalPort = atoi( inBuf ); UpdateData(false); - + CRect m_RectShow,m_RectShow2; //显示部分的面积区域 + GetWindowRect(&m_RectShow); + GetDlgItem(IDC_STATIC_PART_AER)->GetWindowRect(&m_RectShow2); + m_RectShow.bottom = m_RectShow2.top; + SetWindowPos(NULL, 0, 0, m_RectShow.Width(), m_RectShow.Height(),SWP_NOMOVE|SWP_NOZORDER); diff --git a/Src/CH91PayloadSoftware/resource.h b/Src/CH91PayloadSoftware/resource.h index cefc0fe330942ad4cb4db62b6b22d5a876c5993a..105045aa73a930560bc8b1dbbbe37b2e9b80d4a6 100644 GIT binary patch delta 156 zcmbPphvmh6mWC~i9io%U_?Uwkd?zSx0+BA*Ei^eVg>Cx`QAP!^$y!qsrWZ&sicJ?%V3cFDoIFuSbGn{7BNwCL z