|
@@ -54,6 +54,7 @@ BEGIN_MESSAGE_MAP(CDeviceView, CFormView)
|
|
ON_BN_CLICKED(IDC_CHECK2, &CDeviceView::OnBnClickedCheck2)
|
|
ON_BN_CLICKED(IDC_CHECK2, &CDeviceView::OnBnClickedCheck2)
|
|
ON_CBN_SELCHANGE(IDC_COMBO1, &CDeviceView::OnCbnSelchangeCombo1)
|
|
ON_CBN_SELCHANGE(IDC_COMBO1, &CDeviceView::OnCbnSelchangeCombo1)
|
|
ON_CBN_SELCHANGE(IDC_COMBO2, &CDeviceView::OnCbnSelchangeCombo2)
|
|
ON_CBN_SELCHANGE(IDC_COMBO2, &CDeviceView::OnCbnSelchangeCombo2)
|
|
|
|
+ ON_WM_CREATE()
|
|
END_MESSAGE_MAP()
|
|
END_MESSAGE_MAP()
|
|
|
|
|
|
|
|
|
|
@@ -346,6 +347,7 @@ void CDeviceView::OnInitialUpdate()
|
|
{
|
|
{
|
|
CFormView::OnInitialUpdate();
|
|
CFormView::OnInitialUpdate();
|
|
|
|
|
|
|
|
+ // TODO: 在此添加您专用的创建代码
|
|
ParseJson();
|
|
ParseJson();
|
|
// Ribbon Combobox添加默认项;
|
|
// Ribbon Combobox添加默认项;
|
|
CMFCRibbonBar* pRibbon = g_pMainFrame->GetRibbonBar();
|
|
CMFCRibbonBar* pRibbon = g_pMainFrame->GetRibbonBar();
|
|
@@ -353,7 +355,7 @@ void CDeviceView::OnInitialUpdate()
|
|
CMFCRibbonComboBox* pOcrCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBOX_OCR));
|
|
CMFCRibbonComboBox* pOcrCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBOX_OCR));
|
|
if (pOcrCombo)
|
|
if (pOcrCombo)
|
|
{
|
|
{
|
|
- for ( auto it : m_bdcfg.list_count )
|
|
|
|
|
|
+ for (auto it : m_bdcfg.list_count)
|
|
{
|
|
{
|
|
pOcrCombo->AddItem(it.first.c_str());
|
|
pOcrCombo->AddItem(it.first.c_str());
|
|
}
|
|
}
|
|
@@ -363,7 +365,7 @@ void CDeviceView::OnInitialUpdate()
|
|
}
|
|
}
|
|
|
|
|
|
// 剩余次数;
|
|
// 剩余次数;
|
|
- CMFCRibbonEdit *pOcrCount = DYNAMIC_DOWNCAST(CMFCRibbonEdit, pRibbon->FindByID(ID_EDIT_COUNT));
|
|
|
|
|
|
+ CMFCRibbonEdit* pOcrCount = DYNAMIC_DOWNCAST(CMFCRibbonEdit, pRibbon->FindByID(ID_EDIT_COUNT));
|
|
if (pOcrCount)
|
|
if (pOcrCount)
|
|
{
|
|
{
|
|
pOcrCount->SetEditText(m_bdcfg.reset_time.c_str());
|
|
pOcrCount->SetEditText(m_bdcfg.reset_time.c_str());
|
|
@@ -398,7 +400,7 @@ void CDeviceView::OnInitialUpdate()
|
|
// UI下拉框;
|
|
// UI下拉框;
|
|
CString curText = pChipCombo->GetEditText();
|
|
CString curText = pChipCombo->GetEditText();
|
|
CMFCRibbonComboBox* pStyleCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBO_UI));
|
|
CMFCRibbonComboBox* pStyleCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBO_UI));
|
|
- for ( auto it : m_map_tree.find(curText.GetString())->second )
|
|
|
|
|
|
+ for (auto it : m_map_tree.find(curText.GetString())->second)
|
|
{
|
|
{
|
|
pStyleCombo->AddItem(it.c_str());
|
|
pStyleCombo->AddItem(it.c_str());
|
|
}
|
|
}
|
|
@@ -658,3 +660,80 @@ void CDeviceView::OnCbnSelchangeCombo2()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+// 说明:使用CFormView时,任务初始化动作都应该放在OnCreate中;
|
|
|
|
+// 而非放在OnInitialUpdate中执行,因为OnInitialUpdate可能被调用多次;
|
|
|
|
+int CDeviceView::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|
|
|
+{
|
|
|
|
+ if (CFormView::OnCreate(lpCreateStruct) == -1)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+#if 0
|
|
|
|
+ // TODO: 在此添加您专用的创建代码
|
|
|
|
+ ParseJson();
|
|
|
|
+ // Ribbon Combobox添加默认项;
|
|
|
|
+ CMFCRibbonBar* pRibbon = g_pMainFrame->GetRibbonBar();
|
|
|
|
+ ASSERT_VALID(pRibbon);
|
|
|
|
+ CMFCRibbonComboBox* pOcrCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBOX_OCR));
|
|
|
|
+ if (pOcrCombo)
|
|
|
|
+ {
|
|
|
|
+ for (auto it : m_bdcfg.list_count)
|
|
|
|
+ {
|
|
|
|
+ pOcrCombo->AddItem(it.first.c_str());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 选择默认项;
|
|
|
|
+ pOcrCombo->SetEditText(m_bdcfg.cur_count.c_str());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 剩余次数;
|
|
|
|
+ CMFCRibbonEdit* pOcrCount = DYNAMIC_DOWNCAST(CMFCRibbonEdit, pRibbon->FindByID(ID_EDIT_COUNT));
|
|
|
|
+ if (pOcrCount)
|
|
|
|
+ {
|
|
|
|
+ pOcrCount->SetEditText(m_bdcfg.reset_time.c_str());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 声音等级;
|
|
|
|
+ CMFCRibbonEdit* pSoundLevel = DYNAMIC_DOWNCAST(CMFCRibbonEdit, pRibbon->FindByID(ID_EDIT_SOUND_LEVEL));
|
|
|
|
+ if (pSoundLevel)
|
|
|
|
+ {
|
|
|
|
+ pSoundLevel->SetEditText(m_bdcfg.reset_time.c_str());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 全步骤截图;
|
|
|
|
+// CMFCRibbonCheckBox* pCheckFullCut = DYNAMIC_DOWNCAST(CMFCRibbonCheckBox, pRibbon->FindByID(ID_CHECK_FULL_CUT));
|
|
|
|
+// if (pCheckFullCut)
|
|
|
|
+// {
|
|
|
|
+// pCheckFullCut->SetCheck();
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+ // MenuTree;
|
|
|
|
+ CMFCRibbonComboBox* pChipCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBO_PRODUCT));
|
|
|
|
+ if (pChipCombo)
|
|
|
|
+ {
|
|
|
|
+ for (auto it : m_map_tree)
|
|
|
|
+ {
|
|
|
|
+ pChipCombo->AddItem(it.first.c_str());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 选择默认项;
|
|
|
|
+ pChipCombo->SetEditText(m_rscfg.menutree_chip.c_str());
|
|
|
|
+
|
|
|
|
+ // UI下拉框;
|
|
|
|
+ CString curText = pChipCombo->GetEditText();
|
|
|
|
+ CMFCRibbonComboBox* pStyleCombo = DYNAMIC_DOWNCAST(CMFCRibbonComboBox, pRibbon->FindByID(ID_COMBO_UI));
|
|
|
|
+ for (auto it : m_map_tree.find(curText.GetString())->second)
|
|
|
|
+ {
|
|
|
|
+ pStyleCombo->AddItem(it.c_str());
|
|
|
|
+ }
|
|
|
|
+ pStyleCombo->SetEditText(m_rscfg.menutree_style.c_str());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 启动设备;
|
|
|
|
+ Global::GetSysSerialPort(m_vtCOM);
|
|
|
|
+ InitCombobox_port();
|
|
|
|
+ RunDevice();
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|