20240703，1、控制功能及页面调整；2、通信设置页面调整

Src/CH91PayloadSoftware/DlgWHTJDCNew.cpp

@@ -48,6 +48,8 @@ DlgWHTJDCNew::DlgWHTJDCNew(CWnd* pParent /*=NULL*/)
 	, m_DirSCanSetRange(_T(""))
 	, m_PitchSCanSetCentre(_T(""))
 	, m_PitchSCanSetRange(_T(""))
+	, m_SCanModelRange(_T(""))
+	, m_SCanModelSpeed(_T(""))
 {
 	CharacterSuperpositionSet = 0;
 	FogThroughMode = 0;
@@ -108,6 +110,7 @@ void DlgWHTJDCNew::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_BTN_WHTJDC_NEW43, DC13InsBtn[42]);
 	DDX_Control(pDX, IDC_BTN_WHTJDC_NEW44, DC13InsBtn[43]);
 	DDX_Control(pDX, IDC_BTN_WHTJDC_NEW45, DC13InsBtn[44]);
+	DDX_Control(pDX, IDC_BTN_WHTJDC_NEW46, DC13InsBtn[45]);
 	//DDX_Text(pDX, IDC_EDIT_Pitch_Param, Param1);
 
 	//DDX_Text(pDX, IDC_EDIT_Dir_Param, Param2);
@@ -137,6 +140,8 @@ void DlgWHTJDCNew::DoDataExchange(CDataExchange* pDX)
 	DDX_Text(pDX, IDC_EDIT_WHTD_9, m_DirSCanSetRange);
 	DDX_Text(pDX, IDC_EDIT_WHTD_10, m_PitchSCanSetCentre);
 	DDX_Text(pDX, IDC_EDIT_WHTD_11, m_PitchSCanSetRange);
+	DDX_Text(pDX, IDC_EDIT_WHTD_12, m_SCanModelRange);
+	DDX_Text(pDX, IDC_EDIT_WHTD_13, m_SCanModelSpeed);
 }
 
 BOOL DlgWHTJDCNew::OnInitDialog()
@@ -148,7 +153,7 @@ BOOL DlgWHTJDCNew::OnInitDialog()
 
 	CFont m_oFont;//字体
 	m_oFont.CreatePointFont(80, _T("Times New Roman"),NULL);
-	for(int i = 0;i<45;++i)
+	for(int i = 0;i<46;++i)
 	{
 		//DC13InsBtn[i].SetTextColor(RGB(255,255,255));
 		//DC13InsBtn[i].SetFont(&m_oFont);
@@ -219,6 +224,15 @@ BOOL DlgWHTJDCNew::OnInitDialog()
 	pWnd12->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);//垂直下视

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);		//吊舱行为控制

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);