diff --git a/source/gazo.aps b/source/gazo.aps index 13a144b..0b9a7bd 100644 Binary files a/source/gazo.aps and b/source/gazo.aps differ diff --git a/source/gazo.rc b/source/gazo.rc index 5dc9166..16d1791 100644 --- a/source/gazo.rc +++ b/source/gazo.rc @@ -315,7 +315,7 @@ BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 DEFPUSHBUTTON "OK",IDOK,164,7,36,14,WS_GROUP LTEXT "CGazoApp::CGazoApp() sProgVersion",IDC_ABOUT_VER,42,11,115,16,SS_NOPREFIX | WS_TABSTOP - LTEXT "Copyright (C) 2008-2023 Ryuta Mizutani.\r\nAll rights reserved.",IDC_STATIC,46,31,154,17 + LTEXT "Copyright (C) 2008-2024 Ryuta Mizutani.\r\nAll rights reserved.",IDC_STATIC,46,31,154,17 LTEXT "https://mizutanilab.github.io/",IDC_STATIC,54,49,139,15 LTEXT "File->Open one of *.his, *.img, or *.h5 files.\r\nGo 'Tomography->Reconstruction' menu.\r\n Click 'Show image' to calcurate tomograms.\r\n Examine tomograms at top and bottom of the sample.\r\n Refine parameters as you like.\r\n Then issue or queue execution.",IDC_STATIC,17,67,179,60 LTEXT "Again File->Open one of rec*.tif files.\r\nGo 'Tomography->Histogram/conversion' menu.\r\n Click 'Select Image'\r\n to select files to convert.\r\n Move green and red lines in the histogram\r\n to define output LAC levels.\r\n Issue or queue execution.",IDC_STATIC,17,119,183,61 diff --git a/source/gazoDoc.cpp b/source/gazoDoc.cpp index dd8c2c7..55d9219 100644 --- a/source/gazoDoc.cpp +++ b/source/gazoDoc.cpp @@ -2568,12 +2568,14 @@ int CGazoDoc::CountFrameFromConvBat(CString sDataPath) { stdioConv.Close(); //201125 iFramePerDataset = (nframe > 0) ? nframe : -1; iFramePerDataset = (maxframeno > 0) ? maxframeno : -1; + //CString msg; msg.Format("240605 iFramePerDataset %d", iFramePerDataset); AfxMessageBox(msg); } //141229 Get number of dataset if ((maxHisFrame >= 0)&&(iFramePerDataset != 0)&&(iFramePerDataset - nDarkFrame != 0)&&(dlgReconst.m_nDataset <= 1)) { //201125if (maxHisFrame % iFramePerDataset == 0) { - if ((maxHisFrame % iFramePerDataset) < ((maxHisFrame - nDarkFrame) % (iFramePerDataset - nDarkFrame))) { - dlgReconst.m_nDataset = maxHisFrame / iFramePerDataset; + //240605if ((maxHisFrame % iFramePerDataset) < ((maxHisFrame - nDarkFrame) % (iFramePerDataset - nDarkFrame))) { + if ((maxHisFrame % iFramePerDataset) <= ((maxHisFrame - nDarkFrame) % (iFramePerDataset - nDarkFrame))) { + dlgReconst.m_nDataset = maxHisFrame / iFramePerDataset; iFramePerDataset = maxHisFrame / dlgReconst.m_nDataset;//201125 nDarkFrame = 0; //201125 } else if ((maxHisFrame - nDarkFrame) % (iFramePerDataset - nDarkFrame) == 0) { diff --git a/source/projx64.lst b/source/projx64.lst index a477278..b1d73b9 100644 --- a/source/projx64.lst +++ b/source/projx64.lst @@ -1,4 +1,4 @@ -Microsoft (R) Macro Assembler (x64) Version 14.16.27025.1 06/13/23 16:55:16 +Microsoft (R) Macro Assembler (x64) Version 14.16.27025.1 06/04/24 13:09:45 projx64.asm Page 1 - 1 @@ -406,7 +406,7 @@ projx64.asm Page 1 - 1 00000312 projx64 ENDP end - Microsoft (R) Macro Assembler (x64) Version 14.16.27025.1 06/13/23 16:55:16 + Microsoft (R) Macro Assembler (x64) Version 14.16.27025.1 06/04/24 13:09:45 projx64.asm Symbols 2 - 1