# HG changeset patch # User pyon@macmini # Date 1589545721 -32400 # Node ID 8df74a781c8cb40219a20a0f4b82796231afdb36 # Parent 1c7bf24c63e63a05ebcded3d5b72f1b3eb5b5123 mover: small improve. diff -r 1c7bf24c63e6 -r 8df74a781c8c src/kaigo/horori/horori.fbp --- a/src/kaigo/horori/horori.fbp Tue May 12 20:00:11 2020 +0900 +++ b/src/kaigo/horori/horori.fbp Fri May 15 21:28:41 2020 +0900 @@ -602,7 +602,7 @@ - + 0 wxAUI_MGR_DEFAULT 210,210,255 @@ -788,6 +788,136 @@ 5 1 2 + wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 50 + + 0 + + -50 + + 0 + + 1 + m_spinCtrlUD + 1 + + + protected + 1 + + Resizable + 1 + 50,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + + 0 + + + + + + + 5 + 1 + 3 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 50 + + 0 + + -50 + + 0 + + 1 + m_spinCtrlLR + 1 + + + protected + 1 + + Resizable + 1 + 50,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + + 0 + + + + + + + 5 + 1 + 5 wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -1187,14 +1317,14 @@ OnHno - + 5 1 6 wxALL|wxALIGN_BOTTOM 2 1 - + 1 1 1 diff -r 1c7bf24c63e6 -r 8df74a781c8c src/kaigo/horori/mover/include/mover.h --- a/src/kaigo/horori/mover/include/mover.h Tue May 12 20:00:11 2020 +0900 +++ b/src/kaigo/horori/mover/include/mover.h Fri May 15 21:28:41 2020 +0900 @@ -1,5 +1,5 @@ // Filename : mover.h -// Last Change: 2020-04-21 11:50:30. +// Last Change: 2020-05-14 17:11:37. // #pragma once @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -74,6 +75,8 @@ protected: wxDirPickerCtrl* m_dirPicker; wxButton* m_buttonAuto; + wxSpinCtrl* m_spinCtrlUD; + wxSpinCtrl* m_spinCtrlLR; wxCheckBox* m_checkBox; wxDataViewListCtrl* m_dataViewListCtrl; diff -r 1c7bf24c63e6 -r 8df74a781c8c src/kaigo/horori/mover/src/mover.cpp --- a/src/kaigo/horori/mover/src/mover.cpp Tue May 12 20:00:11 2020 +0900 +++ b/src/kaigo/horori/mover/src/mover.cpp Fri May 15 21:28:41 2020 +0900 @@ -1,5 +1,5 @@ // Filename : mover.cpp -// Last Change: 2020-04-23 木 10:57:06. +// Last Change: 2020-05-14 木 17:14:42. // #include #include @@ -65,8 +65,14 @@ m_buttonAuto->SetDefault(); gbSizer->Add(m_buttonAuto, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALL, 5); + m_spinCtrlUD = new wxSpinCtrl(this, wxID_ANY, wxT("0"), wxDefaultPosition, wxSize(50, -1), wxSP_ARROW_KEYS, -50, 50, 0); + gbSizer->Add(m_spinCtrlUD, wxGBPosition(0, 2), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5); + + m_spinCtrlLR = new wxSpinCtrl(this, wxID_ANY, wxT("0"), wxDefaultPosition, wxSize(50, -1), wxSP_ARROW_KEYS, -50, 50, 0); + gbSizer->Add(m_spinCtrlLR, wxGBPosition(0, 3), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); + m_checkBox = new wxCheckBox(this, wxID_ANY, wxT("申請書モード"), wxDefaultPosition, wxDefaultSize, 0); - gbSizer->Add(m_checkBox, wxGBPosition(0, 2), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); + gbSizer->Add(m_checkBox, wxGBPosition(0, 5), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); m_dataViewListCtrl = new wxDataViewListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(320, 1200), wxDV_SINGLE|wxDV_ROW_LINES); m_dataViewListColumnNo = m_dataViewListCtrl->AppendTextColumn(wxT("No"), wxDATAVIEW_CELL_INERT, 30, static_cast(wxALIGN_CENTER), 0); @@ -226,7 +232,7 @@ subdir.GetFirst(&fn, wxT("*.tif"), wxDIR_FILES); fn = m_dirPicker->GetPath() + wxFILE_SEP_PATH + dirname + wxFILE_SEP_PATH + fn; - wxString hno = AnalizeHhsno(fn, 0, 0); + wxString hno = AnalizeHhsno(fn, m_spinCtrlLR->GetValue() * 5, m_spinCtrlUD->GetValue() * 5); data.push_back(wxVariant(hno)); data.push_back(wxVariant(m_hhash[hno])); @@ -238,7 +244,6 @@ cont = dir.GetNext(&dirname); } - wxMessageBox(wxT("自動認識終了")); }