Merge branch 'liuyang' into clh
# Conflicts:
# SourceCode/Bond/BondEq/CProjectPageMain.cpp
# SourceCode/Bond/BondEq/CProjectPageMain.h
| | |
|---|
| | | m_crBkgnd = PROPAGE_BACKGROUND_COLOR; |
|---|
| | | m_hbrBkgnd = nullptr; |
|---|
| | | m_pObserver = nullptr; |
|---|
| | | |
|---|
| | | for (int i = 0; i < BTN_MAX; i++) { |
|---|
| | | m_pBlBtns[i] = new CBlButton(); |
|---|
| | | } |
|---|
| | |
|---|
| | | SetButtonBackgroundColors(m_pBlBtns[BTN_STOP], capactity == 0); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | pAny->release(); |
|---|
| | | }, [&]() -> void { |
|---|
| | | // onComplete |
|---|
| | |
|---|
| | | |
|---|
| | | LRESULT CProjectPageMain::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam) |
|---|
| | | { |
|---|
| | | /* |
|---|
| | | CString strText; |
|---|
| | | strText.Format(_T("%d %s"), nVelocityRatio, _T("%")); |
|---|
| | | GetDlgItem(IDC_EDIT_VELOCITY_RATIO)->SetWindowText(strText); |
|---|
| | | |
|---|
| | | strText.Format(_T("%.2f"), dTactTime); |
|---|
| | | GetDlgItem(IDC_EDIT_TACT_TIME)->SetWindowText(strText); |
|---|
| | | |
|---|
| | | SetDlgItemInt(IDC_EDIT_DAY_SHIFT_CAPACITY, nDayShiftCapacity); |
|---|
| | | SetDlgItemInt(IDC_EDIT_NIGHT_SHIFT_CAPACITY, nNightShiftCapacity); |
|---|
| | | */ |
|---|
| | | return 0; |
|---|
| | | } |
|---|
| | |
|---|
| | | errorMsg.Format(_T("切换角色失败：%s"), CString(ex.what())); |
|---|
| | | AfxMessageBox(errorMsg, MB_ICONERROR); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
