Mercurial > mercurial > hgweb_searcher03.cgi
diff src/myframe.cpp @ 7:7ac7d28699af
Display DB update day.
Ask print image with mask or not.
| author | pyon@macmini |
|---|---|
| date | Thu, 17 Oct 2013 19:54:23 +0900 |
| parents | bc2e2b304095 |
| children | 4967d1e2b30c |
line wrap: on
line diff
--- a/src/myframe.cpp Wed Sep 18 18:20:40 2013 +0900 +++ b/src/myframe.cpp Thu Oct 17 19:54:23 2013 +0900 @@ -1,5 +1,5 @@ // Filename : myframe.cpp -// Last Change: 13-Sep-2013. +// Last Change: 17-Oct-2013. // #include "main.h" #include "db.h" @@ -335,6 +335,12 @@ /* 印刷 */ void MyFrame::PrintImages( wxString hhsno ) { + bool mask_flag = false; + wxMessageDialog md( this, wxT("マクスしますか？"), wxT("印刷オプション"), wxYES_NO, wxDefaultPosition ); + if ( md.ShowModal() == wxID_YES ) { + mask_flag = true; + } + // 印刷用の html を作成 wxArrayString path = GetPathByHhsNo( hhsno ); if ( path.IsEmpty() ) return; @@ -357,16 +363,18 @@ if ( notyet_mask && IsMarksheet( file, zmin, zmax, lmin, lmax ) ) { // マークシート表面をマスクする wxImage img_org( file, wxBITMAP_TYPE_JPEG ); - int ver = GetMarksheetVersion( file ); - if ( ver == 2 ) { - img_org.SetRGB( m_mask1, 255, 255, 255 ); // cm name - img_org.SetRGB( m_mask2, 255, 255, 255 ); // cm no. - img_org.SetRGB( m_mask3, 255, 255, 255 ); // barcode - } - else { // 古いマークシート ver == 1 - img_org.SetRGB( m_mask1old, 255, 255, 255 ); // cm name - img_org.SetRGB( m_mask2old, 255, 255, 255 ); // cm no. - img_org.SetRGB( m_mask3old, 255, 255, 255 ); // barcode + if ( mask_flag ) { + int ver = GetMarksheetVersion( file ); + if ( ver == 2 ) { + img_org.SetRGB( m_mask1, 255, 255, 255 ); // cm name + img_org.SetRGB( m_mask2, 255, 255, 255 ); // cm no. + img_org.SetRGB( m_mask3, 255, 255, 255 ); // barcode + } + else { // 古いマークシート ver == 1 + img_org.SetRGB( m_mask1old, 255, 255, 255 ); // cm name + img_org.SetRGB( m_mask2old, 255, 255, 255 ); // cm no. + img_org.SetRGB( m_mask3old, 255, 255, 255 ); // barcode + } } img_org.SaveFile( tmpjpg ); notyet_mask = false; @@ -412,10 +420,9 @@ config->SetPath( wxT("/Index") ); config->Read( wxT("rootdir"), &rootdir ); - IndexDialog* index = new IndexDialog( this, wxID_ANY, wxT("インデックス作成"), wxDefaultPosition, wxSize( 700, 600 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxTAB_TRAVERSAL ); - index->ShowWithEffect( wxSHOW_EFFECT_SLIDE_TO_BOTTOM ); + IndexDialog* index = new IndexDialog( this, wxID_ANY, wxT("インデックス作成"), wxDefaultPosition, wxSize( 700, 600 ), wxDEFAULT_DIALOG_STYLE|wxSTAY_ON_TOP ); + index->ShowModal(); index->SetRootdir( rootdir ); - index->ShowModal(); } /* マークシートパラメータ設定ダイアログ */ void MyFrame::OnMarkParam( wxCommandEvent& WXUNUSED(event) )