changeset 18:a8e6e5769e3b

Small fixes.
author pyon@macmini
date Sat, 29 Nov 2014 11:02:35 +0900
parents acb59fbbe5ee
children 3bb803d8c1d7
files Changes image/thumbnail.png src/cache.cpp src/myframe.cpp start.bat
diffstat 3 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Changes	Mon Jul 28 21:40:42 2014 +0900
+++ b/Changes	Sat Nov 29 11:02:35 2014 +0900
@@ -1,3 +1,13 @@
+version 03.21
+2014-11-21
+ Small changes.
+
+----
+version 03.20
+2014-08-12
+ Print HHSNo on marksheet.
+
+----
 version 03.19
 2014-07-30
  Bug fix.
--- a/src/cache.cpp	Mon Jul 28 21:40:42 2014 +0900
+++ b/src/cache.cpp	Sat Nov 29 11:02:35 2014 +0900
@@ -1,5 +1,5 @@
 // Filename   : cache.cpp
-// Last Change: 08-May-2014.
+// Last Change: 21-Nov-2014.
 //
 
 #include "cache.h"
@@ -80,7 +80,7 @@
             if ( !tf.Exists() ) tf.Mkdir( wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL );
             output.SaveFile( buf, wxBITMAP_TYPE_PNG );
         }
-
+        wxSleep( 30 );
     }
 
     wxMessageBox( wxT("cache updated.") );
--- a/src/myframe.cpp	Mon Jul 28 21:40:42 2014 +0900
+++ b/src/myframe.cpp	Sat Nov 29 11:02:35 2014 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.cpp
-// Last Change: 28-Jul-2014.
+// Last Change: 21-Nov-2014.
 //
 #include "main.h"
 #include "db.h"
@@ -544,6 +544,7 @@
             wxCopyFile( file, tmpjpg, true );
         }
         html = html + wxT("<img src=\"") + tmpjpg + wxT("\" width=\"750\" height=\"1060\"/>");
+        html = html + wxT("<div align=right><font size=-2><u>") + hhsno + wxT("</u></font></div>");
         cout = dir.GetNext( &file );
         n++;
     }
@@ -745,6 +746,7 @@
         wxTheClipboard->Close();
     }
 
+    s.Replace( wxT(" "), wxT(""), true );
     wxRegEx reHhs( wxT("^0[1238][0-9]{8}$") );
     if ( reHhs.Matches( s ) ) {
         m_hhsno = s;