diff src/bprint.cpp @ 8:4967d1e2b30c

Alert when not mask in batch print mode.
author pyon@macmini
date Fri, 01 Nov 2013 18:44:37 +0900
parents 76db82822e73
children 52958cd4a073
line wrap: on
line diff
--- a/src/bprint.cpp	Thu Oct 17 19:54:23 2013 +0900
+++ b/src/bprint.cpp	Fri Nov 01 18:44:37 2013 +0900
@@ -1,5 +1,5 @@
 // Filename   : bprint.cpp
-// Last Change: 18-Sep-2013.
+// Last Change: 01-Nov-2013.
 //
 
 #include "bprint.h"
@@ -36,7 +36,7 @@
     m_grid->SetColSize( 0, 100 );
     m_grid->SetColSize( 1, 100 );
     m_grid->SetColSize( 2, 220 );
-    m_grid->SetColSize( 3,  70 );
+    m_grid->SetColSize( 3,  90 );
     m_grid->ShowScrollbars( wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS );
 	
 	// Rows
@@ -158,6 +158,7 @@
                     img_org.SetRGB( m_mask3old, 255, 255, 255 );   // barcode
                 }
                 img_org.SaveFile( tmpjpg );
+                notyet_mask = false;
             }
             else {
                 wxCopyFile( file, tmpjpg, true );
@@ -175,8 +176,14 @@
         hpout.SetHtmlText( html, wxEmptyString, false );
         p.Print( NULL, &hpout, false );
 
-        m_grid->SetCellValue( r, 3, wxT("処理済") );
-        log.Add( path );
+        wxString pst = wxT("処理済");
+        wxString logmsg = path;
+        if ( notyet_mask ) {
+            pst.Append( wxT(" 非マスク") );
+            logmsg.Append( wxT(" not mask") );
+        }
+        m_grid->SetCellValue( r, 3, pst );
+        log.Add( logmsg );
     }
     WriteLog( log );
 }