# HG changeset patch
# User pyon@macmini
# Date 1590069230 -32400
# Node ID 665f92c37b7287b1591de072f6fad1a8a20e3f8c
# Parent  8df74a781c8cb40219a20a0f4b82796231afdb36
small fix.

diff -r 8df74a781c8c -r 665f92c37b72 src/kaigo/horori/alloc/alloc.cpp
--- a/src/kaigo/horori/alloc/alloc.cpp	Fri May 15 21:28:41 2020 +0900
+++ b/src/kaigo/horori/alloc/alloc.cpp	Thu May 21 22:53:50 2020 +0900
@@ -1,5 +1,5 @@
 // Filename   : alloc.cpp
-// Last Change: 2020-05-12 火 16:28:18.
+// Last Change: 2020-05-21 木 15:17:26.
 //
 #include <wx/dir.h>
 #include <wx/filefn.h> 
@@ -132,20 +132,18 @@
 
 void AllocFrame::AllocateTif()
 {
-	wxDir dir(m_dirPickerTif->GetPath());
-	if (!dir.IsOpened()) return;
+	wxArrayString files;
+	wxDir::GetAllFiles(m_dirPickerTif->GetPath(), &files, wxT("*.tif"), wxDIR_FILES);
+	files.Sort();
 
-	wxString filename;
-	bool cont = dir.GetFirst(&filename, wxT("*.tif"), wxDIR_FILES);
-
-	for (int i = 0; cont; i++ ) {
+	for (int i = 0; i < files.GetCount(); i++ ) {
 		wxString path = m_dirPickerWork->GetPath() + wxFILE_SEP_PATH + wxString::Format(wxT("%02d"), i / 8 + 1);
 		if (i % 8 == 0) wxFileName::Mkdir(path, wxS_DIR_DEFAULT, 0);
-		wxString fn = filename;
-		cont = dir.GetNext(&filename);
 
 		if (i % 8 == 3 || i % 8 == 5 || i % 8 == 7) continue;
-		wxCopyFile(m_dirPickerTif->GetPath() + wxFILE_SEP_PATH + fn, path + wxFILE_SEP_PATH + fn);
+		wxString to = files[i];
+		to.Replace(m_dirPickerTif->GetPath(), wxEmptyString, false);
+		wxCopyFile(files[i], path + wxFILE_SEP_PATH + to);
 	}
 }
 
diff -r 8df74a781c8c -r 665f92c37b72 src/kaigo/horori/merger/src/merger.cpp
--- a/src/kaigo/horori/merger/src/merger.cpp	Fri May 15 21:28:41 2020 +0900
+++ b/src/kaigo/horori/merger/src/merger.cpp	Thu May 21 22:53:50 2020 +0900
@@ -1,5 +1,5 @@
 // Filename   : merger.cpp
-// Last Change: 2020-04-24 金 17:22:19.
+// Last Change: 2020-05-21 木 15:18:24.
 //
 #include <wx/dir.h>
 #include <wx/textfile.h>
@@ -55,7 +55,7 @@
 	m_staticTextCSV = new wxStaticText(this, wxID_ANY, wxT("CSVファイル"), wxDefaultPosition, wxDefaultSize, 0);
 	gbSizer->Add(m_staticTextCSV, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5);
 
-	m_filePicker = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*.csv"), wxDefaultPosition, wxSize(400,-1), wxFLP_CHANGE_DIR|wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL);
+	m_filePicker = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*.csv"), wxDefaultPosition, wxSize(400, -1), wxFLP_CHANGE_DIR|wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL);
 	gbSizer->Add(m_filePicker, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5);
 
 	m_gauge = new wxGauge(this, wxID_ANY, 40, wxDefaultPosition, wxSize(100, 20), wxGA_HORIZONTAL);
diff -r 8df74a781c8c -r 665f92c37b72 src/kaigo/horori/searcher/src/searcher.cpp
--- a/src/kaigo/horori/searcher/src/searcher.cpp	Fri May 15 21:28:41 2020 +0900
+++ b/src/kaigo/horori/searcher/src/searcher.cpp	Thu May 21 22:53:50 2020 +0900
@@ -1,5 +1,5 @@
 // Filename   : searcher.cpp
-// Last Change: 2020-05-01 金 14:27:53.
+// Last Change: 2020-05-21 木 15:20:02.
 //
 #include <wx/msgdlg.h>
 #include <wx/dir.h>
@@ -1025,7 +1025,7 @@
 	m_staticTextHhsDB = new wxStaticText(m_panelMainte, wxID_ANY, wxT("被保険者ＣＳＶ"), wxDefaultPosition, wxDefaultSize, 0);
 	gbSizerDB->Add(m_staticTextHhsDB, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
 
-	m_filePickerHhsDB = new wxFilePickerCtrl(m_panelMainte, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("CSV and TXT files (*.csv;*.txt)|*.csv;*.txt"), wxDefaultPosition, wxSize(200,-1), wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL);
+	m_filePickerHhsDB = new wxFilePickerCtrl(m_panelMainte, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("CSV and TXT files (*.csv;*.txt)|*.csv;*.txt"), wxDefaultPosition, wxSize(200, -1), wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL);
 	gbSizerDB->Add(m_filePickerHhsDB, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5);
 
 	m_buttonRegHhs = new wxButton(m_panelMainte, wxID_ANY, wxT("アップロード"), wxDefaultPosition, wxDefaultSize, 0);