[Cmap-cvs] cmap IngitHeader.h,1.5,1.6 IngitHeader.cpp,1.3,1.4 IngitFile.cpp,1.19,1.20
Status: Beta
Brought to you by:
dyp
From: Denis P. <dy...@us...> - 2004-05-15 03:36:55
|
Update of /cvsroot/cmap/cmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11061 Modified Files: IngitHeader.h IngitHeader.cpp IngitFile.cpp Log Message: Use correct border coordinates. Index: IngitFile.cpp =================================================================== RCS file: /cvsroot/cmap/cmap/IngitFile.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- IngitFile.cpp 12 May 2004 19:20:01 -0000 1.19 +++ IngitFile.cpp 15 May 2004 03:36:46 -0000 1.20 @@ -292,9 +292,7 @@ exit(1); break; } - if (Num_Segment > Max_Num_Segment) { - exit(1); - } + ASSERT(Num_Segment <= Max_Num_Segment); } return num_array; } Index: IngitHeader.cpp =================================================================== RCS file: /cvsroot/cmap/cmap/IngitHeader.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- IngitHeader.cpp 5 May 2004 16:35:52 -0000 1.3 +++ IngitHeader.cpp 15 May 2004 03:36:46 -0000 1.4 @@ -26,15 +26,21 @@ //fprintf( fOut, "LAT_SouthEast=%09i LON_SouthEast=%09i ", LAT_SouthEast, LON_SouthEast); //fprintf( fOut, "LAT_NorthEast=%09i LON_NorthEast=%09i ", LAT_NorthEast, LON_NorthEast); fprintf(fOut, "\nMap border [DDD MM SS.SS]\n\n"); + fprintf(fOut, "South West\n"); PrintLatDegrees(fOut, LAT_SouthWest); PrintLonDegrees(fOut, LON_SouthWest); fprintf(fOut, "\n"); - PrintLatDegrees(fOut, LAT_SouthEast); - PrintLonDegrees(fOut, LON_NorthEast); - fprintf(fOut, "\n"); + + fprintf(fOut, "North East\n"); PrintLatDegrees(fOut, LAT_NorthEast); PrintLonDegrees(fOut, LON_NorthEast); fprintf(fOut, "\n"); + + fprintf(fOut, "Fragment South West\n"); + PrintLatDegrees(fOut, LAT_FragmentSW); + PrintLonDegrees(fOut, LON_FragmentSW); + fprintf(fOut, "\n"); + // Êîîðäèíàòû ðàìêè â ìåòðèêå fprintf(fOut, "Metric map border [m]\n"); fprintf( fOut, "BottomLeft %.1f, %.1f\n", xBottomLeft / 10.0, yBottomLeft / 10.0); Index: IngitHeader.h =================================================================== RCS file: /cvsroot/cmap/cmap/IngitHeader.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- IngitHeader.h 5 May 2004 16:35:52 -0000 1.5 +++ IngitHeader.h 15 May 2004 03:36:46 -0000 1.6 @@ -7,12 +7,12 @@ class IngitHeader { public: - long LON_SouthEast, - LAT_SouthEast, - LON_NorthEast, - LAT_NorthEast, - LON_SouthWest, - LAT_SouthWest; + long LON_SouthWest; + long LAT_SouthWest; + long LON_NorthEast; + long LAT_NorthEast; + long LON_FragmentSW; + long LAT_FragmentSW; short scale1, scale2, // èñõîäíûé ìàñøòàá = 1:(scale1*scale2) scaleX, // Êîîîðäèíàòà xTopRight â ìåòðèêå ôàéëà. |