Thread: [Gcblue-commits] gcb_wx/src/common simmath.cpp, 1.35, 1.36 tcOptions.cpp, 1.21, 1.22
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/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25403/src/common Modified Files: simmath.cpp tcOptions.cpp Log Message: Index: simmath.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** simmath.cpp 20 Nov 2006 00:17:39 -0000 1.35 --- simmath.cpp 20 Dec 2006 00:45:46 -0000 1.36 *************** *** 29,32 **** --- 29,45 ---- + + float Add_dB(float x_dB, float y_dB) + { + if (fabsf(x_dB - y_dB) > 17.0f) + { + return (x_dB > y_dB) ? x_dB : y_dB; + } + else + { + return 10.0f*log10f(powf(10.0f, 0.1f*x_dB) + powf(10.0f, 0.1f*y_dB)); + } + } + void ConformLonLatRad(float& lon_rad, float& lat_rad) { Index: tcOptions.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptions.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tcOptions.cpp 24 Oct 2006 01:34:02 -0000 1.21 --- tcOptions.cpp 20 Dec 2006 00:45:46 -0000 1.22 *************** *** 144,147 **** --- 144,154 ---- AddOption(oi); + oi.meType = tsOptionInfo::OT_RADIOBUTTON; + oi.mnStateCount = 2; + oi.mnValue = 1; + oi.mpAssociated = &useRayTracingSonar; + oi.mzCaption[0] = "Simple sonar propagation"; + oi.mzCaption[1] = "Use ray tracing"; + AddOption(oi); |