# HG changeset patch # User pyon@macmini # Date 1596711015 -32400 # Node ID 62ae9daac43ac861deca2e22d92b7caf66cdd9d2 # Parent 05f3d51ad966ad621f9898ac281522068c1293bb start develop horori/eraline. diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/Readme.txt --- a/src/kaigo/horori/Readme.txt Wed Jul 15 18:18:24 2020 +0900 +++ b/src/kaigo/horori/Readme.txt Thu Aug 06 19:50:15 2020 +0900 @@ -13,6 +13,11 @@ 　　　コピー機では両面スキャンするため主治医意見書の裏面等白紙のページが混在するが、 　　　それらはパソコンにはコピーしない + * geraline.exe + 通称：エラライン + 機能：コピー機で読み取りの際に横線ノイズが入る場合があるが、その線を消去するツール + eraline.exe が実体で、geraline.exe は GUI ラッパー + * mover.exe 通称：ムーバー 機能：alloc によりパソコンに保存された画像を被保険者ごとに仕分けするためのツール @@ -29,8 +34,7 @@ 　　　一括で複数の利用者の最新のマークシートなどを印刷できる機能や 　　　Ｃドライブのフォルダやサーバ上のＤＢを表示させる機能もある - ※ それぞれのプログラム用に設定ファイル(.conf)が用意されているが、通常変更する必要はない - 削除してはいけない + ※ 設定ファイル(.conf)が用意されているものもあるが、通常変更する必要はなく、削除してもいけない =----------------- diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/Makefile Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,79 @@ +ｻｿ# Makefile for wxWidgets Console Application +# Last Change: 2020-08-06 譛ｨ 15:46:13. +# by Takayuki Mutoh +# + +PROGNAME = eraline +GPROGNAME = geraline + +### Variables ### +CXX = g++ +#ARCH = 32 +ARCH = 64 +vpath %.cpp ./src +vpath %.h ./include + +# For Microsoft Windows +ifdef COMSPEC +LOCAL = C:/msys64/home/nintei/local$(ARCH) +WXCXXFLAGS = -I$(LOCAL)/lib/wx/include/msw-unicode-static-3.1 -I$(LOCAL)/include/wx-3.1 -D_LARGEFILE_SOURCE=unknown -D__WXMSW__ -mthreads +WXLIBS = -L$(LOCAL)/lib -Wl,--subsystem,windows -mwindows -lwx_mswu_xrc-3.1 -lwx_mswu_qa-3.1 -lwx_baseu_net-3.1 -lwx_mswu_html-3.1 -lwx_mswu_adv-3.1 -lwx_mswu_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxtiff-3.1 -lwxjpeg-3.1 -lwxpng-3.1 -lwxregexu-3.1 -lwxscintilla-3.1 -lwxexpat-3.1 -lwxzlib-3.1 -lrpcrt4 -loleaut32 -lole32 -luuid -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32 -loleacc +LIBS = $(WXLIBS) -static + +EXECUTABLE = $(PROGNAME).exe +GEXECUTABLE = $(GPROGNAME).exe + +# For Apple OSX +else +WXCXXFLAGS = -I/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.1/lib/wx/include/osx_cocoa-unicode-3.1 -I/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.1/include/wx-3.1 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXMAC__ -D__WXOSX__ -D__WXOSX_COCOA__ +WXLIBS = -L/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.1/lib -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -lwx_osx_cocoau_xrc-3.1 -lwx_osx_cocoau_html-3.1 -lwx_osx_cocoau_qa-3.1 -lwx_osx_cocoau_adv-3.1 -lwx_osx_cocoau_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu_net-3.1 -lwx_baseu-3.1 +LIBS = $(WXLIBS) + +EXECUTABLE = $(PROGNAME) +GEXECUTABLE = $(GPROGNAME) + +endif + +CXXFLAGS = $(WXCXXFLAGS) -I./include + +OBJ = $(OBJDIR)/main.o \ + $(OBJDIR)/geraline.o + +ifdef COMSPEC + OBJMSW = $(OBJ) $(OBJDIR)/sample_rc.o +endif + +all: $(GEXECUTABLE) + +# gui version +$(GEXECUTABLE): $(OBJ) $(OBJMSW) + @echo "" + @echo "=> $(GEXECUTABLE) <=" + $(CXX) $^ -o $@ $(LIBS) + +$(OBJDIR)/main.o: main.cpp main.h geraline.h + @echo "" + @echo "=> main.o <=" + -mkdir -p $(OBJDIR) + $(CXX) -c $< -o $@ $(CXXFLAGS) + +$(OBJDIR)/geraline.o: geraline.cpp geraline.h + @echo "" + @echo "=> geraline.o <=" + $(CXX) -c $< -o $@ $(CXXFLAGS) + +ifdef COMSPEC +$(OBJDIR)/sample_rc.o: sample.rc + windres -i sample.rc -o $@ -I$(LOCAL)/include/wx-3.1 +endif + +# command-line +$(EXECUTABLE): eraline.cpp + $(CXX) -o $@ $< $(LIBS) $(CXXFLAGS) + strip $(EXECUTABLE) + +clean: + rm -f $(PROGNAME) $(PROGNAME).exe + +.PHONY: all clean + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/image/eraline.tif Binary file src/kaigo/horori/eraline/image/eraline.tif has changed diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/include/geraline.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/include/geraline.h Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,50 @@ +// Filename : geraline.h +// Last Change: 2020-08-06 木 15:45:27. +// +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class EralineFrame : public wxFrame +{ + private: + + protected: + wxStaticBitmap* m_bitmapZoom; + wxStaticText* m_staticTextInDir; + wxDirPickerCtrl* m_dirPickerInDir; + wxStaticText* m_staticTextOutDir; + wxDirPickerCtrl* m_dirPickerOutDir; + wxStaticText* m_staticTextY; + wxSpinCtrl* m_spinCtrlY; + wxStaticText* m_staticTextH; + wxSpinCtrl* m_spinCtrlH; + wxButton* m_buttonErase; + wxStaticText* m_staticTextFile; + wxTextCtrl* m_textCtrlFile; + wxStaticBitmap* m_bitmapThumb; + wxButton* m_buttonPrev; + wxButton* m_buttonNext; + + // Virtual event handlers, overide them in your derived class + virtual void OnErase(wxCommandEvent& event) { event.Skip(); } + virtual void OnDClick(wxMouseEvent& event) { event.Skip(); } + virtual void OnPrev(wxCommandEvent& event) { event.Skip(); } + virtual void OnNext(wxCommandEvent& event) { event.Skip(); } + + public: + EralineFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(800,800), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL); + ~EralineFrame(); + +}; + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/include/main.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/include/main.h Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,24 @@ +// Filename : main.h +// Last Change: 2020-03-12 木 13:37:37. +// +#pragma once + +#include + +// private classes +// Define a new application type, each program should derive a class from wxApp +class MyApp : public wxApp +{ + DECLARE_CLASS(MyApp) + private: + + public: + MyApp(); + ~MyApp(); + + virtual bool OnInit(); + virtual int OnExit(); +}; + +DECLARE_APP(MyApp) + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/sample.ico Binary file src/kaigo/horori/eraline/sample.ico has changed diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/sample.rc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/sample.rc Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,32 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: samples/samples.rc +// Purpose: a standard Win32 .rc file for the wxWindows samples +// Author: Vadim Zeitlin +// Modified by: +// Created: 04.08.03 +// RCS-ID: $Id: sample.rc 22863 2003-08-14 14:08:53Z VS $ +// Copyright: (c) 2003 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// this minimal resource file is all what is needed for most of the wxWindows +// samples + +// note that the icon used by the Explorer (i.e. the programs icon) is the +// first icon in the executable and the icons are sorted both by their order +// (Win9x) and by alphabetically (!) (NT), so put this icon first and give it +// a name starting with "a" +aaaaaaaa ICON "sample.ico" + +// this icon is used with wxFrame::SetIcon() +sample ICON "sample.ico" + +// set this to 1 if you don't want to use manifest resource (manifest resource +// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt +// for more information) +#define wxUSE_NO_MANIFEST 0 + +// this is not always needed but doesn't hurt (except making the executable +// very slightly larger): this file contains the standard icons, cursors, ... +#include "wx/msw/wx.rc" + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/src/eraline.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/src/eraline.cpp Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,76 @@ +ｻｿ/* eraline.cpp + * Last Change: 2020-08-06 譛ｨ 15:04:04. + * by T.Mutoh + * + * > eraline y d in.jpg out.jpg + */ +#include "wx/wxprec.h" + +#include +#include +#include + +static const wxCmdLineEntryDesc cmdLineDesc[] = +{ + {wxCMD_LINE_SWITCH, "h", "help", "show this help message", + wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP}, + {wxCMD_LINE_SWITCH, "d", "dummy", "a dummy switch", + wxCMD_LINE_VAL_NONE, 0}, + {wxCMD_LINE_SWITCH, "s", "secret", "a secret switch", + wxCMD_LINE_VAL_NONE, wxCMD_LINE_HIDDEN}, + // ... your other command line options here... + + wxCMD_LINE_DESC_END +}; + +int main(int argc, char **argv) +{ + wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program"); + + wxInitializer initializer; + if (!initializer) { + fprintf(stderr, "Failed to initialize the wxWidgets library, aborting."); + return -1; + } + + int y = wxAtoi(argv[1]); + int d = wxAtoi(argv[2]); + wxString injpg = argv[3]; + wxString outjpg = argv[4]; + + wxImage::AddHandler(new wxTIFFHandler ); + + wxImage img(injpg, wxBITMAP_TYPE_TIFF); + + int r, g, b; + for (int x = 0; x < img.GetWidth(); x++) { + r = (int)img.GetRed(x, y); + g = (int)img.GetGreen(x, y); + b = (int)img.GetBlue(x, y); + //wxString buf = wxString::Format("%d %d %d -> ", r, g, b); + //wxPrintf(buf); + + r += (int)img.GetRed(x, y - 1); + g += (int)img.GetGreen(x, y - 1); + b += (int)img.GetBlue(x, y - 1); + + r += (int)img.GetRed(x, y + 1); + g += (int)img.GetGreen(x, y + 1); + b += (int)img.GetBlue(x, y + 1); + + r /= 3; + g /= 3; + b /= 3; + img.SetRGB(x, y, (unsigned char)r, (unsigned char)g, (unsigned char)b); + + //buf = wxString::Format("%d %d %d\n", r, g, b); + //wxPrintf(buf); + } + + img.SetOption(wxIMAGE_OPTION_TIFF_COMPRESSION, 5); + img.SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, 1); + img.SaveFile(outjpg); + + return 0; +} + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/src/geraline.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/src/geraline.cpp Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,92 @@ +// Filename : geraline.cpp +// Last Change: 2020-08-06 譛ｨ 15:43:36. +// +#include "geraline.h" + +EralineFrame::EralineFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) + : wxFrame(parent, id, title, pos, size, style) +{ + this->SetSizeHints(wxDefaultSize, wxDefaultSize); + this->SetBackgroundColour(wxColour(241, 226, 46)); + + wxBoxSizer* bSizer = new wxBoxSizer(wxHORIZONTAL); + + m_bitmapZoom = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); + bSizer->Add(m_bitmapZoom, 1, wxALL|wxEXPAND, 5); + + wxGridBagSizer* gbSizer = new wxGridBagSizer(0, 0); + gbSizer->SetFlexibleDirection(wxBOTH); + gbSizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + + m_staticTextInDir = new wxStaticText(this, wxID_ANY, wxT("Input Folder"), wxDefaultPosition, wxDefaultSize, 0); + m_staticTextInDir->Wrap(-1); + gbSizer->Add(m_staticTextInDir, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); + + m_dirPickerInDir = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a folder"), wxDefaultPosition, wxSize(200, -1), wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST|wxDIRP_SMALL|wxDIRP_USE_TEXTCTRL); + gbSizer->Add(m_dirPickerInDir, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); + + m_staticTextOutDir = new wxStaticText(this, wxID_ANY, wxT("Output Folder"), wxDefaultPosition, wxDefaultSize, 0); + m_staticTextOutDir->Wrap(-1); + gbSizer->Add(m_staticTextOutDir, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); + + m_dirPickerOutDir = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a folder"), wxDefaultPosition, wxSize(200, -1), wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST|wxDIRP_SMALL|wxDIRP_USE_TEXTCTRL); + gbSizer->Add(m_dirPickerOutDir, wxGBPosition(1, 1), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); + + m_staticTextY = new wxStaticText(this, wxID_ANY, wxT("y"), wxDefaultPosition, wxDefaultSize, 0); + m_staticTextY->Wrap(-1); + gbSizer->Add(m_staticTextY, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); + + m_spinCtrlY = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(80, -1), wxALIGN_RIGHT|wxSP_ARROW_KEYS, 0, 3500, 0); + gbSizer->Add(m_spinCtrlY, wxGBPosition(2, 1), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); + + m_staticTextH = new wxStaticText(this, wxID_ANY, wxT("h"), wxDefaultPosition, wxDefaultSize, 0); + m_staticTextH->Wrap(-1); + gbSizer->Add(m_staticTextH, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); + + m_spinCtrlH = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(80, -1), wxALIGN_RIGHT|wxSP_ARROW_KEYS, 1, 10, 1); + gbSizer->Add(m_spinCtrlH, wxGBPosition(3, 1), wxGBSpan(1, 1), wxALL, 5); + + m_buttonErase = new wxButton(this, wxID_ANY, wxT("Erase"), wxDefaultPosition, wxSize(60, -1), 0); + gbSizer->Add(m_buttonErase, wxGBPosition(3, 2), wxGBSpan(1, 2), wxALL|wxALIGN_CENTER_VERTICAL, 5); + + m_staticTextFile = new wxStaticText(this, wxID_ANY, wxT("File"), wxDefaultPosition, wxDefaultSize, 0); + m_staticTextFile->Wrap(-1); + gbSizer->Add(m_staticTextFile, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); + + m_textCtrlFile = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, -1), wxTE_READONLY); + m_textCtrlFile->SetBackgroundColour(wxColour(235, 239, 75)); + + gbSizer->Add(m_textCtrlFile, wxGBPosition(5, 1), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 5); + + m_bitmapThumb = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(300,400), 0); + gbSizer->Add(m_bitmapThumb, wxGBPosition(6, 1), wxGBSpan(1, 3), wxALL, 5); + + m_buttonPrev = new wxButton(this, wxID_ANY, wxT("<"), wxDefaultPosition, wxSize(20, -1), 0); + gbSizer->Add(m_buttonPrev, wxGBPosition(5, 2), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 0); + + m_buttonNext = new wxButton(this, wxID_ANY, wxT(">"), wxDefaultPosition, wxSize(20, -1), 0); + gbSizer->Add(m_buttonNext, wxGBPosition(5, 3), wxGBSpan(1, 1), wxALL|wxALIGN_CENTER_VERTICAL, 0); + + bSizer->Add(gbSizer, 0, wxEXPAND, 5); + + this->SetSizer(bSizer); + this->Layout(); + + this->Centre(wxBOTH); + + // Connect Events + m_buttonErase->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(EralineFrame::OnErase), NULL, this); + m_bitmapThumb->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(EralineFrame::OnDClick), NULL, this); + m_buttonPrev->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(EralineFrame::OnPrev), NULL, this); + m_buttonNext->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(EralineFrame::OnNext), NULL, this); +} + +EralineFrame::~EralineFrame() +{ + // Disconnect Events + m_buttonErase->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(EralineFrame::OnErase), NULL, this); + m_bitmapThumb->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(EralineFrame::OnDClick), NULL, this); + m_buttonPrev->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(EralineFrame::OnPrev), NULL, this); + m_buttonNext->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(EralineFrame::OnNext), NULL, this); + +} diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/eraline/src/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kaigo/horori/eraline/src/main.cpp Thu Aug 06 19:50:15 2020 +0900 @@ -0,0 +1,36 @@ +// Filename : main.cpp +// Last Change: 2020-08-06 譛ｨ 15:42:41. +// +#include "main.h" +#include "geraline.h" + +IMPLEMENT_APP(MyApp) + +IMPLEMENT_CLASS(MyApp, wxApp) + +MyApp::MyApp() +{ +} +MyApp::~MyApp() +{ +} + +bool MyApp::OnInit() +{ + if (!wxApp::OnInit()) return false; + + wxImage::AddHandler(new wxJPEGHandler); + wxImage::AddHandler(new wxTIFFHandler); + + EralineFrame *frame = new EralineFrame(NULL, wxID_ANY, wxT("Erase Line -"), wxDefaultPosition, wxSize(800, 800), wxDEFAULT_FRAME_STYLE); + frame->Show(true); + frame->Raise(); + + return true; +} + +int MyApp::OnExit() +{ + return 0; +} + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/horori.fbp --- a/src/kaigo/horori/horori.fbp Wed Jul 15 18:18:24 2020 +0900 +++ b/src/kaigo/horori/horori.fbp Thu Aug 06 19:50:15 2020 +0900 @@ -602,7 +602,7 @@ - + 0 wxAUI_MGR_DEFAULT 210,210,255 @@ -4021,7 +4021,7 @@ 繝｡繝ｳ繝繝翫Φ繧ｹ - 0 + 1 1 1 @@ -5091,7 +5091,7 @@ 0 1 - m_staticline + m_staticline1 1 @@ -5173,8 +5173,8 @@ 15 - wxEXPAND|wxLEFT - 1 + wxLEFT|wxEXPAND + 0 wxBOTH @@ -5733,6 +5733,397 @@ + + 5 + 1 + 0 + wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + CSV蜃ｺ蜉 + 0 + + 0 + + + 0 + + 1 + m_staticTextCSV + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALL|wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + Select a file + + 0 + + 1 + m_filePickerCSV + 1 + + + protected + 1 + + Resizable + 1 + 200,-1 + wxFLP_OPEN|wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE|wxFLP_SMALL|wxFLP_USE_TEXTCTRL + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + *.CSV + + + + + + + 5 + 1 + 2 + wxALL|wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + 蜃ｺ蜉 + + 0 + + 0 + + + 0 + + 1 + m_buttonCSV + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDB2CSV + + + + + + 5 + wxEXPAND | wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline2 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,-1,70,1 + 0 + 0 + wxID_ANY + 繝舌ｼ繧ｸ繝ｧ繝ｳ諠蝣ｱ + 0 + + 0 + + + 0 + + 1 + m_staticTextVersion + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textCtrlVersion + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE|wxTE_READONLY + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + @@ -5741,7 +6132,7 @@ 險ｭ螳 - 1 + 0 1 1 @@ -6803,5 +7194,1055 @@ + + 0 + wxAUI_MGR_DEFAULT + 241,226,46 + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + EralineFrame + + 800,800 + wxDEFAULT_FRAME_STYLE + ; ; forward_declare + + + + + wxTAB_TRAVERSAL + 1 + + + bSizer + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapZoom + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND + 0 + + + wxBOTH + + + 0 + + gbSizer + wxFLEX_GROWMODE_SPECIFIED + none + 0 + + 5 + 1 + 0 + wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Input Folder + 0 + + 0 + + + 0 + + 1 + m_staticTextInDir + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + 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 + + Select a folder + + 0 + + 1 + m_dirPickerInDir + 1 + + + protected + 1 + + Resizable + 1 + 200,-1 + wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST|wxDIRP_SMALL|wxDIRP_USE_TEXTCTRL + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + 1 + 0 + wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Output Folder + 0 + + 0 + + + 0 + + 1 + m_staticTextOutDir + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALL|wxALIGN_CENTER_VERTICAL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + Select a folder + + 0 + + 1 + m_dirPickerOutDir + 1 + + + protected + 1 + + Resizable + 1 + 200,-1 + wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST|wxDIRP_SMALL|wxDIRP_USE_TEXTCTRL + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + 1 + 0 + wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + y + 0 + + 0 + + + 0 + + 1 + m_staticTextY + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALL|wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 3500 + + 0 + + 0 + + 0 + + 1 + m_spinCtrlY + 1 + + + protected + 1 + + Resizable + 1 + 80,-1 + wxALIGN_RIGHT|wxSP_ARROW_KEYS + ; ; forward_declare + 0 + + + + + + + + + 5 + 1 + 0 + wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + h + 0 + + 0 + + + 0 + + 1 + m_staticTextH + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 10 + + 0 + + 1 + + 0 + + 1 + m_spinCtrlH + 1 + + + protected + 1 + + Resizable + 1 + 80,-1 + wxALIGN_RIGHT|wxSP_ARROW_KEYS + ; ; forward_declare + 0 + + + + + + + + + 5 + 2 + 2 + wxALL|wxALIGN_CENTER_VERTICAL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Erase + + 0 + + 0 + + + 0 + + 1 + m_buttonErase + 1 + + + protected + 1 + + + + Resizable + 1 + 60,-1 + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnErase + + + + 5 + 1 + 0 + wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + 5 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + File + 0 + + 0 + + + 0 + + 1 + m_staticTextFile + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALL|wxALIGN_CENTER_VERTICAL + 5 + 1 + + 1 + 1 + 1 + 1 + + + + + + 235,239,75 + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textCtrlFile + 1 + + + protected + 1 + + Resizable + 1 + 200,-1 + wxTE_READONLY + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + 3 + 1 + wxALL + 6 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapThumb + 1 + + + protected + 1 + + Resizable + 1 + 300,400 + ; ; forward_declare + 0 + + + + + OnDClick + + + + 0 + 1 + 2 + wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + 5 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + < + + 0 + + 0 + + + 0 + + 1 + m_buttonPrev + 1 + + + protected + 1 + + + + Resizable + 1 + 20,-1 + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPrev + + + + 0 + 1 + 3 + wxALL|wxALIGN_CENTER_VERTICAL + 5 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + > + + 0 + + 0 + + + 0 + + 1 + m_buttonNext + 1 + + + protected + 1 + + + + Resizable + 1 + 20,-1 + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnNext + + + + + + diff -r 05f3d51ad966 -r 62ae9daac43a src/kaigo/horori/release.bat --- a/src/kaigo/horori/release.bat Wed Jul 15 18:18:24 2020 +0900 +++ b/src/kaigo/horori/release.bat Thu Aug 06 19:50:15 2020 +0900 @@ -6,4 +6,5 @@ copy %DEVELOPDIR%\mover\mover.exe %TARGETDIR% copy %DEVELOPDIR%\merger\merger.exe %TARGETDIR% copy %DEVELOPDIR%\searcher\searcher.exe %TARGETDIR% +copy %DEVELOPDIR%\eraline\*.exe %TARGETDIR%