Mercurial > mercurial > hgweb_searcher03.cgi

comparison src/bprint.cpp @ 5:bc2e2b304095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up code.
author pyon@macmini
date Sat, 14 Sep 2013 08:54:47 +0900
parents fdba695b99f1
children 76db82822e73
comparison
equal deleted inserted replaced
4:fdba695b99f1 5:bc2e2b304095
1 // Filename : bprint.cpp 1 // Filename : bprint.cpp
2 // Last Change: 11-Sep-2013. 2 // Last Change: 13-Sep-2013.
3 // 3 //
4 4
5 #include "bprint.h" 5 #include "bprint.h"
6 #include "marksheet.h" 6 #include "marksheet.h"
7 #include "dndfile.h" 7 #include "dndfile.h"
141 while ( cout ) { 141 while ( cout ) {
142 file = path + wxFILE_SEP_PATH + file; 142 file = path + wxFILE_SEP_PATH + file;
143 file.Replace( wxFILE_SEP_PATH, wxT("/") ); 143 file.Replace( wxFILE_SEP_PATH, wxT("/") );
144 wxString tmpjpg = wxString::Format( wxT("%stmp%d.jpg"), tmpdir, n ); 144 wxString tmpjpg = wxString::Format( wxT("%stmp%d.jpg"), tmpdir, n );
145 145
146 double zmin = 0.095713; 146 if ( notyet_mask && IsMarksheet( file, m_zmin, m_zmax, m_lmin, m_lmax ) ) { // マークシート表面をマスクする
147 double zmax = 0.147142;
148 long lmin = 2072393;
149 long lmax = 2472318;
150
151 if ( notyet_mask && IsMarksheet( file, zmin, zmax, lmin, lmax ) ) { // マークシート表面をマスクする
152 wxImage img_org( file, wxBITMAP_TYPE_JPEG ); 147 wxImage img_org( file, wxBITMAP_TYPE_JPEG );
153 int ver = GetMarksheetVersion( file ); 148 int ver = GetMarksheetVersion( file );
154 if ( ver == 2 ) { 149 if ( ver == 2 ) {
155 img_org.SetRGB( m_mask1, 255, 255, 255 ); // cm name 150 img_org.SetRGB( m_mask1, 255, 255, 255 ); // cm name
156 img_org.SetRGB( m_mask2, 255, 255, 255 ); // cm no. 151 img_org.SetRGB( m_mask2, 255, 255, 255 ); // cm no.