Mercurial > mercurial > hgweb_golang.cgi
changeset 53:8df74a781c8c
mover: small improve.
| author | pyon@macmini |
|---|---|
| date | Fri, 15 May 2020 21:28:41 +0900 |
| parents | 1c7bf24c63e6 |
| children | 665f92c37b72 |
| files | src/kaigo/horori/horori.fbp src/kaigo/horori/mover/include/mover.h src/kaigo/horori/mover/src/mover.cpp |
| diffstat | 3 files changed, 146 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ </object> </object> </object> - <object class="Frame" expanded="0"> + <object class="Frame" expanded="1"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg">210,210,255</property> @@ -788,6 +788,136 @@ <property name="border">5</property> <property name="colspan">1</property> <property name="column">2</property> + <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property> + <property name="row">0</property> + <property name="rowspan">1</property> + <object class="wxSpinCtrl" expanded="0"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="initial">0</property> + <property name="max">50</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min">-50</property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_spinCtrlUD</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size">50,-1</property> + <property name="style">wxSP_ARROW_KEYS</property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="value">0</property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="gbsizeritem" expanded="0"> + <property name="border">5</property> + <property name="colspan">1</property> + <property name="column">3</property> + <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> + <property name="row">0</property> + <property name="rowspan">1</property> + <object class="wxSpinCtrl" expanded="0"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="initial">0</property> + <property name="max">50</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min">-50</property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_spinCtrlLR</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size">50,-1</property> + <property name="style">wxSP_ARROW_KEYS</property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="value">0</property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="gbsizeritem" expanded="0"> + <property name="border">5</property> + <property name="colspan">1</property> + <property name="column">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="row">0</property> <property name="rowspan">1</property> @@ -1187,14 +1317,14 @@ <event name="OnTextEnter">OnHno</event> </object> </object> - <object class="gbsizeritem" expanded="1"> + <object class="gbsizeritem" expanded="0"> <property name="border">5</property> <property name="colspan">1</property> <property name="column">6</property> <property name="flag">wxALL|wxALIGN_BOTTOM</property> <property name="row">2</property> <property name="rowspan">1</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property>
--- 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 <wx/image.h> #include <wx/icon.h> #include <wx/button.h> +#include <wx/spinctrl.h> #include <wx/sizer.h> #include <wx/checkbox.h> #include <wx/frame.h> @@ -74,6 +75,8 @@ protected: wxDirPickerCtrl* m_dirPicker; wxButton* m_buttonAuto; + wxSpinCtrl* m_spinCtrlUD; + wxSpinCtrl* m_spinCtrlLR; wxCheckBox* m_checkBox; wxDataViewListCtrl* m_dataViewListCtrl;
--- 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 <wx/dir.h> #include <wx/textfile.h> @@ -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<wxAlignment>(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("自動認識終了")); }