Mercurial > mercurial > hgweb_mover.cgi
changeset 8:b59dfcc84d7a default tip
v0.4b
| author | pyon@macmini |
|---|---|
| date | Thu, 13 Oct 2011 20:13:41 +0900 |
| parents | bfa0800f1176 |
| children | |
| files | include/myframe.h include/symbol.h mover.fbp src/myframe.cpp src/testtune.cpp |
| diffstat | 5 files changed, 299 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/include/myframe.h Sat Oct 08 19:49:13 2011 +0900 +++ b/include/myframe.h Thu Oct 13 20:13:41 2011 +0900 @@ -1,5 +1,5 @@ // Filename : myframe.h -// Last Change: 06-Oct-2011. +// Last Change: 13-Oct-2011. // #ifndef MYFRAME #define MYFRAME @@ -26,6 +26,7 @@ #include <wx/stdpaths.h> #include <wx/sizer.h> #include <wx/combobox.h> + #include <wx/progdlg.h> #include <wx/frame.h> #endif
--- a/include/symbol.h Sat Oct 08 19:49:13 2011 +0900 +++ b/include/symbol.h Thu Oct 13 20:13:41 2011 +0900 @@ -1,10 +1,10 @@ // Filename : symbol.h -// Last Change: 08-Oct-2011. +// Last Change: 13-Oct-2011. // #define MYAPPNAME wxT("AMover") #define VER 0 -#define REV 3 -#define BLD 20111011 +#define REV 4 +#define BLD 20111013
--- a/mover.fbp Sat Oct 08 19:49:13 2011 +0900 +++ b/mover.fbp Thu Oct 13 20:13:41 2011 +0900 @@ -975,6 +975,285 @@ <property name="enabled">1</property> <property name="event_handler">impl_virtual</property> <property name="extra_style"></property> + <property name="fg">wxSYS_COLOUR_WINDOWFRAME</property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">ID_FRAMEEXPLORER</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">FrameExplorer</property> + <property name="pos"></property> + <property name="size">500,300</property> + <property name="style">wxDEFAULT_FRAME_STYLE</property> + <property name="subclass"></property> + <property name="title">Image Counter</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <property name="xrc_skip_sizer">1</property> + <event name="OnActivate"></event> + <event name="OnActivateApp"></event> + <event name="OnChar"></event> + <event name="OnClose"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnHibernate"></event> + <event name="OnIconize"></event> + <event name="OnIdle"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizerTop</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">0</property> + <object class="wxTreeCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">ID_TREE</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_treeCtrl</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTR_DEFAULT_STYLE</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnTreeBeginDrag"></event> + <event name="OnTreeBeginLabelEdit"></event> + <event name="OnTreeBeginRDrag"></event> + <event name="OnTreeDeleteItem"></event> + <event name="OnTreeEndDrag"></event> + <event name="OnTreeEndLabelEdit"></event> + <event name="OnTreeGetInfo"></event> + <event name="OnTreeItemActivated"></event> + <event name="OnTreeItemCollapsed"></event> + <event name="OnTreeItemCollapsing"></event> + <event name="OnTreeItemExpanded"></event> + <event name="OnTreeItemExpanding"></event> + <event name="OnTreeItemGetTooltip"></event> + <event name="OnTreeItemMenu"></event> + <event name="OnTreeItemMiddleClick"></event> + <event name="OnTreeItemRightClick"></event> + <event name="OnTreeKeyDown"></event> + <event name="OnTreeSelChanged"></event> + <event name="OnTreeSelChanging"></event> + <event name="OnTreeSetInfo"></event> + <event name="OnTreeStateImageClick"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizerView</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property> + <property name="proportion">1</property> + <object class="wxStaticBitmap" expanded="1"> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">ID_PREVIEW</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_bitmap</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">0</property> + <object class="wxListCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">ID_THUMB</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_listCtrl</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxLC_ICON</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnListBeginDrag"></event> + <event name="OnListBeginLabelEdit"></event> + <event name="OnListBeginRDrag"></event> + <event name="OnListCacheHint"></event> + <event name="OnListColBeginDrag"></event> + <event name="OnListColClick"></event> + <event name="OnListColDragging"></event> + <event name="OnListColEndDrag"></event> + <event name="OnListColRightClick"></event> + <event name="OnListDeleteAllItems"></event> + <event name="OnListDeleteItem"></event> + <event name="OnListEndLabelEdit"></event> + <event name="OnListInsertItem"></event> + <event name="OnListItemActivated"></event> + <event name="OnListItemDeselected"></event> + <event name="OnListItemFocused"></event> + <event name="OnListItemMiddleClick"></event> + <event name="OnListItemRightClick"></event> + <event name="OnListItemSelected"></event> + <event name="OnListKeyDown"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + </object> + </object> + <object class="Frame" expanded="1"> + <property name="bg"></property> + <property name="center">wxBOTH</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="event_handler">impl_virtual</property> + <property name="extra_style"></property> <property name="fg"></property> <property name="font"></property> <property name="hidden">0</property>
--- a/src/myframe.cpp Sat Oct 08 19:49:13 2011 +0900 +++ b/src/myframe.cpp Thu Oct 13 20:13:41 2011 +0900 @@ -1,5 +1,5 @@ // Filename : mainframe.cpp -// Last Change: 08-Oct-2011. +// Last Change: 13-Oct-2011. // #include "symbol.h" #include "common.h" @@ -221,7 +221,7 @@ void MyFrame::OnDetectWhite(wxCommandEvent& WXUNUSED(event)) { FrameDelWhite* dw = new FrameDelWhite( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCAPTION|wxFRAME_NO_TASKBAR|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); - dw->SetMinSize( wxSize( 580, 680 ) ); + dw->SetMinSize( wxSize( 580, 380 ) ); dw->m_dir = m_dirPickerWork->GetPath(); dw->SetTitle( wxT("Delete White Sheet - ") + dw->m_dir ); @@ -282,6 +282,10 @@ wxDir dir( workdir ); if ( !dir.IsOpened() ) return; + wxProgressDialog pd( wxT("進行状況"), wxT("処理開始..."), 200, this, wxPD_APP_MODAL|wxPD_REMAINING_TIME|wxPD_AUTO_HIDE ); + pd.SetSize( wxSize(320,140) ); + int p=0; + wxString filename; bool cout = dir.GetFirst( &filename, wxT("*.jpg"), wxDIR_FILES ); @@ -295,7 +299,7 @@ wxString d = dirname + hhs; wxMkdir( d ); m_listCtrl->InsertItem( r, wxString::Format(wxT("%d"),r+1) ); - m_listCtrl->SetItem( r, 1, hhs, -1 ); // 被保険者番号 + m_listCtrl->SetItem( r, 1, hhs, -1 ); // 被保険者番号 if ( r % 2 ) m_listCtrl->SetItemBackgroundColour( r, wxColour(wxT("WHEAT")) ); r++; cnt=1; @@ -307,10 +311,11 @@ wxString to = dirname + wxFILE_SEP_PATH + hhs + wxFILE_SEP_PATH + filename; wxRenameFile( from, to, false ); m_listCtrl->SetItem( r-1, 2, wxString::Format(wxT("%d"),cnt), -1 ); // ファイル数 - if ( cnt < 5 ) m_listCtrl->SetItemTextColour( r, *wxRED ); - if ( cnt > 5 ) m_listCtrl->SetItemTextColour( r, *wxBLUE ); + if ( cnt < 5 ) m_listCtrl->SetItemTextColour( r, wxColour(wxT("RED")) ); + if ( cnt > 5 ) m_listCtrl->SetItemTextColour( r, wxColour(wxT("BLUE")) ); cnt++; // write log + pd.Update( p++, wxEmptyString ); cout = dir.GetNext( &filename ); } @@ -329,8 +334,9 @@ item.SetMask(wxLIST_MASK_TEXT); m_listCtrl->GetItem( item ); hhsdir.Append( item.GetText() ); - wxMessageBox(hhsdir); - //wxString execmd = wxT("explorer ") + hhsdir; + //wxMessageBox(hhsdir); + wxString execmd = wxT("explorer ") + hhsdir; + wxExecute( execmd ); } /* 作業フォルダを開く */
--- a/src/testtune.cpp Sat Oct 08 19:49:13 2011 +0900 +++ b/src/testtune.cpp Thu Oct 13 20:13:41 2011 +0900 @@ -1,5 +1,5 @@ // Filename : testtune.cpp -// Last Change: 06-Oct-2011. +// Last Change: 13-Oct-2011. // #include "wx/utils.h" @@ -94,13 +94,7 @@ int main( int argc, char **argv ) { wxInitAllImageHandlers(); - //wxString file = wxT("nodetect/img045.jpg"); - //wxString file = wxT("nodetect/img073.jpg"); - //wxString file = wxT("nodetect/img174.jpg"); - //wxString file = wxT("nodetect/img182.jpg"); - //wxString file = wxT("nodetect/img246.jpg"); - //wxString file = wxT("nodetect/img268.jpg"); - wxString file = wxT("nodetect/img294.jpg"); + wxString file = wxT("img999.jpg"); if ( IsMarksheet( file ) ) wxPuts(file+wxT(" is perhaps marksheet !")); wxString hhs = GuessHhs( file );