[Gcblue-commits] gcb_wx/src/database tcSonarDBObject.cpp,1.6,1.7
Status: Alpha
Brought to you by:
ddcforge
From: Dewitt C. <ddc...@us...> - 2006-12-20 00:45:49
|
Update of /cvsroot/gcblue/gcb_wx/src/database In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25403/src/database Modified Files: tcSonarDBObject.cpp Log Message: Index: tcSonarDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSonarDBObject.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcSonarDBObject.cpp 20 Nov 2006 00:17:40 -0000 1.6 --- tcSonarDBObject.cpp 20 Dec 2006 00:45:46 -0000 1.7 *************** *** 46,52 **** { // Thorp eqn ! float freq_avg_kHz = 0.0005 * (minFrequency_Hz + maxFrequency_Hz); ! if (freq_avg_kHz < 0) freq_avg_kHz = 2.0f; float f2 = freq_avg_kHz * freq_avg_kHz; --- 46,54 ---- { // Thorp eqn ! averageFreq_Hz = 0.5 * (minFrequency_Hz + maxFrequency_Hz); ! if (averageFreq_Hz <= 0) averageFreq_Hz = 2000.0f; + float freq_avg_kHz = 0.001f * averageFreq_Hz; + float f2 = freq_avg_kHz * freq_avg_kHz; |