# HG changeset patch # User pyon@macmini # Date 1318504421 -32400 # Node ID b59dfcc84d7a6652ebee55d3ed442ae944075ada # Parent bfa0800f11764c6da35cff769a3265e089a284da v0.4b diff -r bfa0800f1176 -r b59dfcc84d7a include/myframe.h --- 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 #include #include + #include #include #endif diff -r bfa0800f1176 -r b59dfcc84d7a include/symbol.h --- 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 diff -r bfa0800f1176 -r b59dfcc84d7a mover.fbp --- 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 @@ 1 impl_virtual + wxSYS_COLOUR_WINDOWFRAME + + 0 + ID_FRAMEEXPLORER + + + FrameExplorer + + 500,300 + wxDEFAULT_FRAME_STYLE + + Image Counter + + + wxFILTER_NONE + wxDefaultValidator + + + + wxTAB_TRAVERSAL + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizerTop + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + 1 + + + 0 + ID_TREE + + + m_treeCtrl + protected + + + wxTR_DEFAULT_STYLE + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizerView + wxVERTICAL + none + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 1 + + + + + 1 + 1 + + + 0 + ID_PREVIEW + + + m_bitmap + protected + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + 1 + + + 0 + ID_THUMB + + + m_listCtrl + protected + + + wxLC_ICON + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxBOTH + + 1 + 1 + impl_virtual + 0 diff -r bfa0800f1176 -r b59dfcc84d7a src/myframe.cpp --- 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 ); } /* 作業フォルダを開く */ diff -r bfa0800f1176 -r b59dfcc84d7a src/testtune.cpp --- 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 );