[Gcblue-commits] gcb_wx/src/common simmath.cpp,1.28,1.29 tcSoundConsole.cpp,1.12,1.13 tcStream.cpp,1
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-09-10 21:47:46
|
Update of /cvsroot/gcblue/gcb_wx/src/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1255/src/common Modified Files: simmath.cpp tcSoundConsole.cpp tcStream.cpp Log Message: GCB 0.8.0 release Index: tcSoundConsole.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSoundConsole.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcSoundConsole.cpp 27 Jan 2005 01:01:48 -0000 1.12 --- tcSoundConsole.cpp 10 Sep 2005 21:47:38 -0000 1.13 *************** *** 133,136 **** --- 133,137 ---- int topMargin = 0; int bottomMargin = 0; + int wrap = 25; if (current) { *************** *** 138,141 **** --- 139,143 ---- elt->Attribute("TopMargin", &topMargin); elt->Attribute("BottomMargin", &bottomMargin); + elt->Attribute("Wrap", &wrap); } *************** *** 145,148 **** --- 147,152 ---- size.GetWidth(), size.GetHeight() - (topMargin + bottomMargin)); + SetWrap(wrap); + } Index: simmath.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** simmath.cpp 20 Jul 2005 16:24:53 -0000 1.28 --- simmath.cpp 10 Sep 2005 21:47:38 -0000 1.29 *************** *** 475,498 **** /******************************* tcTerrainInfo *******************************/ ! void tcTerrainInfo::Clear() { mfHeight_m = 0; mfLatDatum = 0; mfLonDatum = 0; - mnType = 0; } ! void tcTerrainInfo::Serialize(tcFile& file, bool abLoad) { ! if (abLoad) { ! file.Read(&mnType,sizeof(mnType)); ! file.Read(&mfHeight_m,sizeof(mfHeight_m)); ! file.Read(&mfLonDatum,sizeof(mfLonDatum)); ! file.Read(&mfLatDatum,sizeof(mfLatDatum)); ! } ! else { ! file.Write(&mnType,sizeof(mnType)); ! file.Write(&mfHeight_m,sizeof(mfHeight_m)); ! file.Write(&mfLonDatum,sizeof(mfLonDatum)); ! file.Write(&mfLatDatum,sizeof(mfLatDatum)); ! } } --- 475,501 ---- /******************************* tcTerrainInfo *******************************/ ! void tcTerrainInfo::Clear() ! { mfHeight_m = 0; + lookAheadHeight_m = 0; mfLatDatum = 0; mfLonDatum = 0; } ! void tcTerrainInfo::Serialize(tcFile& file, bool abLoad) ! { ! wxASSERT(false); ! if (abLoad) ! { ! file.Read(&mfHeight_m,sizeof(mfHeight_m)); ! file.Read(&mfLonDatum,sizeof(mfLonDatum)); ! file.Read(&mfLatDatum,sizeof(mfLatDatum)); ! } ! else ! { ! file.Write(&mfHeight_m,sizeof(mfHeight_m)); ! file.Write(&mfLonDatum,sizeof(mfLonDatum)); ! file.Write(&mfLatDatum,sizeof(mfLatDatum)); ! } } Index: tcStream.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcStream.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcStream.cpp 26 Jul 2005 00:37:03 -0000 1.12 --- tcStream.cpp 10 Sep 2005 21:47:38 -0000 1.13 *************** *** 200,203 **** --- 200,209 ---- { size_t len = val.size(); + if (len >= 2048) + { + fprintf(stderr, "tcStream::operator<<(std::string& val) - length overflow, truncating (%d)\n", + len); + len = 2047; // truncate + } write((char*)&len, sizeof(len)); write(val.c_str(), (std::streamsize)len); |