/mercurial/hgweb_mover2.cgi: src/myframe.cpp comparison

comparison src/myframe.cpp @ 35:405e08552527 v2.4 v2.6

auto-detect on/off

author	pyon@macmini
date	Thu, 17 Nov 2011 21:03:30 +0900
parents	51e522f34598
children	3b54f3deeed9

comparison

equal deleted inserted replaced

-:51e522f34598
+:405e08552527
 // Filename   : myframe.cpp
-// Last Change: 12-Nov-2011.
+// Last Change: 17-Nov-2011.
 //
 #include "main.h"
 #include "myframe.h"
 #include "param.h"
 #define HHSN_W  288
 #define HHSN_H   49
 #define THUMB_W 160
 #define THUMB_H 226
+#if defined(__WXMSW__)
+#define MOVECMD wxT("move")
+#else
+#define MOVECMD wxT("mv")
+#endif
 // resources
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
 #if !defined(__WXMSW__) && !defined(__WXPM__)
 #include "sample.xpm"
 	m_menuFile->Append( m_menuItemDetect );
 	wxMenuItem* m_menuItemMove;
 	m_menuItemMove = new wxMenuItem( m_menuFile, ID_MENUITEMMOVE, wxString( wxT("移動\tF7") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemMove );
+	m_menuFile->AppendSeparator();    // ----
+	wxMenuItem* m_menuItemAutoDetect;
+	m_menuItemAutoDetect = new wxMenuItem( m_menuFile, ID_MENUITEMAUTOD, wxString( wxT("自動検知\tF2") ) , wxEmptyString, wxITEM_CHECK );
+	m_menuFile->Append( m_menuItemAutoDetect );
+m_menuItemAutoDetect->Check(true);
 	m_menuFile->AppendSeparator();    // ----
 	wxMenuItem* m_menuItemParam;
 	m_menuItemParam = new wxMenuItem( m_menuFile, ID_MENUITEMPARAM, wxString( wxT("パラメータ\tAlt+P") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemParam );
 m_statusBar = this->CreateStatusBar( WXSIZEOF(widths), wxST_SIZEGRIP );
 m_statusBar->SetStatusWidths( WXSIZEOF(widths), widths );
 m_statusBar->SetStatusText( wxEmptyString, 0 );
 	this->Centre( wxBOTH );
+autodetect_mode = true;
 m_timer.SetOwner( this, ID_TIMER );
+pd = new wxProgressDialog( wxT("進行状況"), wxT("処理開始..."), 100, this, wxPD_APP_MODAL|wxPD_REMAINING_TIME|wxPD_AUTO_HIDE );
+pd->SetSize( wxSize(320,140) );
+pd->Update( 100, wxEmptyString );
 }
 // destructor
 MyFrame::~MyFrame()
 {
 EVT_TIMER( ID_TIMER, MyFrame::OnTimer )
 EVT_SIZE( MyFrame::OnWinSize )
 EVT_MOVE( MyFrame::OnWinMove )
 EVT_MENU( ID_MENUITEMDETECT,  MyFrame::OnDetect )
 EVT_MENU( ID_MENUITEMMOVE,    MyFrame::OnMove )
+EVT_MENU( ID_MENUITEMAUTOD,   MyFrame::ToggleAutoDetect )
 EVT_MENU( ID_MENUITEMPARAM,   MyFrame::OnParam )
 EVT_MENU( ID_MENUITEMAPPDIR,  MyFrame::OnOpenAppDir )
 EVT_MENU( wxID_EXIT,          MyFrame::OnQuit )
 EVT_LIST_ITEM_SELECTED(   ID_LISTCTRLVIEW, MyFrame::OnItemSelected )
 EVT_LIST_ITEM_DESELECTED( ID_LISTCTRLVIEW, MyFrame::OnItemDeselected )
 EVT_LIST_ITEM_ACTIVATED( ID_LISTCTRLDIR, MyFrame::OnOpenHhsDir )
 EVT_CLOSE( MyFrame::SaveConfig )
 END_EVENT_TABLE()
 // Event Handlers & Functions
+void MyFrame::ToggleAutoDetect(wxCommandEvent& event)
+{
+if ( event.IsChecked() ) autodetect_mode = true;
+else                     autodetect_mode = false;
+}
 void MyFrame::GetCCnArrayInfo(wxArrayString& array , int n, wxString& nName, wxString& nDir)
 {
 if ( n == -1 ) {
 array.Add(wxT("角館１")); array.Add(wxT("角館２")); array.Add(wxT("角館３")); array.Add(wxT("角館４"));
 array.Add(wxT("西仙１")); array.Add(wxT("西仙２")); array.Add(wxT("西仙３"));
 d.Append( ccndir );
 d.Append( wxFILE_SEP_PATH );
 if ( !wxDirExists( d ) ) wxMkdir( d );
 m_buttonMove->Enable(true);
+m_listCtrlHhsDir->DeleteAllItems();
 wxMessageBox(wxT("移動先フォルダ準備完了"));
 wxString cmd = wxT("explorer ") + to;
 wxExecute( cmd );
 }
 /* 検知 */
 void MyFrame::OnDetect(wxCommandEvent& WXUNUSED(event))
 {
+by_autodetect = false;
 UpdateCache();
+ClearGuess();
 UpdateListImage();
+}
+void MyFrame::ClearGuess()
+{
+// start-up iamge
+wxString notfound = wxGetCwd() + wxFILE_SEP_PATH + wxT("image") + wxFILE_SEP_PATH + wxT("notfound.png");
+wxBitmap bmp = wxBitmap( notfound, wxBITMAP_TYPE_PNG );
+m_bitmapName->SetBitmap( bmp );
+notfound = wxGetCwd() + wxFILE_SEP_PATH + wxT("image") + wxFILE_SEP_PATH + wxT("0000000000.png");
+bmp.LoadFile( notfound, wxBITMAP_TYPE_PNG );
+m_bitmapHhsno->SetBitmap( bmp );
 }
 /* 移動 */
 void MyFrame::OnMove(wxCommandEvent& WXUNUSED(event))
 {
 wxString distdir = m_textCtrlDist->GetValue();
 if ( distdir.IsEmpty() ) return;
 MoveImages();
 UpdateCache();
+ClearGuess();
 UpdateListImage();
 ListHhsDir();
 m_buttonUndo->Enable(true);
 }
 void MyFrame::MoveImages()
 {
 m_undo.Clear();
 wxString workdir = m_dirPickerWork->GetPath();
 wxString distdir = m_textCtrlDist->GetValue();
-wxString hhsno = m_textCtrlGuess->GetValue();
+wxString hhsno   = m_textCtrlGuess->GetValue();
+wxString hhsdir  = distdir + wxFILE_SEP_PATH + hhsno;
+if ( !wxDirExists( hhsdir ) ) {
+wxMkdir( hhsdir );
+wxGetApp().WriteLog( wxT("created distination directory - ") + hhsdir );
+}
+else {
+wxGetApp().WriteLog( wxT("set distination directory - ") + hhsdir );
+}
 m_hhsList.Remove(hhsno);
 m_hhsList.Add(hhsno);
 long item = -1;
 for ( ;; ) {
 item = m_listCtrlView->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 if ( item == -1 ) break;
-if ( !wxDirExists( distdir + wxFILE_SEP_PATH + hhsno ) ) wxMkdir( distdir + wxFILE_SEP_PATH + hhsno );
+wxString file = m_listCtrlView->GetItemText( item );
-wxString file  = m_listCtrlView->GetItemText( item );
 wxString from = workdir + wxFILE_SEP_PATH + file;
-wxString to   = distdir + wxFILE_SEP_PATH + hhsno + wxFILE_SEP_PATH + file;
+wxString to   = hhsdir  + wxFILE_SEP_PATH + file;
 wxRenameFile( from, to, true );
+wxGetApp().WriteLog( wxT("moved : ") + file );
 wxString movecmd = MOVECMD;
+from.Replace( wxT("\\"), wxT("\\\\"), true );
+to.Replace(   wxT("\\"), wxT("\\\\"), true );
 m_undo.Insert( movecmd + wxT(" ") + to + wxT(" ") + from, 0 );
 }
 }
 /* 選択したファイルを削除 */
 void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
 if ( item == -1 ) break;
 wxString file = m_listCtrlView->GetItemText( item );
 wxString from = workdir + wxFILE_SEP_PATH + file;
 wxString to   = trash   + wxFILE_SEP_PATH + file;
 wxRenameFile( from, to, true );
+wxGetApp().WriteLog( wxT("deleted : ") + file );
 wxString movecmd = MOVECMD;
+from.Replace( wxT("\\"), wxT("\\\\"), true );
+to.Replace(   wxT("\\"), wxT("\\\\"), true );
 m_undo.Insert( movecmd + wxT(" ") + to + wxT(" ") + from, 0 );
 }
 UpdateCache();
+ClearGuess();
 UpdateListImage();
 m_buttonUndo->Enable(true);
 }
 /* アンドゥ */
 void MyFrame::OnUndo(wxCommandEvent& WXUNUSED(event))
 }
 /* 画像をリストコントロールに表示 */
 void MyFrame::UpdateListImage()
 {
-// start-up iamge
+if ( !cache_changed && by_autodetect ) return;
-wxString notfound = wxGetCwd() + wxFILE_SEP_PATH + wxT("image") + wxFILE_SEP_PATH + wxT("notfound.png");
-wxBitmap bmp = wxBitmap( notfound, wxBITMAP_TYPE_PNG );
-m_bitmapName->SetBitmap( bmp );
-notfound = wxGetCwd() + wxFILE_SEP_PATH + wxT("image") + wxFILE_SEP_PATH + wxT("0000000000.png");
-bmp.LoadFile( notfound, wxBITMAP_TYPE_PNG );
-m_bitmapHhsno->SetBitmap( bmp );
 // 本処理
 m_listCtrlView->DeleteAllItems();
 m_imageList->RemoveAll();
 wxListItem item;
 m_textCtrlGuess->SetBackgroundColour(*wxWHITE);
-wxProgressDialog pd( wxT("進行状況"), wxT("処理開始..."), 7, this, wxPD_APP_MODAL|wxPD_REMAINING_TIME|wxPD_AUTO_HIDE );
+if ( by_autodetect ) pd->Update( 0, wxT("処理開始") );
-pd.SetSize( wxSize(320,140) );
 wxArrayString keys;
 for ( CacheHash::iterator it=CH.begin(); it != CH.end(); ++it ) {
 keys.Add(it->first);
 }
 keys.Sort();
-// イメージリストを作成
+int kc = keys.GetCount();
-for ( int i=0; i<keys.GetCount(); i++ ) { // item image
+// イメージリストを作成（サムネイル）
+for ( int i=0; i<kc; i++ ) { // item image
 CacheItem* ci = new CacheItem;
 ci = CH[keys[i]];
 m_imageList->Add( ci->thumbnail );
 }
-for ( int i=0; i<keys.GetCount(); i++ ) { // item selected image
+for ( int i=0; i<kc; i++ ) { // item selected image
 CacheItem* ci = new CacheItem;
 ci = CH[keys[i]];
 m_imageList->Add( ci->selthumbnail );
 }
 // アイテム作成
 bool select = true;  // flag
-for ( int i=0; i<keys.GetCount(); i++ ) {
+for ( int i=0; i<kc; i++ ) {
 CacheItem* ci = new CacheItem;
 ci = CH[keys[i]];
 m_listCtrlView->InsertItem( i, ci->filename, i );
 m_listCtrlView->SetItem( i, 0, ci->filename, i );
 else {  // ２枚目以降で初めてマークシートを認識したら，それ以降は選択しない
 if ( ci->marksheet ) select = false;
 if ( select ) m_listCtrlView->SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
 }
-pd.Update( i+1, wxT("画像認識中") );
+if ( !by_autodetect ) pd->Update( (int)(100/kc*(i+1)), wxT("画像認識中") );
 }
 // 画像ファイル数が多ければ，おそらく申請書
-if ( keys.GetCount() > 32 ) {
+if ( kc > 32 ) {
 int n = m_comboBoxCcn->GetCurrentSelection();
 wxString ccndir, dummy; wxArrayString array;
 GetCCnArrayInfo( array, n, dummy, ccndir );
 m_textCtrlGuess->SetValue( ccndir );
 }
 i = m_listCtrlView->GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 if ( i == -1 ) break;
 m_listCtrlView->SetItemImage( i, i+m_listCtrlView->GetItemCount() );
 }
+by_autodetect = false;
 SetStatusText( wxEmptyString, 2 );
 }
 /* 画像を選択したとき画像の情報をステータスバーに表示 */
 void MyFrame::OnItemSelected(wxListEvent& event)
 wxImage image( imagefile, wxBITMAP_TYPE_JPEG );
 wxBitmap bmp( image.Scale( 707, 1000, wxIMAGE_QUALITY_HIGH ) );
 wxSplashScreen* splash = new wxSplashScreen( bmp,
 wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
-3000, NULL, -1, wxDefaultPosition, wxDefaultSize,
+2500, NULL, -1, wxDefaultPosition, wxDefaultSize,
 wxSIMPLE_BORDER|wxSTAY_ON_TOP );
 wxYield();
 }
 /* パラメータダイアログ */
 void MyFrame::OnParam(wxCommandEvent& WXUNUSED(event))
 {
-ParamDialog* pd = new ParamDialog( NULL, wxID_ANY, wxT("Setting Parameters") );
+ParamDialog* parad = new ParamDialog( NULL, wxID_ANY, wxT("Setting Parameters") );
-if ( pd->ShowModal() == wxID_OK ) {
+if ( parad->ShowModal() == wxID_OK ) {
-pd->NewParam( wxGetApp().lmin, wxGetApp().lmax, wxGetApp().zmin, wxGetApp().zmax );
+parad->NewParam( wxGetApp().lmin, wxGetApp().lmax, wxGetApp().zmin, wxGetApp().zmax );
 }
-pd->Destroy();
+parad->Destroy();
 }
 /* キャッシュ作成&更新 */
 void MyFrame::UpdateCache()
 {
 wxString workdir = m_dirPickerWork->GetPath();
 wxArrayString filenames;
 wxListItem item;
 /* キャッシュ作成 */
+cache_changed = false;
 unsigned int n = wxDir::GetAllFiles( workdir, &filenames, wxT("*.jpg"), wxDIR_FILES );
 for ( int i=0; i<n; i++ ) {
 wxString fullpath = filenames[i];
 wxFileName f( fullpath );
 wxString file = f.GetFullName();
 ci = CH[file];
 ci->exists = true;
 continue;
 }
 /* 新しいファイルはキャッシュ */
-//float z; long l; bool m = IsMarksheet( fullpath, &z, &l );
 float z; long l; bool m = IsMarksheet( fullpath, &z, &l, zmin, zmax, lmin, lmax );
 wxImage image( fullpath, wxBITMAP_TYPE_JPEG );
 wxImage thumbnail = image.Scale( THUMB_W, THUMB_H, wxIMAGE_QUALITY_HIGH );
 wxBitmap bmp( thumbnail );
 unsigned char *data = thumbnail.GetData();
 ci->thumbnail    = bmp;
 ci->selthumbnail = bmp_mask;
 ci->modtime      = wxEmptyString; // TODO.
 CH[ci->filename] = ci;  // add hash
+cache_changed = true;
 SetStatusText( wxString::Format( wxT("rebuiling cache...( %d/%d :%.1fsec passed )"), i+1, n, (float)sw.Time()/1000 ), 0 );
 wxGetApp().WriteLog( file + wxT(" appended.") + wxString::Format(wxT(" ( m=%d z=%f l=%d )"), m ? 1 : 0, z, l ) );
 }
 /* 存在しないファイルはキャッシュから削除 */
 ci = it->second;
 if ( !ci->exists ) removelist.Add( ci->filename );
 }
 for ( int i=0; i<removelist.GetCount(); i++ ) {
 CH.erase(removelist[i]);
+cache_changed = true;
 wxGetApp().WriteLog( removelist[i] + wxT(" removed.") );
 }
 m_buttonDetect->Enable(true);
 SetStatusText( wxEmptyString, 0 );
-m_timer.Start( 20*1000, wxTIMER_ONE_SHOT ); // restart
+m_timer.Start( 2*1000, wxTIMER_ONE_SHOT ); // restart
 }
 /* 被保険者フォルダを列挙 */
 void MyFrame::ListHhsDir()
 {
 wxString hhsdir;
 wxString buf;
 m_listCtrlHhsDir->DeleteAllItems();
 for ( int i=0; i<m_hhsList.GetCount(); i++ ) {
+unsigned int n = 0;
+wxArrayString dummy;
 hhsdir = distdir + wxFILE_SEP_PATH + m_hhsList[i];
-wxArrayString filenames;
+if ( wxDirExists( hhsdir ) ) n = wxDir::GetAllFiles( hhsdir, &dummy, wxT("*.jpg"), wxDIR_FILES );
-unsigned int n = 0;
-if ( wxDirExists( hhsdir ) ) n = wxDir::GetAllFiles( hhsdir, &filenames, wxT("*.jpg"), wxDIR_FILES );
 m_listCtrlHhsDir->InsertItem( i, -1 );
 buf.Printf(wxT("%d"),i+1);
-m_listCtrlHhsDir->SetItem( i, 0, buf, -1 );
+m_listCtrlHhsDir->SetItem( i, 0, buf, -1 ); // No
-m_listCtrlHhsDir->SetItem( i, 1, m_hhsList[i], -1 );
+m_listCtrlHhsDir->SetItem( i, 1, m_hhsList[i], -1 );    // Hhsno
 buf.Printf(wxT("%d"),n);
-m_listCtrlHhsDir->SetItem( i, 2, buf, -1 );
+m_listCtrlHhsDir->SetItem( i, 2, buf, -1 ); // file count
-m_listCtrlHhsDir->SetItem( i, 3, GetHhsName( m_hhsList[i]), -1 );
+m_listCtrlHhsDir->SetItem( i, 3, GetHhsName( m_hhsList[i]), -1 );   // name
 if ( i % 2 ) m_listCtrlHhsDir->SetItemBackgroundColour( i, wxColour(wxT("WHEAT")) );
 }
 }
 /* 被保険者フォルダを開く */
 void MyFrame::OnOpenHhsDir(wxListEvent& event)
 {
 wxString hhsdir;
-hhsdir.Append( m_textCtrlDist->GetValue() );
+hhsdir = m_textCtrlDist->GetValue() + wxFILE_SEP_PATH;
-hhsdir.Append( wxFILE_SEP_PATH );
 int i = event.GetIndex();
 wxListItem item;
 item.SetId(i);
 }
 /* 以下，定型もの ***********************************************/
 void MyFrame::OnTimer(wxTimerEvent& event)
 {
+if ( !autodetect_mode ) return;
+by_autodetect = true;
 UpdateCache();
+UpdateListImage();
 }
 /* アイドリング */
 void MyFrame::OnIdle(wxIdleEvent& event)
 {

Mercurial > mercurial > hgweb_mover2.cgi

comparison src/myframe.cpp @ 35:405e08552527 v2.4 v2.6