diff --git a/TIAS_Imager2/Imager.cpp b/TIAS_Imager2/Imager.cpp index 8f6e6bb..44b310f 100644 --- a/TIAS_Imager2/Imager.cpp +++ b/TIAS_Imager2/Imager.cpp @@ -416,9 +416,9 @@ this->GetCheckerColor(m_StreamBuf[m_StreamWrite]); // �Q�C���␳�v�Z - float gainBd = sqrt(m_cdWhiteBalValue / (float)m_CalibColor[CHECKER_WHITE].b); - float gainGd = sqrt(m_cdWhiteBalValue / (float)m_CalibColor[CHECKER_WHITE].g); - float gainRd = sqrt(m_cdWhiteBalValue / (float)m_CalibColor[CHECKER_WHITE].r); + float gainBd = sqrtf(m_cdWhiteBalValue / (float)m_CalibColor[CHECKER_WHITE].b); + float gainGd = sqrtf(m_cdWhiteBalValue / (float)m_CalibColor[CHECKER_WHITE].g); + float gainRd = sqrtf(m_cdWhiteBalValue / (float)m_CalibColor[CHECKER_WHITE].r); m_Sshot.gainBlue *= gainBd; m_Sshot.gainGrn1 *= gainGd; m_Sshot.gainGrn2 *= gainGd; diff --git a/TIAS_Imager2/MainFrm.cpp b/TIAS_Imager2/MainFrm.cpp index 9805cc5..ee28fb2 100644 --- a/TIAS_Imager2/MainFrm.cpp +++ b/TIAS_Imager2/MainFrm.cpp @@ -64,7 +64,7 @@ if( !CFrameWndEx::PreCreateWindow(cs) ) return FALSE; // �E�C���h�E�̑��� - cs.style = WS_OVERLAPPED | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU; + cs.style = WS_OVERLAPPED | WS_SIZEBOX | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU; // �E�C���h�E�T�C�Y cs.x = 300; diff --git a/TIAS_Imager2/TIAS_Imager2.rc b/TIAS_Imager2/TIAS_Imager2.rc index 6bdf3f0..b530500 100644 --- a/TIAS_Imager2/TIAS_Imager2.rc +++ b/TIAS_Imager2/TIAS_Imager2.rc Binary files differ diff --git a/TIAS_Imager2/TIAS_Imager2.vcxproj b/TIAS_Imager2/TIAS_Imager2.vcxproj index 975384e..9bf89fb 100644 --- a/TIAS_Imager2/TIAS_Imager2.vcxproj +++ b/TIAS_Imager2/TIAS_Imager2.vcxproj @@ -183,7 +183,6 @@ - diff --git a/TIAS_Imager2/TIAS_Imager2.vcxproj.filters b/TIAS_Imager2/TIAS_Imager2.vcxproj.filters index 737d902..cfd367f 100644 --- a/TIAS_Imager2/TIAS_Imager2.vcxproj.filters +++ b/TIAS_Imager2/TIAS_Imager2.vcxproj.filters @@ -15,7 +15,6 @@ - リソース ファイル diff --git a/TIAS_Imager2/TIAS_Imager2View.cpp b/TIAS_Imager2/TIAS_Imager2View.cpp index 96fa74a..97fd3d2 100644 --- a/TIAS_Imager2/TIAS_Imager2View.cpp +++ b/TIAS_Imager2/TIAS_Imager2View.cpp @@ -74,7 +74,7 @@ { CFormView::OnInitialUpdate(); GetParentFrame()->RecalcLayout(); - ResizeParentToFit(); + ResizeParentToFit(FALSE); // �R���g���[�������� m_FontBtn.CreatePointFont(140, _T("�l�r �S�V�b�N")); @@ -109,13 +109,13 @@ void CTIAS_Imager2View::OnPaint() { CPaintDC dc(this); + RECT r, wr; + GetClientRect(&r); // �N���C�A���g�̈�T�C�Y + GetWindowRect(&wr); // �E�B���h�E�T�C�Y + // �摜�`�� BYTE *buf = theApp.Imager()->GetStream(m_Bih.biWidth, m_Bih.biHeight); if (buf) { - RECT r; - GetClientRect(&r); - - // �摜�`�� const int dispWmax = r.bottom * 4 / 5; int dispW = r.bottom * abs(m_Bih.biWidth) / abs(m_Bih.biHeight); if (dispW > dispWmax) dispW = dispWmax; @@ -128,10 +128,9 @@ // �X�e�[�^�X�o�[�X�V CString str(_T("")); - str.AppendFormat(_T("[ID: %X Res:%dx%d] "), - theApp.Imager()->GetCameraID(), m_Bih.biWidth, m_Bih.biHeight); + str.AppendFormat(_T("[Win:%dx%d, Cli:%dx%d] "), + wr.right - wr.left, wr.bottom - wr.top, r.right, r.bottom); str.Append(theApp.Imager()->GetStatusText()); - ((CMainFrame*)AfxGetMainWnd())->SetStatusMsg(CMainFrame::SBAR_MSG, str); ((CMainFrame*)AfxGetMainWnd())->SetStatusMsg(CMainFrame::SBAR_FPS, theApp.Imager()->GetFpsText());