Mercurial > mercurial > hgweb_searcher03.cgi
diff src/marksheet.cpp @ 4:fdba695b99f1
More fast ( read from DB ).
Improve the precision of marksheet judgement.
author | pyon@macmini |
---|---|
date | Wed, 11 Sep 2013 19:09:14 +0900 |
parents | c066fde99517 |
children | 52958cd4a073 |
line wrap: on
line diff
--- a/src/marksheet.cpp Tue Aug 27 18:50:00 2013 +0900 +++ b/src/marksheet.cpp Wed Sep 11 19:09:14 2013 +0900 @@ -1,5 +1,5 @@ // Filename : marksheet.cpp -// Last Change: 23-Aug-2013. +// Last Change: 11-Sep-2013. // #include "common.h" @@ -57,7 +57,7 @@ return hhs; } -bool IsMarksheet( wxString& file, float* brate, long* len, double zmin, double zmax, long lmin, long lmax ) +bool IsMarksheet( wxString& file, double zmin, double zmax, long lmin, long lmax ) { wxImage img( file, wxBITMAP_TYPE_JPEG ); int black = 0; @@ -76,9 +76,7 @@ wxFile f( file ); long l = f.Length(); - *brate = z; - *len = l; - //wxPuts(wxString::Format(wxT("z = %f, len = %d"),z,len)); + //wxPuts(wxString::Format(wxT("z = %f, len = %d"),z,l)); if ( zmin < z && z < zmax && lmin < l && l < lmax ) { return true; @@ -86,36 +84,6 @@ return false; } -bool _IsMarksheet( wxString& file, float* brate, long* len ) -{ - wxImage img( file, wxBITMAP_TYPE_JPEG ); - int black = 0; - int x = 2465; - int h = 3500; - unsigned char r, g, b; - - for ( int y=0; y<h; y++ ) { - r = img.GetRed( x, y ); - g = img.GetGreen( x, y ); - b = img.GetBlue( x, y ); - if( IsBlack( (int)r, (int)g, (int)b ) ) black++; - } - float z = (float)black / h; - float zmin = 0.095713; float zmax = 0.108600; - - wxFile f( file ); - long l = f.Length(); - float lmin = 2072393; float lmax = 2346082; - - *brate = z; - *len = l; - //wxPuts(wxString::Format(wxT("z = %f, len = %d"),z,len)); - if ( zmin < z && z < zmax - && lmin < l && l < lmax ) { - return true; - } - return false; -} wxString GetHhsName( wxString& hhsno ) {