comparison src/myframe.cpp @ 5:bc2e2b304095

Clean up code.
author pyon@macmini
date Sat, 14 Sep 2013 08:54:47 +0900
parents fdba695b99f1
children 7ac7d28699af
comparison
equal deleted inserted replaced
4:fdba695b99f1 5:bc2e2b304095
1 // Filename : myframe.cpp 1 // Filename : myframe.cpp
2 // Last Change: 11-Sep-2013. 2 // Last Change: 13-Sep-2013.
3 // 3 //
4 #include "main.h" 4 #include "main.h"
5 #include "db.h" 5 #include "db.h"
6 #include "about.h" 6 #include "about.h"
7 #include "kana.h" 7 #include "kana.h"
222 EVT_MENU( ID_MNBPNT, MyFrame::OnBPrintMode ) 222 EVT_MENU( ID_MNBPNT, MyFrame::OnBPrintMode )
223 EVT_MENU( ID_MNVIEW, MyFrame::OnViewStyle ) 223 EVT_MENU( ID_MNVIEW, MyFrame::OnViewStyle )
224 EVT_MENU( ID_MNINDEX, MyFrame::OnIndex ) 224 EVT_MENU( ID_MNINDEX, MyFrame::OnIndex )
225 EVT_MENU( ID_MNDBBKUP, MyFrame::OnDBBackup ) 225 EVT_MENU( ID_MNDBBKUP, MyFrame::OnDBBackup )
226 EVT_MENU( ID_MNMASKPARAM, MyFrame::OnMaskParam ) 226 EVT_MENU( ID_MNMASKPARAM, MyFrame::OnMaskParam )
227 EVT_MENU( ID_MNMASKPARAM, MyFrame::OnMarkParam ) 227 EVT_MENU( ID_MNMARKPARAM, MyFrame::OnMarkParam )
228 EVT_MENU( ID_MNAPPDIR, MyFrame::OnOpenAppDir ) 228 EVT_MENU( ID_MNAPPDIR, MyFrame::OnOpenAppDir )
229 EVT_LIST_ITEM_ACTIVATED( ID_LIST, MyFrame::OnSelectHhsDir ) 229 EVT_LIST_ITEM_ACTIVATED( ID_LIST, MyFrame::OnSelectHhsDir )
230 EVT_BUTTON( ID_KANA, MyFrame::OnKana ) 230 EVT_BUTTON( ID_KANA, MyFrame::OnKana )
231 EVT_BUTTON( ID_HIST, MyFrame::OnHistory ) 231 EVT_BUTTON( ID_HIST, MyFrame::OnHistory )
232 EVT_SIZE( MyFrame::OnWinSize ) 232 EVT_SIZE( MyFrame::OnWinSize )
321 config->Read( wxT("y3o"), &y ); 321 config->Read( wxT("y3o"), &y );
322 config->Read( wxT("w3o"), &w ); 322 config->Read( wxT("w3o"), &w );
323 config->Read( wxT("h3o"), &h ); 323 config->Read( wxT("h3o"), &h );
324 m_mask3old.SetPosition( wxPoint( x, y ) ); 324 m_mask3old.SetPosition( wxPoint( x, y ) );
325 m_mask3old.SetSize( wxSize( w, h ) ); 325 m_mask3old.SetSize( wxSize( w, h ) );
326
327 //
328 config->SetPath( wxT("/Marksheet") );
329
330 config->Read( wxT("lmin"), &lmin );
331 config->Read( wxT("lmax"), &lmax );
332 config->Read( wxT("zmin"), &zmin );
333 config->Read( wxT("zmax"), &zmax );
326 } 334 }
327 /* 印刷 */ 335 /* 印刷 */
328 void MyFrame::PrintImages( wxString hhsno ) 336 void MyFrame::PrintImages( wxString hhsno )
329 { 337 {
330 // 印刷用の html を作成 338 // 印刷用の html を作成
345 while ( cout ) { 353 while ( cout ) {
346 file = path[0] + wxFILE_SEP_PATH + file; 354 file = path[0] + wxFILE_SEP_PATH + file;
347 file.Replace( wxFILE_SEP_PATH, wxT("/") ); 355 file.Replace( wxFILE_SEP_PATH, wxT("/") );
348 wxString tmpjpg = wxString::Format( wxT("%stmp%d.jpg"), tmpdir, n ); 356 wxString tmpjpg = wxString::Format( wxT("%stmp%d.jpg"), tmpdir, n );
349 357
350 double zmin = 0.095713;
351 double zmax = 0.147142;
352 long lmin = 2072393;
353 long lmax = 2472318;
354
355 if ( notyet_mask && IsMarksheet( file, zmin, zmax, lmin, lmax ) ) { // マークシート表面をマスクする 358 if ( notyet_mask && IsMarksheet( file, zmin, zmax, lmin, lmax ) ) { // マークシート表面をマスクする
356 wxImage img_org( file, wxBITMAP_TYPE_JPEG ); 359 wxImage img_org( file, wxBITMAP_TYPE_JPEG );
357 int ver = GetMarksheetVersion( file ); 360 int ver = GetMarksheetVersion( file );
358 if ( ver == 2 ) { 361 if ( ver == 2 ) {
359 img_org.SetRGB( m_mask1, 255, 255, 255 ); // cm name 362 img_org.SetRGB( m_mask1, 255, 255, 255 ); // cm name
397 bp->SetMask2( m_mask2 ); 400 bp->SetMask2( m_mask2 );
398 bp->SetMask3( m_mask3 ); 401 bp->SetMask3( m_mask3 );
399 bp->SetMask1Old( m_mask1old ); 402 bp->SetMask1Old( m_mask1old );
400 bp->SetMask2Old( m_mask2old ); 403 bp->SetMask2Old( m_mask2old );
401 bp->SetMask3Old( m_mask3old ); 404 bp->SetMask3Old( m_mask3old );
405 bp->SetMark( lmin, lmax, zmin, zmax );
402 bp->Show( true ); 406 bp->Show( true );
403 } 407 }
404 /* インデックス作成ダイアログ */ 408 /* インデックス作成ダイアログ */
405 void MyFrame::OnIndex( wxCommandEvent& WXUNUSED(event) ) 409 void MyFrame::OnIndex( wxCommandEvent& WXUNUSED(event) )
406 { 410 {
414 index->ShowModal(); 418 index->ShowModal();
415 } 419 }
416 /* マークシートパラメータ設定ダイアログ */ 420 /* マークシートパラメータ設定ダイアログ */
417 void MyFrame::OnMarkParam( wxCommandEvent& WXUNUSED(event) ) 421 void MyFrame::OnMarkParam( wxCommandEvent& WXUNUSED(event) )
418 { 422 {
419 ParamDialog* param = new ParamDialog( this, wxID_ANY, wxT("マークシート判定パラメータの指定"), wxDefaultPosition, wxSize( 350, 250 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxTAB_TRAVERSAL ); 423 SetParams( 2 );
420 } 424 }
421 /* マスクパラメータ設定ダイアログ */ 425 /* マスクパラメータ設定ダイアログ */
422 void MyFrame::OnMaskParam( wxCommandEvent& WXUNUSED(event) ) 426 void MyFrame::OnMaskParam( wxCommandEvent& WXUNUSED(event) )
423 { 427 {
424 ParamDialog* param = new ParamDialog( this, wxID_ANY, wxT("マスク位置とサイズの指定"), wxDefaultPosition, wxSize( 350, 250 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxTAB_TRAVERSAL ); 428 SetParams( 0 );
429 }
430 /* 設定を保存 */
431 void MyFrame::SetParams( int tab )
432 {
433 ParamDialog* param = new ParamDialog( this, wxID_ANY, wxT("各種パラメータの指定"), wxDefaultPosition, wxSize( 350, 250 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxTAB_TRAVERSAL );
425 param->SetMask1( m_mask1 ); 434 param->SetMask1( m_mask1 );
426 param->SetMask2( m_mask2 ); 435 param->SetMask2( m_mask2 );
427 param->SetMask3( m_mask3 ); 436 param->SetMask3( m_mask3 );
428 param->SetMask1Old( m_mask1old ); 437 param->SetMask1Old( m_mask1old );
429 param->SetMask2Old( m_mask2old ); 438 param->SetMask2Old( m_mask2old );
430 param->SetMask3Old( m_mask3old ); 439 param->SetMask3Old( m_mask3old );
440 param->SetMark( lmin, lmax, zmin, zmax );
431 param->LoadParams(); 441 param->LoadParams();
432 param->ShowWithEffect( wxSHOW_EFFECT_SLIDE_TO_BOTTOM ); 442 param->ShowWithEffect( wxSHOW_EFFECT_SLIDE_TO_BOTTOM );
443 param->SelectTAb( tab );
433 444
434 if ( param->ShowModal() == wxID_OK ) { 445 if ( param->ShowModal() == wxID_OK ) {
435 m_mask1 = param->GetMask1(); 446 m_mask1 = param->GetMask1();
436 m_mask2 = param->GetMask2(); 447 m_mask2 = param->GetMask2();
437 m_mask3 = param->GetMask3(); 448 m_mask3 = param->GetMask3();
438 m_mask1old = param->GetMask1Old(); 449 m_mask1old = param->GetMask1Old();
439 m_mask2old = param->GetMask2Old(); 450 m_mask2old = param->GetMask2Old();
440 m_mask3old = param->GetMask3Old(); 451 m_mask3old = param->GetMask3Old();
452 lmin = param->GetLmin();
453 lmax = param->GetLmax();
454 zmin = param->GetZmin();
455 zmax = param->GetZmax();
441 456
442 config->SetPath( wxT("/Mask") ); 457 config->SetPath( wxT("/Mask") );
443 458
444 config->Write( wxT("x1"), m_mask1.GetX() ); 459 config->Write( wxT("x1"), m_mask1.GetX() );
445 config->Write( wxT("y1"), m_mask1.GetY() ); 460 config->Write( wxT("y1"), m_mask1.GetY() );
468 483
469 config->Write( wxT("x3o"), m_mask3old.GetX() ); 484 config->Write( wxT("x3o"), m_mask3old.GetX() );
470 config->Write( wxT("y3o"), m_mask3old.GetY() ); 485 config->Write( wxT("y3o"), m_mask3old.GetY() );
471 config->Write( wxT("w3o"), m_mask3old.GetWidth() ); 486 config->Write( wxT("w3o"), m_mask3old.GetWidth() );
472 config->Write( wxT("h3o"), m_mask3old.GetHeight() ); 487 config->Write( wxT("h3o"), m_mask3old.GetHeight() );
488
489 config->SetPath( wxT("/Marksheet") );
490
491 config->Write( wxT("lmin"), lmin );
492 config->Write( wxT("lmax"), lmax );
493 config->Write( wxT("zmin"), zmin );
494 config->Write( wxT("zmax"), zmax );
473 495
474 config->Flush( false ); 496 config->Flush( false );
475 } 497 }
476 } 498 }
477 /* データベースファイルのバックアップ */ 499 /* データベースファイルのバックアップ */