# HG changeset patch
# User pyon@macmini
# Date 1308658591 -32400
# Node ID db7bd315e52cc65027ba4dc221a27a345e8a20a9
# Parent  c6099901f666723440f670c5f5e0bc2f4386d4d0
editing mark-sheet image.

diff -r c6099901f666 -r db7bd315e52c html/start.html
--- a/html/start.html	Mon Apr 18 18:59:41 2011 +0900
+++ b/html/start.html	Tue Jun 21 21:16:31 2011 +0900
@@ -16,8 +16,11 @@
 		<h2><font color="green">改訂履歴</font></h2>
 		<table border="1">
 			<tr bgcolor="#ffcc33"> <th>年月日</th>  <th>バージョン</th>  <th>内容</th> </tr>
-            <tr> <td>2011.04.11</td> <td align="center">2.10</td> <td>イージープリント機能搭載</td> </tr>
-            <tr> <td>2011.04.11</td> <td align="center">2.9</td> <td>プレビューモード搭載</td> </tr>
+            <!--
+            <tr> <td>2011.04.11</td> <td align="center">2.11</td> <td>イージープリント機能搭載</td> </tr>
+            <tr> <td>2011.04.11</td> <td align="center">2.10</td> <td>プレビューモード搭載</td> </tr>
+            -->
+            <tr> <td>2011.06.30</td> <td align="center">2.9</td> <td>のぞき窓搭載</td> </tr>
 			<tr> <td>2011.04.01</td> <td align="center">2.8</td> <td>細かい機能追加</td> </tr>
 			<tr> <td>2011.03.31</td> <td align="center">2.7</td> <td>細かい機能追加</td> </tr>
 			<tr> <td>2011.03.28</td> <td align="center">2.6</td> <td>細かい修正</td> </tr>
diff -r c6099901f666 -r db7bd315e52c html/todo.html
--- a/html/todo.html	Mon Apr 18 18:59:41 2011 +0900
+++ b/html/todo.html	Tue Jun 21 21:16:31 2011 +0900
@@ -16,3 +16,4 @@
         * grid をクリックしたら，検索ボックスに被保険者番号をセット<br />
     </body>
 </html>
+
diff -r c6099901f666 -r db7bd315e52c src/main.cpp
--- a/src/main.cpp	Mon Apr 18 18:59:41 2011 +0900
+++ b/src/main.cpp	Tue Jun 21 21:16:31 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : main.cpp
-// Last Change: 09-Apr-2011.
+// Last Change: 21-Jun-2011.
 //
 
 #include "common.h"
diff -r c6099901f666 -r db7bd315e52c src/myframe.cpp
--- a/src/myframe.cpp	Mon Apr 18 18:59:41 2011 +0900
+++ b/src/myframe.cpp	Tue Jun 21 21:16:31 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : mainframe.cpp
-// Last Change: 09-Apr-2011.
+// Last Change: 21-Jun-2011.
 //
 
 #include "symbol.h"
@@ -161,8 +161,9 @@
     h->Show(true);
     g->Show(false);
 
-	wxRegEx reHhs(wxT("^0[1238][0-9]{8}$"));	// 被保番チェック
-	wxRegEx reCno(wxT("^[0-9]{1,2}$"));         // 開くフォルダの番号
+	wxRegEx reHhs(wxT("^0[1238][0-9]{8}$"));	// 1:被保番チェック
+	wxRegEx reCno(wxT("^[0-9]{1,2}$"));         // 2:開くフォルダの番号
+	wxRegEx rePrint(wxT("^.[0-9]{1,2}$"));     // 3:印刷するフォルダの番号
 
 	wxString cmd;
 	cmd = this->GetLineText(0);
@@ -171,6 +172,8 @@
 		cond = 1;
 	else if ( reCno.Matches( cmd ) )
 		cond = 2;
+	else if ( rePrint.Matches( cmd ) )
+		cond = 3;
 
 	wxString htmlbody;
 
@@ -293,6 +296,10 @@
 
 			break;
 		}
+		// ファイル印刷
+		case 3: {
+			break;
+		}
 		// 制御用コマンド
 		case 0: {
 
diff -r c6099901f666 -r db7bd315e52c src/preview.cpp
--- a/src/preview.cpp	Mon Apr 18 18:59:41 2011 +0900
+++ b/src/preview.cpp	Tue Jun 21 21:16:31 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : preview.cpp
-// Last Change: 16-Apr-2011.
+// Last Change: 21-Jun-2011.
 //
 
 #include "preview.h"
@@ -117,7 +117,13 @@
         wxString mfile = path + wxFILE_SEP_PATH + file;
         wxImage img( mfile, wxBITMAP_TYPE_JPEG );
         wxBitmap bmp( img.Scale( 640, 877, wxIMAGE_QUALITY_HIGH ) );
-        m_bitmap->SetBitmap( bmp);
+
+        wxImage img2;
+        //img2 = img.Size( wxSize(626,288), wxPoint(328,556), -1, -1, -1 );
+        img2 = img.Size( wxSize(954,844), wxPoint(328,556), -1, -1, -1 );
+
+        wxBitmap bmp2( img2.Scale( 626, 288, wxIMAGE_QUALITY_HIGH ) );
+        m_bitmap->SetBitmap( bmp2 );
     }
     // thumbnail
     int i=0;