diff --git a/HaoGaoCOrrect修改记录.txt b/HaoGaoCOrrect修改记录.txt index 86a8915..a571661 100644 --- a/HaoGaoCOrrect修改记录.txt +++ b/HaoGaoCOrrect修改记录.txt @@ -8,6 +8,10 @@ 2021年7月31日 1.增加3399 板子g100 g200 校正及配置功能 +2021年9月14日 +1、增加G300/G400速率可配置 +2、处理G300/G400不能出图问题 + 2021年8月17日 1. 界面增加速度模式配置功能; 2. 增加明场暗场校正最大明场值配置; diff --git a/HuaGoCorrect/A4.cpp b/HuaGoCorrect/A4.cpp index e84008d..107916e 100644 --- a/HuaGoCorrect/A4.cpp +++ b/HuaGoCorrect/A4.cpp @@ -416,12 +416,20 @@ void CA4::OnBnClickedBtnbdown() void CA4::UpdateGains(int id, bool increase) { UpdateData(TRUE); + int offect; + CString offectstr; + GetDlgItemText(IDC_tbxOffect, offectstr); + USES_CONVERSION; + std::string str_b(W2A(offectstr)); + offect = atoi(str_b.c_str()); + if (offect <= 0) + offect = 1; if ((id == IDC_BTNAUP || id == IDC_BTNBUP) && increase) { int startindex = id == IDC_BTNAUP ? 0 : 6; for (size_t i = startindex; i < (6+ startindex); i++) { - params.Gain[i] = params.Gain[i]++; + params.Gain[i] += offect; } } else if((id==IDC_BTNADOWN||id==IDC_BTNBDOWN)&&!increase) @@ -429,7 +437,7 @@ void CA4::UpdateGains(int id, bool increase) int startindex = id == IDC_BTNADOWN ? 0 : 6; for (size_t i = startindex; i < (6 + startindex); i++) { - params.Gain[i] = params.Gain[i]--; + params.Gain[i] -= offect; } } UpdateData(FALSE); diff --git a/HuaGoCorrect/Resource.h b/HuaGoCorrect/Resource.h index 298b72c..4b68b22 100644 Binary files a/HuaGoCorrect/Resource.h and b/HuaGoCorrect/Resource.h differ