gpredict-svn Mailing List for Gpredict (Page 17)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
You can subscribe to this list here.
| 2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
| 2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
| 2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
|
From: <cs...@us...> - 2009-12-30 17:43:28
|
Revision: 565
http://gpredict.svn.sourceforge.net/gpredict/?rev=565&view=rev
Author: csete
Date: 2009-12-30 16:57:37 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/data/trsp/28375.trsp
Modified: trunk/data/trsp/28375.trsp
===================================================================
--- trunk/data/trsp/28375.trsp 2009-12-29 18:43:41 UTC (rev 564)
+++ trunk/data/trsp/28375.trsp 2009-12-30 16:57:37 UTC (rev 565)
@@ -1,16 +1,16 @@
-[Mode V/U FM Voice1]
+[Mode V/U USB/FM]
UP_LOW=145880000
DOWN_LOW=435150000
-[Mode V/U FM Voice2]
+[Mode V/U FM]
UP_LOW=145920000
DOWN_LOW=435300000
-[Mode V/S FM Voice]
+[Mode V/S FM]
UP_LOW=145880000
DOWN_LOW=2401200000
-[Mode L/U FM Voice]
+[Mode L/U FM]
UP_LOW=1268700000
DOWN_LOW=435300000
@@ -18,6 +18,6 @@
UP_LOW=1268700000
DOWN_LOW=435150000
-[Mode L/S FM Voice]
+[Mode L/S FM]
UP_LOW=1268700000
DOWN_LOW=2401200000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-30 17:00:02
|
Revision: 566
http://gpredict.svn.sourceforge.net/gpredict/?rev=566&view=rev
Author: csete
Date: 2009-12-30 16:59:51 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
Updated. satellite data.
Modified Paths:
--------------
trunk/data/satdata/satellites.dat
trunk/data/satdata/tle-new.cat
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2009-12-30 16:57:37 UTC (rev 565)
+++ trunk/data/satdata/satellites.dat 2009-12-30 16:59:51 UTC (rev 566)
@@ -3,85 +3,85 @@
VERSION=1.1
NAME=SPOT 4
NICKNAME=SPOT 4
-TLE1=1 25260U 98017A 09357.68545683 .00000103 00000-0 69855-4 0 7695
-TLE2=2 25260 98.6788 67.1135 0001446 82.2245 69.4444 14.19350937609226
+TLE1=1 25260U 98017A 09364.15266337 .00000038 00000-0 38903-4 0 7889
+TLE2=2 25260 98.6787 73.4511 0001357 75.2437 343.0344 14.19350902610144
[26390]
VERSION=1.1
NAME=SIRIUS-1
NICKNAME=SIRIUS-1
-TLE1=1 26390U 00035A 09357.63002396 .00000000 00000-0 10000-3 0 6071
-TLE2=2 26390 61.3550 253.7220 2678665 269.6705 60.1348 1.00282572 34756
+TLE1=1 26390U 00035A 09361.61925365 .00000039 00000-0 10000-3 0 6100
+TLE2=2 26390 61.3474 253.6829 2725911 269.9260 59.4045 1.00279585 34789
[24971]
VERSION=1.1
NAME=IRS-1D
NICKNAME=IRS-1D
-TLE1=1 24971U 97057A 09357.65537844 .00000031 00000-0 25513-4 0 9564
-TLE2=2 24971 98.2175 24.3663 0055154 89.5618 271.1867 14.32965075639965
+TLE1=1 24971U 97057A 09364.14916487 .00000022 00000-0 22562-4 0 9752
+TLE2=2 24971 98.2180 30.5295 0055081 70.5425 290.1702 14.32965799640892
[25418]
VERSION=1.1
NAME=ORBCOMM FM15 [+]
NICKNAME=ORBCOMM FM15 [+]
-TLE1=1 25418U 98046F 09357.71984732 -.00000049 00000-0 36019-4 0 2688
-TLE2=2 25418 45.0003 99.8022 0003926 226.2983 133.7523 14.27683367593778
+TLE1=1 25418U 98046F 09363.59784878 .00000174 00000-0 12564-3 0 2721
+TLE2=2 25418 45.0001 72.3948 0004056 253.9833 106.0549 14.27685788594619
[25285]
VERSION=1.1
NAME=IRIDIUM 62 [+]
NICKNAME=IRIDIUM 62 [+]
-TLE1=1 25285U 98021A 09357.17150878 -.00000446 00000-0 -16637-3 0 8040
-TLE2=2 25285 86.3957 286.1688 0002389 80.0729 280.0738 14.34212032613290
+TLE1=1 25285U 98021A 09363.31114662 .00000188 00000-0 60163-4 0 8128
+TLE2=2 25285 86.3945 283.6029 0002322 76.6705 283.4762 14.34216263614172
[25354]
VERSION=1.1
NAME=CHINASTAR 1
NICKNAME=CHINASTAR 1
-TLE1=1 25354U 98033A 09356.94829256 .00000000 00000-0 10000-3 0 6991
-TLE2=2 25354 0.0078 245.5403 0001939 32.1703 242.8177 1.00267923 46929
+TLE1=1 25354U 98033A 09362.03972506 -.00000184 00000-0 10000-3 0 7035
+TLE2=2 25354 0.0299 255.9403 0002913 41.2701 261.2706 1.00271408 46972
[27811]
VERSION=1.1
NAME=HELLAS-SAT 2
NICKNAME=HELLAS-SAT 2
-TLE1=1 27811U 03020A 09355.87021866 .00000169 00000-0 10000-3 0 311
-TLE2=2 27811 0.0077 293.1284 0002099 323.8590 185.8406 1.00273857 24117
+TLE1=1 27811U 03020A 09361.77536119 .00000176 00000-0 10000-3 0 340
+TLE2=2 27811 0.0365 264.6690 0002903 358.1733 151.6924 1.00274622 24178
[23571]
VERSION=1.1
NAME=INTELSAT 706 (IS-706)
NICKNAME=INTELSAT 706 (IS-706)
-TLE1=1 23571U 95023A 09355.83580892 .00000102 00000-0 10000-3 0 350
-TLE2=2 23571 0.0161 8.3428 0002589 252.0634 185.8612 1.00273071 53458
+TLE1=1 23571U 95023A 09356.87910115 .00000105 00000-0 10000-3 0 364
+TLE2=2 23571 0.0152 12.3824 0002516 242.6294 207.8725 1.00273184 53466
[12389]
VERSION=1.1
NAME=SL-8 R/B
NICKNAME=SL-8 R/B
-TLE1=1 12389U 81033B 09356.58820194 .00003028 00000-0 98897-4 0 5341
-TLE2=2 12389 82.9172 156.5111 0404181 289.5131 66.2855 14.78151689464827
+TLE1=1 12389U 81033B 09363.83131703 .00002910 00000-0 95091-4 0 5407
+TLE2=2 12389 82.9179 150.1179 0403823 265.3862 90.1135 14.78194288465890
[28485]
VERSION=1.1
NAME=SWIFT
NICKNAME=SWIFT
-TLE1=1 28485U 04047A 09357.11531699 .00000663 00000-0 24339-4 0 4660
-TLE2=2 28485 20.5609 342.7203 0014516 237.9395 121.9640 14.92624968277939
+TLE1=1 28485U 04047A 09363.93316833 .00000707 00000-0 28615-4 0 4714
+TLE2=2 28485 20.5612 295.8736 0014175 322.8188 37.1304 14.92629354278959
[29107]
VERSION=1.1
NAME=CLOUDSAT
NICKNAME=CLOUDSAT
-TLE1=1 29107U 06016A 09357.31683233 .00000241 00000-0 63598-4 0 1630
-TLE2=2 29107 98.2008 298.6270 0001349 87.0035 273.1298 14.57116666194416
+TLE1=1 29107U 06016A 09363.49707074 .00000081 00000-0 27984-4 0 1682
+TLE2=2 29107 98.2003 304.7128 0001402 87.6582 272.4780 14.57117351195315
[25736]
VERSION=1.1
NAME=MUBLCOM
NICKNAME=MUBLCOM
-TLE1=1 25736U 99026B 09357.33414558 .00000194 00000-0 66917-4 0 9083
-TLE2=2 25736 97.7745 272.4242 0005135 186.7537 173.3594 14.44620246558102
+TLE1=1 25736U 99026B 09362.80594674 .00000127 00000-0 47746-4 0 9129
+TLE2=2 25736 97.7736 277.4332 0005292 168.9889 191.1415 14.44622288558897
[28496]
VERSION=1.1
@@ -94,190 +94,190 @@
VERSION=1.1
NAME=CALSPHERE 2
NICKNAME=CALSPHERE 2
-TLE1=1 00902U 64063E 09357.33409409 .00000075 00000-0 10000-3 0 2366
-TLE2=2 00902 90.1537 333.1300 0019949 61.1634 299.1510 13.52470315 42930
+TLE1=1 00902U 64063E 09363.47466763 .00000075 00000-0 10000-3 0 2410
+TLE2=2 00902 90.1548 333.2262 0019803 44.9018 315.3726 13.52470384 43762
[23711]
VERSION=1.1
NAME=SURFSAT
NICKNAME=SURFSAT
-TLE1=1 23711U 95059B 09357.22918175 -.00000108 00000-0 -13151-3 0 4058
-TLE2=2 23711 100.3094 354.4268 0368472 47.3229 315.8219 13.12570635677239
+TLE1=1 23711U 95059B 09363.47930865 .00000189 00000-0 45624-3 0 4093
+TLE2=2 23711 100.3104 0.4956 0368462 33.0600 329.2958 13.12573531678055
[24842]
VERSION=1.1
NAME=IRIDIUM 911 [-]
NICKNAME=IRIDIUM 911 [-]
-TLE1=1 24842U 97030G 09356.75069805 .00000171 00000-0 44736-4 0 5388
-TLE2=2 24842 86.4444 55.3661 0015572 146.7377 213.4804 14.43207040658481
+TLE1=1 24842U 97030G 09363.54547070 .00000111 00000-0 26885-4 0 5466
+TLE2=2 24842 86.4438 52.5230 0016347 125.7179 234.5554 14.43208081659464
[22220]
VERSION=1.1
NAME=SL-16 R/B
NICKNAME=SL-16 R/B
-TLE1=1 22220U 92076B 09357.48417730 -.00000207 00000-0 -80502-4 0 687
-TLE2=2 22220 70.9990 50.1099 0011222 121.8011 238.4232 14.16147382883864
+TLE1=1 22220U 92076B 09363.77069655 .00000183 00000-0 11635-3 0 732
+TLE2=2 22220 70.9992 36.8832 0011150 110.1211 250.1125 14.16152442884759
[32388]
VERSION=1.1
NAME=HORIZONS 2
NICKNAME=HORIZONS 2
-TLE1=1 32388U 07063B 09356.36105843 -.00000235 00000-0 10000-3 0 3116
-TLE2=2 32388 0.0143 286.8207 0001952 2.7181 217.4299 1.00271073 7500
+TLE1=1 32388U 07063B 09362.43134821 -.00000230 00000-0 10000-3 0 3136
+TLE2=2 32388 0.0350 268.9782 0002804 10.2883 258.9970 1.00272122 7567
[25772]
VERSION=1.1
NAME=GLOBALSTAR M047
NICKNAME=GLOBALSTAR M047
-TLE1=1 25772U 99031C 09357.79835264 -.00000086 00000-0 10000-3 0 1590
-TLE2=2 25772 51.9929 162.3646 0002619 113.9001 246.2140 12.62276358486112
+TLE1=1 25772U 99031C 09363.89547552 -.00000086 00000-0 10000-3 0 1644
+TLE2=2 25772 51.9930 143.7991 0002671 126.4013 233.7095 12.62276547486884
[15427]
VERSION=1.1
NAME=NOAA 9 [P]
NICKNAME=NOAA 9 [P]
-TLE1=1 15427U 84123A 09357.04432480 -.00000219 00000-0 -91234-4 0 9465
-TLE2=2 15427 98.4542 344.8979 0014146 233.7846 126.2043 14.15335055291671
+TLE1=1 15427U 84123A 09363.05336407 -.00000188 00000-0 -75555-4 0 9536
+TLE2=2 15427 98.4550 350.5979 0014266 215.5160 144.5061 14.15336133292520
[28190]
VERSION=1.1
NAME=GPS BIIR-11 (DASS)
NICKNAME=GPS BIIR-11 (DASS)
-TLE1=1 28190U 04009A 09356.37693301 .00000086 00000-0 10000-3 0 3787
-TLE2=2 28190 54.8689 154.8682 0060249 347.1001 12.7314 2.00562749 42226
+TLE1=1 28190U 04009A 09361.86133251 .00000092 00000-0 10000-3 0 3855
+TLE2=2 28190 54.8713 154.6526 0060247 347.2880 12.5478 2.00562616 42337
[36113]
VERSION=1.1
-NAME=COSMOS 2457 [GLONASS-M]
-NICKNAME=COSMOS 2457 [GLONASS-M]
-TLE1=1 36113U 09070C 09357.70000000 -.00000032 00000-0 00000+0 0 212
-TLE2=2 36113 64.7880 277.5630 0042744 231.5060 316.6160 2.14594994 197
+NAME=COSMOS 2458 [GLONASS-M]
+NICKNAME=COSMOS 2458 [GLONASS-M]
+TLE1=1 36113U 09070C 09364.20065851 -.00000004 00000-0 00000+0 0 309
+TLE2=2 36113 64.7988 277.3400 0006160 289.4656 227.8221 2.13308232 338
[25288]
VERSION=1.1
NAME=IRIDIUM 65 [+]
NICKNAME=IRIDIUM 65 [+]
-TLE1=1 25288U 98021D 09357.05099713 -.00000480 00000-0 -17848-3 0 8032
-TLE2=2 25288 86.3956 286.1922 0001959 74.0650 286.0726 14.34212761613271
+TLE1=1 25288U 98021D 09363.33017426 .00000103 00000-0 29798-4 0 8130
+TLE2=2 25288 86.3954 283.5677 0001966 83.9659 276.1777 14.34215765614176
[25922]
VERSION=1.1
NAME=GALAXY 27 (G-27)
NICKNAME=GALAXY 27 (G-27)
-TLE1=1 25922U 99052A 09354.72658137 .00000072 00000-0 10000-3 0 5781
-TLE2=2 25922 0.0109 26.9070 0002122 252.3648 302.7232 1.00272051 37493
+TLE1=1 25922U 99052A 09362.09204954 .00000082 00000-0 10000-3 0 5808
+TLE2=2 25922 0.0185 321.2650 0002454 314.2109 85.3672 1.00272284 37579
[26766]
VERSION=1.1
NAME=INTELSAT 10 (IS-10)
NICKNAME=INTELSAT 10 (IS-10)
-TLE1=1 26766U 01019A 09354.88544038 -.00000010 00000-0 10000-3 0 4888
-TLE2=2 26766 0.0287 202.1586 0002476 48.2352 226.4400 1.00271691 31541
+TLE1=1 26766U 01019A 09363.09326355 -.00000004 00000-0 10000-3 0 4907
+TLE2=2 26766 0.0115 205.4958 0002351 48.7630 305.4987 1.00272873 31626
[24841]
VERSION=1.1
NAME=IRIDIUM 16 [-]
NICKNAME=IRIDIUM 16 [-]
-TLE1=1 24841U 97030F 09357.17263046 .00000097 00000-0 26984-4 0 8810
-TLE2=2 24841 86.4011 53.0529 0001545 140.4153 219.7149 14.35312151655384
+TLE1=1 24841U 97030F 09363.23786516 .00000090 00000-0 24548-4 0 8903
+TLE2=2 24841 86.4011 50.5174 0002120 134.4758 225.6614 14.35313127656250
[22970]
VERSION=1.1
NAME=TUBSAT B
NICKNAME=TUBSAT B
-TLE1=1 22970U 94003B 09357.76835791 .00000051 00000-0 10000-3 0 2247
-TLE2=2 22970 82.5606 15.8448 0016997 130.9152 229.3508 13.16916773764934
+TLE1=1 22970U 94003B 09363.39052317 .00000051 00000-0 10000-3 0 2282
+TLE2=2 22970 82.5599 11.8751 0017167 117.3313 242.9556 13.16915130765678
[25331]
VERSION=1.1
NAME=ECHOSTAR 4
NICKNAME=ECHOSTAR 4
-TLE1=1 25331U 98028A 09357.24523399 -.00000225 00000-0 10000-3 0 1167
-TLE2=2 25331 1.5198 55.7166 0004518 205.0678 202.6026 1.00273126 42710
+TLE1=1 25331U 98028A 09363.05585334 -.00000225 00000-0 10000-3 0 1205
+TLE2=2 25331 1.5315 55.6887 0004605 205.5096 139.7462 1.00271323 42762
[24794]
VERSION=1.1
NAME=IRIDIUM 6 [+]
NICKNAME=IRIDIUM 6 [+]
-TLE1=1 24794U 97020C 09357.18178346 -.00000053 00000-0 -26163-4 0 6704
-TLE2=2 24794 86.3941 21.0560 0002094 83.1016 277.0428 14.34219067661478
+TLE1=1 24794U 97020C 09363.39117498 -.00000007 00000-0 -97055-5 0 6770
+TLE2=2 24794 86.3943 18.4601 0002146 84.3124 275.8312 14.34218602662368
[26464]
VERSION=1.1
NAME=CLUSTER II-FM8
NICKNAME=CLUSTER II-FM8
-TLE1=1 26464U 00045B 09357.45833333 .00001146 00000-0 00000+0 0 4162
-TLE2=2 26464 114.1246 192.5262 8719939 32.5799 356.3676 0.44209948 5372
+TLE1=1 26464U 00045B 09364.25000000 .00001326 00000-0 00000+0 0 4198
+TLE2=2 26464 114.4207 192.8575 8728251 32.6500 357.4655 0.44227346 5405
[26626]
VERSION=1.1
NAME=SIRIUS-3
NICKNAME=SIRIUS-3
-TLE1=1 26626U 00077A 09355.97040168 -.00000129 00000-0 10000-3 0 5244
-TLE2=2 26626 64.2033 13.5877 2661970 270.6951 59.1934 1.00274943 33191
+TLE1=1 26626U 00077A 09360.95672545 -.00000105 00000-0 10000-3 0 5242
+TLE2=2 26626 64.2067 13.5320 2662544 270.6865 59.1988 1.00274457 33248
[28915]
VERSION=1.1
NAME=COSMOS 2419 (714)
NICKNAME=COSMOS 2419 (714)
-TLE1=1 28915U 05050A 09357.63746146 .00000109 00000-0 10000-3 0 1194
-TLE2=2 28915 64.8646 157.5316 0007049 353.9364 106.2986 2.13101865 31106
+TLE1=1 28915U 05050A 09363.14998428 .00000090 00000-0 10000-3 0 1233
+TLE2=2 28915 64.8650 157.3484 0007003 353.9069 15.3488 2.13101967 31220
[22826]
VERSION=1.1
NAME=ITAMSAT (IO-26)
NICKNAME=IO-26
-TLE1=1 22826U 93061D 09357.81775154 .00000016 00000-0 22958-4 0 1495
-TLE2=2 22826 98.4579 306.1851 0009835 63.0891 297.1324 14.29535528847102
+TLE1=1 22826U 93061D 09363.62715442 .00000012 00000-0 21436-4 0 1547
+TLE2=2 22826 98.4576 311.8262 0009651 48.3171 311.8836 14.29536125847938
[23705]
VERSION=1.1
NAME=SL-16 R/B
NICKNAME=SL-16 R/B
-TLE1=1 23705U 95058B 09357.58967453 -.00000018 00000-0 15339-4 0 36
-TLE2=2 23705 71.0201 0.9624 0011641 151.8180 208.3508 14.14873162730652
+TLE1=1 23705U 95058B 09362.53861414 -.00000193 00000-0 -75196-4 0 62
+TLE2=2 23705 71.0196 350.5832 0011473 144.1688 216.0185 14.14869119731353
[3230]
VERSION=1.1
NAME=SL-8 R/B
NICKNAME=SL-8 R/B
-TLE1=1 03230U 68040B 09357.35309824 .00000184 00000-0 26222-4 0 8365
-TLE2=2 03230 74.0378 285.5665 0035114 242.2439 117.5175 14.84270785229316
+TLE1=1 03230U 68040B 09363.82364599 .00000138 00000-0 20864-4 0 8415
+TLE2=2 03230 74.0378 272.7375 0035043 228.0301 131.7880 14.84273126230273
[28187]
VERSION=1.1
NAME=EUTELSAT W3A
NICKNAME=EUTELSAT W3A
-TLE1=1 28187U 04008A 09356.90260654 .00000067 00000-0 10000-3 0 8764
-TLE2=2 28187 0.0610 349.4557 0003450 272.1245 161.9267 1.00272543 21219
+TLE1=1 28187U 04008A 09360.84948200 .00000073 00000-0 10000-3 0 8781
+TLE2=2 28187 0.0716 4.4252 0003093 252.8225 151.0418 1.00273451 21253
[27426]
VERSION=1.1
NAME=DIRECTV 5 (TEMPO 1)
NICKNAME=DIRECTV 5 (TEMPO 1)
-TLE1=1 27426U 02023A 09357.12048900 .00000000 00000-0 10000-3 0 4311
-TLE2=2 27426 0.0198 46.3680 0003183 209.3745 129.3159 1.00270149 27961
+TLE1=1 27426U 02023A 09362.54183597 -.00000034 00000-0 10000-3 0 4324
+TLE2=2 27426 0.0170 257.7725 0003549 23.8290 260.4958 1.00272925 28025
[28230]
VERSION=1.1
NAME=GP-B
NICKNAME=GP-B
-TLE1=1 28230U 04014A 09357.52617981 .00000096 00000-0 11682-4 0 6744
-TLE2=2 28230 89.9353 156.6716 0002576 100.5660 259.5846 14.76005350305709
+TLE1=1 28230U 04014A 09362.94984351 .00000185 00000-0 24605-4 0 6786
+TLE2=2 28230 89.9363 156.6319 0002801 97.5189 262.6382 14.76007212306509
[27378]
VERSION=1.1
NAME=ECHOSTAR 7
NICKNAME=ECHOSTAR 7
-TLE1=1 27378U 02006A 09357.07069758 .00000000 00000-0 10000-3 0 4619
-TLE2=2 27378 0.0065 342.2646 0001903 299.1155 76.9524 1.00271875 28703
+TLE1=1 27378U 02006A 09362.57731146 .00000022 00000-0 10000-3 0 4655
+TLE2=2 27378 0.0193 355.4466 0001706 258.0908 292.5648 1.00272493 28757
[29505]
VERSION=1.1
NAME=SJ-6C
NICKNAME=SJ-6C
-TLE1=1 29505U 06046A 09357.67164002 .00000127 00000-0 18475-4 0 5576
-TLE2=2 29505 97.6895 359.5901 0003553 143.7114 216.4248 14.90692123172314
+TLE1=1 29505U 06046A 09364.18271506 .00000527 00000-0 59248-4 0 5766
+TLE2=2 29505 97.6904 5.9325 0004088 126.5212 233.6380 14.90695858173282
[22245]
VERSION=1.1
@@ -290,323 +290,316 @@
VERSION=1.1
NAME=GPS BIIA-23 (PRN 04)
NICKNAME=GPS BIIA-23 (PRN 04)
-TLE1=1 22877U 93068A 09356.61945022 .00000059 00000-0 10000-3 0 9981
-TLE2=2 22877 53.8435 210.6981 0090150 31.9342 328.6786 2.00572447118405
+TLE1=1 22877U 93068A 09362.60213294 .00000113 00000-0 10000-3 0 56
+TLE2=2 22877 53.8393 210.4506 0090304 32.2406 328.3886 2.00571992118520
[25043]
VERSION=1.1
NAME=IRIDIUM 38 [-]
NICKNAME=IRIDIUM 38 [-]
-TLE1=1 25043U 97069E 09356.96581371 .00000044 00000-0 85952-5 0 8652
-TLE2=2 25043 86.3944 83.5686 0001716 113.4615 246.6771 14.34717192634670
+TLE1=1 25043U 97069E 09363.31253946 -.00000049 00000-0 -24330-4 0 8731
+TLE2=2 25043 86.3937 80.9136 0001998 108.9543 251.1859 14.34716899635586
[23439]
VERSION=1.1
NAME=RADIO ROSTO (RS-15)
NICKNAME=RS-15
-TLE1=1 23439U 94085A 09356.89259785 -.00000039 00000-0 10000-3 0 2522
-TLE2=2 23439 64.8200 319.6573 0153693 16.0150 344.5556 11.27553829617398
+TLE1=1 23439U 94085A 09362.92361525 -.00000039 00000-0 10000-3 0 2743
+TLE2=2 23439 64.8213 309.9057 0153791 14.9053 345.6329 11.27553921618078
[26089]
VERSION=1.1
NAME=GARUDA 1
NICKNAME=GARUDA 1
-TLE1=1 26089U 00011A 09356.88635468 -.00000337 00000-0 10000-3 0 5059
-TLE2=2 26089 1.2989 251.1927 0002796 36.4293 246.0867 1.00269071 36158
+TLE1=1 26089U 00011A 09361.13122034 -.00000331 00000-0 10000-3 0 5068
+TLE2=2 26089 1.2891 251.0964 0002979 41.3171 333.5710 1.00266819 36205
[27941]
VERSION=1.1
NAME=NIGERIASAT 1
NICKNAME=NIGERIASAT 1
-TLE1=1 27941U 03042C 09357.66054549 .00000061 00000-0 20667-4 0 864
-TLE2=2 27941 97.9156 225.0811 0010268 258.9604 101.0455 14.63048828333247
+TLE1=1 27941U 03042C 09364.15772996 -.00000004 00000-0 79771-5 0 1050
+TLE2=2 27941 97.9162 231.3181 0010441 235.5893 124.4322 14.63049567334196
[28393]
VERSION=1.1
NAME=AMAZONAS
NICKNAME=AMAZONAS
-TLE1=1 28393U 04031A 09355.63030801 -.00000267 00000-0 00000+0 0 7045
-TLE2=2 28393 0.0285 37.7801 0001833 219.3202 359.1290 1.00274046 19746
+TLE1=1 28393U 04031A 09362.03111683 -.00000259 00000-0 00000+0 0 7080
+TLE2=2 28393 0.0429 45.9737 0002736 266.4367 94.4209 1.00271260 19815
[28916]
VERSION=1.1
NAME=COSMOS 2418 (713)
NICKNAME=COSMOS 2418 (713)
-TLE1=1 28916U 05050B 09357.65029821 .00000109 00000-0 10000-3 0 1135
-TLE2=2 28916 64.8833 157.5695 0017624 342.6438 82.6810 2.13104944 31106
+TLE1=1 28916U 05050B 09363.66459068 .00000085 00000-0 10000-3 0 1170
+TLE2=2 28916 64.8834 157.3704 0017604 342.5857 16.7629 2.13104992 31220
[32763]
VERSION=1.1
NAME=ICO G1
NICKNAME=ICO G1
-TLE1=1 32763U 08016A 09356.49937741 -.00000157 00000-0 10000-3 0 3669
-TLE2=2 32763 5.3220 330.3740 0003031 300.4922 267.2529 1.00271341 6224
+TLE1=1 32763U 08016A 09362.49172793 -.00000148 00000-0 10000-3 0 3697
+TLE2=2 32763 5.3170 330.4055 0003042 300.9855 269.8793 1.00271380 6280
[26892]
VERSION=1.1
NAME=COSMOS 2379
NICKNAME=COSMOS 2379
-TLE1=1 26892U 01037A 09357.29117507 .00000125 00000-0 10000-3 0 4698
-TLE2=2 26892 5.3048 67.0642 0001579 186.4088 319.5835 1.00300697 30509
+TLE1=1 26892U 01037A 09363.02965856 .00000125 00000-0 10000-3 0 4739
+TLE2=2 26892 5.3186 67.0063 0001594 199.9139 218.2869 1.00303543 30563
[25276]
VERSION=1.1
NAME=IRIDIUM 60 [+]
NICKNAME=IRIDIUM 60 [+]
-TLE1=1 25276U 98019E 09357.07051962 .00000000 00000-0 -69093-5 0 8401
-TLE2=2 25276 86.3949 349.3704 0002370 81.6785 278.4672 14.34216184614326
+TLE1=1 25276U 98019E 09363.41946242 -.00000011 00000-0 -10834-4 0 8502
+TLE2=2 25276 86.3956 346.7164 0002319 83.0970 277.0476 14.34215391615237
-[36128]
-VERSION=1.1
-NAME=SL-12 DEB
-NICKNAME=SL-12 DEB
-TLE1=1 36128U 09070L 09352.45445746 .10633637 75698-5 19569-2 0 19
-TLE2=2 36128 64.9487 264.0261 0101875 71.9730 291.7104 16.18393219 535
-
[26610]
VERSION=1.1
NAME=STRV 1C
NICKNAME=STRV 1C
-TLE1=1 26610U 00072C 09355.95051997 -.00000131 00000-0 10000-3 0 116
-TLE2=2 26610 6.2797 222.6223 7341597 188.9594 141.0120 2.03456282 67641
+TLE1=1 26610U 00072C 09361.33735694 .00000275 00000-0 10000-3 0 149
+TLE2=2 26610 6.2560 220.7472 7341834 192.5724 126.5167 2.03455323 67750
[28935]
VERSION=1.1
NAME=ECHOSTAR 10
NICKNAME=ECHOSTAR 10
-TLE1=1 28935U 06003A 09357.30300100 -.00000035 00000-0 10000-3 0 8191
-TLE2=2 28935 0.0273 5.0389 0002190 252.8865 192.9271 1.00272327 14150
+TLE1=1 28935U 06003A 09362.54183635 -.00000033 00000-0 10000-3 0 8250
+TLE2=2 28935 0.0234 2.9312 0001738 247.3439 291.7061 1.00271458 14207
[25158]
VERSION=1.1
NAME=ORBCOMM FM03 [-]
NICKNAME=ORBCOMM FM03 [-]
-TLE1=1 25158U 98007B 09357.13905622 .00000037 00000-0 69990-4 0 568
-TLE2=2 25158 107.9651 137.3236 0052129 320.4906 39.2411 14.25497373616446
+TLE1=1 25158U 98007B 09363.24422080 .00000018 00000-0 61935-4 0 615
+TLE2=2 25158 107.9628 149.6824 0052465 310.1867 49.4671 14.25499562617314
[26483]
VERSION=1.1
NAME=SIRIUS-2
NICKNAME=SIRIUS-2
-TLE1=1 26483U 00051A 09355.30061011 .00000106 00000-0 10000-3 0 2863
-TLE2=2 26483 63.7576 133.5958 2688899 268.9595 60.4572 1.00275938 34058
+TLE1=1 26483U 00051A 09362.28043970 .00000110 00000-0 10000-3 0 2878
+TLE2=2 26483 63.7605 133.5441 2693045 268.8572 60.5036 1.00284251 34123
[24901]
VERSION=1.1
NAME=AGILA 2
NICKNAME=AGILA 2
-TLE1=1 24901U 97042A 09357.16671060 .00000000 00000-0 10000-3 0 9409
-TLE2=2 24901 0.0217 242.3664 0003670 10.6480 44.7767 1.00265785 45200
+TLE1=1 24901U 97042A 09362.32795877 -.00000212 00000-0 10000-3 0 9413
+TLE2=2 24901 0.0421 200.2652 0005192 78.7317 81.9536 1.00270457 45267
[23710]
VERSION=1.1
NAME=RADARSAT-1
NICKNAME=RADARSAT-1
-TLE1=1 23710U 95059A 09357.70750475 .00000095 00000-0 53756-4 0 8779
-TLE2=2 23710 98.5797 1.8109 0001048 91.5798 357.2881 14.29985749737897
+TLE1=1 23710U 95059A 09364.14236281 .00000169 00000-0 82351-4 0 8976
+TLE2=2 23710 98.5799 8.1537 0001009 88.5535 347.6168 14.29982239738811
[25770]
VERSION=1.1
NAME=GLOBALSTAR M025
NICKNAME=GLOBALSTAR M025
-TLE1=1 25770U 99031A 09356.96675206 -.00000086 00000-0 10000-3 0 830
-TLE2=2 25770 51.9934 165.3128 0002478 107.3491 252.7649 12.62268152486004
+TLE1=1 25770U 99031A 09363.53901871 -.00000086 00000-0 10000-3 0 886
+TLE2=2 25770 51.9935 145.3010 0002575 122.4405 237.6720 12.62268341486837
[28463]
VERSION=1.1
NAME=EXPRESS-AM 1
NICKNAME=EXPRESS-AM 1
-TLE1=1 28463U 04043A 09356.80346448 .00000170 00000-0 10000-3 0 6195
-TLE2=2 28463 0.0390 110.4644 0001248 219.2184 91.0593 1.00273813 18853
+TLE1=1 28463U 04043A 09361.77578059 .00000174 00000-0 10000-3 0 6219
+TLE2=2 28463 0.0398 150.5147 0002033 129.1946 135.9719 1.00273620 18902
[24906]
VERSION=1.1
NAME=IRIDIUM 23 [+]
NICKNAME=IRIDIUM 23 [+]
-TLE1=1 24906U 97043D 09356.94656366 .00000075 00000-0 19696-4 0 8954
-TLE2=2 24906 86.3952 317.7624 0002321 81.4902 278.6551 14.34214939646075
+TLE1=1 24906U 97043D 09363.36527520 .00000094 00000-0 26427-4 0 9038
+TLE2=2 24906 86.3948 315.0796 0002280 81.0143 279.1334 14.34216374646999
[27651]
VERSION=1.1
NAME=SORCE
NICKNAME=SORCE
-TLE1=1 27651U 03004A 09357.06708440 .00000088 00000-0 26570-4 0 824
-TLE2=2 27651 39.9982 351.6469 0026134 219.8964 139.9908 14.82239703374329
+TLE1=1 27651U 03004A 09363.87219223 .00000117 00000-0 30075-4 0 879
+TLE2=2 27651 39.9986 314.1068 0026730 265.3470 94.4279 14.82242671375338
[27431]
VERSION=1.1
NAME=FENGYUN 1D
NICKNAME=FENGYUN 1D
-TLE1=1 27431U 02024B 09356.57371858 .00000116 00000-0 90925-4 0 7627
-TLE2=2 27431 98.6466 338.6077 0014639 239.0138 120.9584 14.09290043391342
+TLE1=1 27431U 02024B 09364.02846458 .00000042 00000-0 48324-4 0 7689
+TLE2=2 27431 98.6459 345.7661 0014937 215.9394 144.0820 14.09287997392390
[25169]
VERSION=1.1
NAME=IRIDIUM 52 [+]
NICKNAME=IRIDIUM 52 [+]
-TLE1=1 25169U 98010A 09357.15983549 .00000104 00000-0 30082-4 0 5874
-TLE2=2 25169 86.3936 52.5822 0002338 87.6690 272.4777 14.34218118620058
+TLE1=1 25169U 98010A 09363.36922748 .00000103 00000-0 29802-4 0 5943
+TLE2=2 25169 86.3939 49.9859 0002359 86.8313 273.3152 14.34219311620948
[25634]
VERSION=1.1
NAME=ARGOS
NICKNAME=ARGOS
-TLE1=1 25634U 99008A 09356.66802449 .00000138 00000-0 88102-4 0 8936
-TLE2=2 25634 98.9876 36.6323 0010654 126.6859 233.5316 14.18918267560770
+TLE1=1 25634U 99008A 09363.64907227 .00000071 00000-0 56018-4 0 8984
+TLE2=2 25634 98.9881 43.7100 0010852 108.2884 251.9462 14.18918526561766
[15677]
VERSION=1.1
NAME=GSTAR 1
NICKNAME=GSTAR 1
-TLE1=1 15677U 85035A 09357.17183842 -.00000083 00000-0 10000-3 0 2174
-TLE2=2 15677 11.0923 48.6719 0008402 259.9371 99.9543 1.00272204 64871
+TLE1=1 15677U 85035A 09363.15523025 -.00000087 00000-0 10000-3 0 2196
+TLE2=2 15677 11.1048 48.6038 0008603 261.2249 98.6528 1.00272228 64939
[35931]
VERSION=1.1
NAME=OCEANSAT 2
NICKNAME=OCEANSAT 2
-TLE1=1 35931U 09051A 09357.68957160 .00000042 00000-0 10769-4 0 1717
-TLE2=2 35931 98.3327 91.5474 0001835 331.9404 28.2181 14.50859244 13251
+TLE1=1 35931U 09051A 09363.82759338 .00006026 00000-0 15388-2 0 1805
+TLE2=2 35931 98.3338 97.6288 0002107 332.4523 27.5932 14.50844901 14143
[35756]
VERSION=1.1
NAME=OPTUS D3
NICKNAME=OPTUS D3
-TLE1=1 35756U 09044B 09357.31251016 -.00000127 00000-0 10000-3 0 891
-TLE2=2 35756 0.0415 19.0554 0003314 271.5661 69.8791 1.00271353 1284
+TLE1=1 35756U 09044B 09362.29849488 -.00000124 00000-0 10000-3 0 943
+TLE2=2 35756 0.0473 32.8448 0003512 260.2849 67.2447 1.00271437 1335
[32266]
VERSION=1.1
NAME=GLOBALSTAR M068
NICKNAME=GLOBALSTAR M068
-TLE1=1 32266U 07048D 09357.20918866 -.00000086 00000-0 10000-3 0 7595
-TLE2=2 32266 51.9847 254.9258 0001066 76.5685 283.5308 12.62255033103484
+TLE1=1 32266U 07048D 09363.14804269 -.00000086 00000-0 10000-3 0 7642
+TLE2=2 32266 51.9846 236.8386 0001118 89.3944 270.7055 12.62255342104236
[26113]
VERSION=1.1
NAME=IMAGE
NICKNAME=IMAGE
-TLE1=1 26113U 00017A 09356.48900121 .00000359 00000-0 10000-3 0 9080
-TLE2=2 26113 91.2891 214.3589 7309548 263.1429 16.9376 1.68637711 59994
+TLE1=1 26113U 00017A 09362.41916421 .00000407 00000-0 10000-3 0 9107
+TLE2=2 26113 91.2968 214.4177 7308144 262.4913 17.2010 1.68637610 60094
[21118]
VERSION=1.1
NAME=MOLNIYA 1-80
NICKNAME=MOLNIYA 1-80
-TLE1=1 21118U 91012A 09355.88397332 .00001557 00000-0 10000-3 0 7328
-TLE2=2 21118 61.8684 240.8197 7236627 255.2566 21.0769 2.00787097138101
+TLE1=1 21118U 91012A 09361.86008636 .00001647 00000-0 10000-3 0 7329
+TLE2=2 21118 61.8655 239.9714 7236717 255.3380 21.0579 2.00802958138224
[25884]
VERSION=1.1
NAME=GLOBALSTAR M027
NICKNAME=GLOBALSTAR M027
-TLE1=1 25884U 99043B 09357.18216119 -.00000086 00000-0 10000-3 0 692
-TLE2=2 25884 52.0100 302.1609 0000043 87.8046 272.2816 12.62267121477509
+TLE1=1 25884U 99043B 09363.20015064 -.00000086 00000-0 10000-3 0 744
+TLE2=2 25884 52.0099 283.8423 0000337 50.0962 309.9937 12.62267388478261
[28899]
VERSION=1.1
NAME=INMARSAT 4-F2
NICKNAME=INMARSAT 4-F2
-TLE1=1 28899U 05044A 09356.77444714 .00000157 00000-0 10000-3 0 9942
-TLE2=2 28899 2.2326 318.9600 0002044 294.7910 141.6020 1.00273961 15157
+TLE1=1 28899U 05044A 09361.84511909 .00000163 00000-0 10000-3 0 9999
+TLE2=2 28899 2.2290 318.9180 0002862 311.7144 155.1696 1.00275290 15209
[24948]
VERSION=1.1
NAME=IRIDIUM 28 [-]
NICKNAME=IRIDIUM 28 [-]
-TLE1=1 24948U 97051E 09357.00161200 .00000027 00000-0 25607-5 0 7096
-TLE2=2 24948 86.3952 349.5788 0002224 93.7722 266.3726 14.34284666642644
+TLE1=1 24948U 97051E 09363.48977751 .00000122 00000-0 36566-4 0 7171
+TLE2=2 24948 86.3953 346.8666 0002372 93.7038 266.4434 14.34285938643577
[4327]
VERSION=1.1
NAME=SERT 2
NICKNAME=SERT 2
-TLE1=1 04327U 70009A 09357.16651084 .00000032 00000-0 10000-3 0 1000
-TLE2=2 04327 99.1835 218.5328 0004652 189.1099 170.9953 13.58232102976458
+TLE1=1 04327U 70009A 09362.61762740 .00000032 00000-0 10000-3 0 1042
+TLE2=2 04327 99.1822 223.6319 0004850 174.4529 185.6634 13.58232265977197
[33460]
VERSION=1.1
NAME=EUTELSAT W2M
NICKNAME=EUTELSAT W2M
-TLE1=1 33460U 08065B 09355.94269653 .00000036 00000-0 10000-3 0 1761
-TLE2=2 33460 0.0709 353.4697 0003286 282.0294 157.5629 1.00271981 3734
+TLE1=1 33460U 08065B 09360.85074245 .00000045 00000-0 10000-3 0 1780
+TLE2=2 33460 0.0549 317.1320 0003142 283.0528 164.6551 1.00273577 3789
[25531]
VERSION=1.1
NAME=IRIDIUM 83 [+]
NICKNAME=IRIDIUM 83 [+]
-TLE1=1 25531U 98066E 09357.20424334 .00000165 00000-0 51962-4 0 7640
-TLE2=2 25531 86.3932 52.4006 0002363 84.2543 275.8935 14.34217656582638
+TLE1=1 25531U 98066E 09363.20433287 .00000095 00000-0 26683-4 0 7738
+TLE2=2 25531 86.3931 49.8915 0002359 84.0687 276.0781 14.34218541583499
[10953]
VERSION=1.1
NAME=GOES 3 [P]
NICKNAME=GOES 3 [P]
-TLE1=1 10953U 78062A 09355.04690575 -.00000085 00000-0 10000-3 0 7467
-TLE2=2 10953 14.4202 358.5533 0003569 331.2799 28.7142 1.00267620 68543
+TLE1=1 10953U 78062A 09362.02796546 -.00000080 00000-0 10000-3 0 7531
+TLE2=2 10953 14.4222 358.4948 0003950 335.5733 24.4217 1.00267970 68615
[27373]
VERSION=1.1
NAME=IRIDIUM 90 [S]
NICKNAME=IRIDIUM 90 [S]
-TLE1=1 27373U 02005B 09357.17310388 .00000102 00000-0 24366-4 0 3200
-TLE2=2 27373 86.4442 52.2522 0007321 84.9783 275.2261 14.42952180417241
+TLE1=1 27373U 02005B 09363.20624916 .00000076 00000-0 16789-4 0 3295
+TLE2=2 27373 86.4448 49.7300 0007281 71.1491 289.0488 14.42953635418118
[27561]
VERSION=1.1
NAME=RUBIN-3 & SL-8 R/B
NICKNAME=RUBIN-3 & SL-8 R/B
-TLE1=1 27561U 02054C 09356.58364004 .00000035 00000-0 18450-4 0 8589
-TLE2=2 27561 97.9322 182.2892 0048157 17.0452 343.2350 14.53784554374887
+TLE1=1 27561U 02054C 09363.12215527 .00000012 00000-0 13122-4 0 8634
+TLE2=2 27561 97.9323 188.4871 0047844 356.8633 3.2261 14.53785186375832
[7530]
VERSION=1.1
NAME=OSCAR 7 (AO-7)
NICKNAME=AO-7
-TLE1=1 07530U 74089B 09357.62882473 -.00000027 00000-0 10000-3 0 6617
-TLE2=2 07530 101.4125 15.2439 0011848 258.7270 101.2470 12.53577335606455
+TLE1=1 07530U 74089B 09363.93352604 -.00000027 00000-0 10000-3 0 6661
+TLE2=2 07530 101.4130 21.3081 0011819 246.2034 113.7797 12.53577302607242
[25721]
VERSION=1.1
NAME=ABRIXAS
NICKNAME=ABRIXAS
-TLE1=1 25721U 99022A 09357.55854472 -.00000221 00000-0 45645-5 0 7334
-TLE2=2 25721 48.4354 81.2256 0020419 339.4341 20.5821 15.20381242589271
+TLE1=1 25721U 99022A 09363.21028808 .00000552 00000-0 39318-4 0 7379
+TLE2=2 25721 48.4364 52.6034 0020392 6.2656 353.8542 15.20392990590137
[16908]
VERSION=1.1
NAME=EGP
NICKNAME=EGP
-TLE1=1 16908U 86061A 09357.17431027 -.00000083 00000-0 10000-3 0 924
-TLE2=2 16908 50.0111 297.9276 0011109 338.7890 21.2478 12.44463087731134
+TLE1=1 16908U 86061A 09363.84007590 -.00000083 00000-0 10000-3 0 985
+TLE2=2 16908 50.0107 277.4336 0011092 356.0978 3.9769 12.44463188731963
[25395]
VERSION=1.1
NAME=FASAT B
NICKNAME=FASAT B
-TLE1=1 25395U 98043B 09357.08795641 -.00000005 00000-0 15612-4 0 6242
-TLE2=2 25395 98.3161 18.3694 0003339 28.3110 331.8240 14.24372203595332
+TLE1=1 25395U 98043B 09363.12915969 -.00000014 00000-0 11467-4 0 6290
+TLE2=2 25395 98.3159 24.0886 0003053 13.2210 346.9060 14.24372274596193
[33154]
VERSION=1.1
NAME=BADR-6
NICKNAME=BADR-6
-TLE1=1 33154U 08034B 09355.96516615 .00000161 00000-0 10000-3 0 2560
-TLE2=2 33154 0.0507 328.9032 0005106 313.9512 181.2511 1.00273698 5395
+TLE1=1 33154U 08034B 09361.79764013 .00000169 00000-0 10000-3 0 2574
+TLE2=2 33154 0.0469 328.6723 0004607 323.1463 117.7649 1.00275456 5456
[25624]
VERSION=1.1
NAME=GLOBALSTAR M038
NICKNAME=GLOBALSTAR M038
-TLE1=1 25624U 99004D 09357.87304861 -.00000086 00000-0 10000-3 0 1331
-TLE2=2 25624 51.9998 299.2722 0001142 297.5059 62.4683 12.62398420502485
+TLE1=1 25624U 99004D 09363.17838420 -.00000086 00000-0 10000-3 0 1389
+TLE2=2 25624 52.0031 283.1235 0001268 52.4136 307.6832 12.62271860503152
[26900]
VERSION=1.1
NAME=INTELSAT 902 (IS-902)
NICKNAME=INTELSAT 902 (IS-902)
-TLE1=1 26900U 01039A 09356.87705171 .00000052 00000-0 10000-3 0 4973
-TLE2=2 26900 0.0194 77.1218 0002897 214.4426 177.7059 1.00271864 30488
+TLE1=1 26900U 01039A 09358.88692542 .00000056 00000-0 10000-3 0 4988
+TLE2=2 26900 0.0143 30.3051 0003295 256.1038 188.4095 1.00272991 30507
[21111]
VERSION=1.1
@@ -619,99 +612,99 @@
VERSION=1.1
NAME=GPS BIIA-24 (PRN 06)
NICKNAME=GPS BIIA-24 (PRN 06)
-TLE1=1 23027U 94016A 09356.82380611 .00000082 00000-0 10000-3 0 81
-TLE2=2 23027 53.5227 147.7153 0059982 290.7558 68.5850 2.00564127115711
+TLE1=1 23027U 94016A 09362.80668689 .00000067 00000-0 10000-3 0 151
+TLE2=2 23027 53.5221 147.4683 0060191 291.2303 68.1031 2.00564144115837
[27436]
VERSION=1.1
NAME=COSMOS 2389
NICKNAME=COSMOS 2389
-TLE1=1 27436U 02026A 09357.78735802 .00000039 00000-0 24286-4 0 9466
-TLE2=2 27436 82.9501 302.3860 0047355 130.8893 229.6387 13.74737146380020
+TLE1=1 27436U 02026A 09363.90107829 .00000042 00000-0 27541-4 0 9516
+TLE2=2 27436 82.9501 297.8645 0047763 114.2819 246.3330 13.74737553380864
[27844]
VERSION=1.1
NAME=CUTE-1 (CO-55)
NICKNAME=CO-55
-TLE1=1 27844U 03031E 09356.74365020 .00000040 00000-0 39111-4 0 7409
-TLE2=2 27844 98.7111 3.2417 0009588 324.3326 35.7192 14.20674092336031
+TLE1=1 27844U 03031E 09363.99781084 .00000046 00000-0 41567-4 0 7455
+TLE2=2 27844 98.7109 10.3909 0009519 303.4265 56.6013 14.20675480337067
[25112]
VERSION=1.1
NAME=ORBCOMM FM08 [+]
NICKNAME=ORBCOMM FM08 [+]
-TLE1=1 25112U 97084A 09357.63543200 .00000114 00000-0 89933-4 0 4027
-TLE2=2 25112 45.0167 184.8989 0007674 328.2690 31.7707 14.34443923627453
+TLE1=1 25112U 97084A 09363.76428366 .00000066 00000-0 72784-4 0 4070
+TLE2=2 25112 45.0171 156.0164 0007361 358.5526 1.5296 14.34448769628330
[23880]
VERSION=1.1
NAME=GORIZONT 32
NICKNAME=GORIZONT 32
-TLE1=1 23880U 96034A 09356.09383688 -.00000109 00000-0 10000-3 0 3664
-TLE2=2 23880 9.8541 54.2552 0002988 233.9505 181.7757 1.00269428 49727
+TLE1=1 23880U 96034A 09364.05437439 -.00000115 00000-0 10000-3 0 3705
+TLE2=2 23880 9.8713 54.1613 0003144 238.6353 170.7496 1.00269151 49803
[36122]
VERSION=1.1
NAME=XIWANG-1 (HOPE-1)
NICKNAME=HO-68
-TLE1=1 36122U 09072B 09357.66931912 -.00000045 00000-0 00000+0 0 285
-TLE2=2 36122 100.4976 54.6942 0007405 20.5021 339.6386 13.16280131 1127
+TLE1=1 36122U 09072B 09364.13000823 -.00000045 00000-0 00000+0 0 452
+TLE2=2 36122 100.4966 61.1041 0007686 3.2714 356.8450 13.16279894 1977
[32395]
VERSION=1.1
NAME=COSMOS 2436 (723)
NICKNAME=COSMOS 2436 (723)
-TLE1=1 32395U 07065C 09356.34790860 -.00000041 00000-0 10000-3 0 3523
-TLE2=2 32395 65.1264 37.0324 0016992 347.7569 12.2687 2.13103366 15439
+TLE1=1 32395U 07065C 09361.97901129 -.00000014 00000-0 10000-3 0 3553
+TLE2=2 32395 65.1296 36.8388 0017161 347.3163 12.7123 2.13103418 15557
[26083]
VERSION=1.1
NAME=GLOBALSTAR M060
NICKNAME=GLOBALSTAR M060
-TLE1=1 26083U 00008C 09357.64760330 .00000000 00000-0 10000-3 0 1255
-TLE2=2 26083 52.0023 75.2823 0001305 186.1583 173.9797 12.62187332463114
+TLE1=1 26083U 00008C 09363.27001487 -.00000086 00000-0 10000-3 0 1314
+TLE2=2 26083 52.0054 58.1709 0001409 160.8905 199.2011 12.62187818463820
[12458]
VERSION=1.1
NAME=NOVA I
NICKNAME=NOVA I
-TLE1=1 12458U 81044A 09356.78333422 .00000050 00000-0 10000-3 0 9148
-TLE2=2 12458 90.0823 117.4436 0014053 349.8004 10.2846 13.22710186380778
+TLE1=1 12458U 81044A 09362.83501214 .00000050 00000-0 10000-3 0 9181
+TLE2=2 12458 90.0820 117.4941 0013545 332.6366 27.4067 13.22710582381576
[25106]
VERSION=1.1
NAME=IRIDIUM 47 [+]
NICKNAME=IRIDIUM 47 [+]
-TLE1=1 25106U 97082C 09357.11781249 .00000042 00000-0 80948-5 0 7850
-TLE2=2 25106 86.3959 317.7191 0002353 77.3638 282.7814 14.34214880628634
+TLE1=1 25106U 97082C 09363.39698498 .00000181 00000-0 57578-4 0 7924
+TLE2=2 25106 86.3953 315.0946 0002330 78.5414 281.6061 14.34216999629532
[35868]
VERSION=1.1
NAME=TATIANA 2
NICKNAME=TATIANA 2
-TLE1=1 35868U 09049D 09357.32804221 .00000177 00000-0 10000-3 0 897
-TLE2=2 35868 98.7849 47.2024 0004845 133.5070 226.6469 14.22092699 13739
+TLE1=1 35868U 09049D 09363.30852810 .00000177 00000-0 10000-3 0 945
+TLE2=2 35868 98.7853 53.1594 0005252 120.2175 239.9488 14.22093128 14584
[23461]
VERSION=1.1
NAME=INTELSAT 704 (IS-704)
NICKNAME=INTELSAT 704 (IS-704)
-TLE1=1 23461U 95001A 09356.87069770 -.00000214 00000-0 10000-3 0 407
-TLE2=2 23461 0.5961 76.5726 0005085 135.3407 148.0673 0.99182419 54778
+TLE1=1 23461U 95001A 09360.90361709 -.00000157 00000-0 10000-3 0 421
+TLE2=2 23461 0.6055 76.6402 0005064 136.9532 146.3855 0.99180928 54819
[28378]
VERSION=1.1
NAME=ANIK F2
NICKNAME=ANIK F2
-TLE1=1 28378U 04027A 09355.28286900 -.00000035 00000-0 10000-3 0 8855
-TLE2=2 28378 0.0143 48.7025 0002016 178.6406 213.3788 1.00272167 19979
+TLE1=1 28378U 04027A 09362.48602990 -.00000027 00000-0 10000-3 0 8868
+TLE2=2 28378 0.0063 310.1344 0002338 298.0656 272.7571 1.00271851 20049
[22117]
VERSION=1.1
NAME=SATCOM C3
NICKNAME=SATCOM C3
-TLE1=1 22117U 92060B 09356.43922391 -.00000218 00000-0 10000-3 0 2557
-TLE2=2 22117 4.8433 70.1127 0001608 213.1936 246.8823 1.00270244 63265
+TLE1=1 22117U 92060B 09362.45044480 -.00000217 00000-0 10000-3 0 2593
+TLE2=2 22117 4.8593 69.9987 0001913 190.8637 279.3153 1.00271539 63322
[27528]
VERSION=1.1
@@ -724,260 +717,260 @@
VERSION=1.1
NAME=OPTUS B3
NICKNAME=OPTUS B3
-TLE1=1 23227U 94055A 09356.69322258 -.00000056 00000-0 10000-3 0 4608
-TLE2=2 23227 1.9151 77.2422 0004391 201.3656 226.3134 1.00272158 56096
+TLE1=1 23227U 94055A 09362.67523553 -.00000054 00000-0 10000-3 0 4646
+TLE2=2 23227 1.9298 77.1745 0004489 200.4068 226.7590 1.00272126 56152
[22827]
VERSION=1.1
NAME=HEALTHSAT 1
NICKNAME=HEALTHSAT 1
-TLE1=1 22827U 93061E 09357.84800166 .00000021 00000-0 24493-4 0 4227
-TLE2=2 22827 98.4546 307.4901 0009475 40.9792 319.2083 14.30182108847338
+TLE1=1 22827U 93061E 09362.95516765 .00000034 00000-0 29448-4 0 4267
+TLE2=2 22827 98.4540 312.4526 0009259 26.5336 333.6313 14.30182869848066
[28892]
VERSION=1.1
NAME=UWE-1
NICKNAME=UWE-1
-TLE1=1 28892U 05043C 09357.21999863 .00000150 00000-0 40817-4 0 5112
-TLE2=2 28892 98.0337 241.6434 0018282 114.7896 245.5203 14.59800817221427
+TLE1=1 28892U 05043C 09363.25181175 .00000115 00000-0 33400-4 0 5168
+TLE2=2 28892 98.0328 247.4881 0018353 96.4698 263.8596 14.59802703222304
[27807]
VERSION=1.1
NAME=GSAT-2
NICKNAME=GSAT-2
-TLE1=1 27807U 03018A 09354.91832833 .00000138 00000-0 10000-3 0 1149
-TLE2=2 27807 0.0547 264.2370 0002832 2.5430 201.4462 1.00272760 24296
+TLE1=1 27807U 03018A 09361.78019631 .00000148 00000-0 10000-3 0 1168
+TLE2=2 27807 0.0391 262.1818 0003338 3.8732 159.2103 1.00273798 24360
[33105]
VERSION=1.1
NAME=JASON 2 (OSTM)
NICKNAME=JASON 2 (OSTM)
-TLE1=1 33105U 08032A 09357.19571773 -.00000061 00000-0 00000+0 0 5093
-TLE2=2 33105 66.0417 38.3066 0007702 267.4217 92.5921 12.80929125 70553
+TLE1=1 33105U 08032A 09363.20756909 -.00000061 00000-0 00000+0 0 5144
+TLE2=2 33105 66.0440 25.8209 0007736 269.1872 90.8245 12.80929280 71320
[29671]
VERSION=1.1
NAME=COSMOS 2426 (717)
NICKNAME=COSMOS 2426 (717)
-TLE1=1 29671U 06062B 09357.71756054 -.00000036 00000-0 10000-3 0 8474
-TLE2=2 29671 65.5105 36.5739 0019100 175.9180 200.7105 2.13103472 23311
+TLE1=1 29671U 06062B 09363.51493953 -.00000006 00000-0 10000-3 0 8517
+TLE2=2 29671 65.5136 36.3775 0018827 176.9162 327.2732 2.13103559 23439
[28874]
VERSION=1.1
NAME=GPS IIR-14M (DASS)
NICKNAME=GPS IIR-14M (DASS)
-TLE1=1 28874U 05038A 09356.51910125 .00000085 00000-0 10000-3 0 3544
-TLE2=2 28874 55.0056 151.6833 0049888 210.9111 148.7787 2.00553025 31098
+TLE1=1 28874U 05038A 09362.50236504 .00000080 00000-0 10000-3 0 3615
+TLE2=2 28874 55.0063 151.4477 0050028 210.9002 148.7865 2.00552859 31210
[27663]
VERSION=1.1
NAME=GPS BIIR-08 (DASS)
NICKNAME=GPS BIIR-08 (DASS)
-TLE1=1 27663U 03005A 09357.23340519 -.00000004 00000-0 10000-3 0 9240
-TLE2=2 27663 55.6043 91.9080 0054036 342.8150 17.0162 2.00563672 50572
+TLE1=1 27663U 03005A 09363.21637754 -.00000018 00000-0 10000-3 0 9318
+TLE2=2 27663 55.6054 91.6669 0054586 342.8174 17.0026 2.00563180 50696
[27600]
VERSION=1.1
NAME=MICRO LABSAT
NICKNAME=MICRO LABSAT
-TLE1=1 27600U 02056D 09357.12057420 -.00000030 00000-0 47444-5 0 9366
-TLE2=2 27600 98.3659 46.6075 0011700 54.6421 305.5862 14.28873974366429
+TLE1=1 27600U 02056D 09363.35282387 .00000028 00000-0 27461-4 0 9418
+TLE2=2 27600 98.3663 52.5886 0011535 37.7380 322.4608 14.28874570367310
[20442]
VERSION=1.1
NAME=LUSAT (LO-19)
NICKNAME=LO-19
-TLE1=1 20442U 90005G 09357.32756103 .00000054 00000-0 35422-4 0 6881
-TLE2=2 20442 98.2690 323.9122 0011381 328.5700 31.4809 14.32076874 40381
+TLE1=1 20442U 90005G 09363.96510699 .00000039 00000-0 30020-4 0 6945
+TLE2=2 20442 98.2709 330.2426 0010988 306.8343 53.1847 14.32077173 41336
[26997]
VERSION=1.1
NAME=JASON 1
NICKNAME=JASON 1
-TLE1=1 26997U 01055A 09356.53486162 -.00000038 00000-0 10000-3 0 1215
-TLE2=2 26997 66.0425 39.2786 0007168 270.0797 89.9391 12.80929907376166
+TLE1=1 26997U 01055A 09363.48362194 -.00000038 00000-0 10000-3 0 1248
+TLE2=2 26997 66.0437 24.8460 0007241 271.2984 88.7204 12.80929881377051
[21426]
VERSION=1.1
NAME=MOLNIYA 1-81
NICKNAME=MOLNIYA 1-81
-TLE1=1 21426U 91043A 09357.65132877 .00000000 00000-0 10000-3 0 2015
-TLE2=2 21426 61.9332 212.9267 7191942 267.6886 16.2365 2.00615853135705
+TLE1=1 21426U 91043A 09361.63906152 .00000372 00000-0 10000-3 0 2059
+TLE2=2 21426 61.9751 212.3813 7192591 267.7140 16.2484 2.00612235135787
[27421]
VERSION=1.1
NAME=SPOT 5
NICKNAME=SPOT 5
-TLE1=1 27421U 02021A 09357.70444020 .00000049 00000-0 43786-4 0 6897
-TLE2=2 27421 98.7548 68.8496 0000878 109.1981 250.9286 14.20009505396064
+TLE1=1 27421U 02021A 09364.13328451 -.00000017 00000-0 12906-4 0 7090
+TLE2=2 27421 98.7540 75.2107 0001015 112.3078 333.8023 14.20009684396972
[24846]
VERSION=1.1
NAME=INTELSAT 802 (IS-802)
NICKNAME=INTELSAT 802 (IS-802)
-TLE1=1 24846U 97031A 09356.83916550 .00000175 00000-0 10000-3 0 9306
-TLE2=2 24846 0.0216 331.0847 0005109 13.9674 81.4267 1.00274174 45818
+TLE1=1 24846U 97031A 09361.80126480 .00000180 00000-0 10000-3 0 9322
+TLE2=2 24846 0.0178 327.8436 0003397 355.6623 94.2283 1.00272860 45864
[33063]
VERSION=1.1
NAME=ORBCOMM FM39 [S]
NICKNAME=ORBCOMM FM39 [S]
-TLE1=1 33063U 08031D 09357.28303152 -.00000030 00000-0 28301-4 0 4925
-TLE2=2 33063 48.4452 272.1516 0009472 117.6012 242.5868 14.68200301 81119
+TLE1=1 33063U 08031D 09363.13586595 .00000008 00000-0 34725-4 0 4976
+TLE2=2 33063 48.4440 244.8335 0009433 142.2421 217.9159 14.68201933 81971
[25944]
VERSION=1.1
NAME=GLOBALSTAR M059
NICKNAME=GLOBALSTAR M059
-TLE1=1 25944U 99058B 09357.73407548 -.00000086 00000-0 10000-3 0 571
-TLE2=2 25944 52.0055 73.9196 0002158 163.9222 196.1705 12.62264926469793
+TLE1=1 25944U 99058B 09363.27696841 -.00000086 00000-0 10000-3 0 618
+TLE2=2 25944 52.0058 57.0475 0001872 177.0692 183.0187 12.62265053470498
[28446]
VERSION=1.1
NAME=AMC-15
NICKNAME=AMC-15
-TLE1=1 28446U 04041A 09357.52221175 -.00000068 00000-0 10000-3 0 9586
-TLE2=2 28446 0.0408 238.9537 0001966 17.4684 278.7208 1.00272721 19047
+TLE1=1 28446U 04041A 09362.50731860 -.00000067 00000-0 10000-3 0 9632
+TLE2=2 28446 0.0407 246.5048 0002076 20.2834 267.9127 1.00272335 19096
[25777]
VERSION=1.1
NAME=IRIDIUM 14 [S]
NICKNAME=IRIDIUM 14 [S]
-TLE1=1 25777U 99032A 09357.16386130 .00000164 00000-0 33115-4 0 8619
-TLE2=2 25777 86.5137 286.2056 0002358 78.0025 282.1450 14.54932239559406
+TLE1=1 25777U 99032A 09363.28492482 .00000176 00000-0 35973-4 0 8692
+TLE2=2 25777 86.5144 283.6476 0002317 79.5869 280.5598 14.54934915560295
[20776]
VERSION=1.1
NAME=SKYNET 4C
NICKNAME=SKYNET 4C
-TLE1=1 20776U 90079A 09353.81679682 .00000038 00000-0 10000-3 0 170
-TLE2=2 20776 10.2358 45.4535 0002917 225.5215 117.6288 1.00274917 70540
+TLE1=1 20776U 90079A 09362.09493448 .00000044 00000-0 10000-3 0 205
+TLE2=2 20776 10.2519 45.3659 0003466 238.8726 212.6234 1.00272358 70633
[22041]
VERSION=1.1
NAME=GORIZONT 26
NICKNAME=GORIZONT 26
-TLE1=1 22041U 92043A 09355.53000316 -.00000245 00000-0 10000-3 0 9151
-TLE2=2 22041 11.7355 41.8384 0029399 110.7405 249.5707 0.99243321 63737
+TLE1=1 22041U 92043A 09356.53759703 -.00000222 00000-0 10000-3 0 9170
+TLE2=2 22041 11.7378 41.8291 0029552 110.9415 249.3723 0.99242781 63749
[30798]
VERSION=1.1
NAME=THEMIS E
NICKNAME=THEMIS E
-TLE1=1 30798U 07004E 09357.45833333 -.00000040 00000-0 00000+0 0 7660
-TLE2=2 30798 4.1614 233.4442 7504299 141.7694 126.4715 1.00279061 9781
+TLE1=1 30798U 07004E 09364.04166667 .00000043 00000-0 00000+0 0 7732
+TLE2=2 30798 4.1489 233.0137 7505127 142.6733 342.9501 1.00290585 9853
[26064]
VERSION=1.1
NAME=FALCONSAT
NICKNAME=FALCONSAT
-TLE1=1 26064U 00004D 09357.57776370 -.00000089 00000-0 -10261-4 0 6471
-TLE2=2 26064 100.2253 176.8548 0038395 95.4352 265.1212 14.35431937518988
+TLE1=1 26064U 00004D 09363.50254615 .00000002 00000-0 21107-4 0 6490
+TLE2=2 26064 100.2261 183.8691 0038430 78.9879 281.5629 14.35432709519831
[27516]
VERSION=1.1
NAME=KODAMA (DRTS)
NICKNAME=KODAMA (DRTS)
-TLE1=1 27516U 02042B 09355.87237574 -.00000218 00000-0 10000-3 0 2993
-TLE2=2 27516 0.0511 270.3139 0002845 339.1521 245.8945 1.00270029 26723
+TLE1=1 27516U 02042B 09362.22434272 -.00000212 00000-0 10000-3 0 3023
+TLE2=2 27516 0.0543 263.2328 0003497 352.6639 12.4496 1.00270812 26788
[25116]
VERSION=1.1
NAME=ORBCOMM FM09 [+]
NICKNAME=ORBCOMM FM09 [+]
-TLE1=1 25116U 97084E 09357.02699955 -.00000148 00000-0 -24796-5 0 2263
-TLE2=2 25116 45.0178 188.3539 0004691 278.0505 81.9810 14.34415614627360
+TLE1=1 25116U 97084E 09363.71315244 -.00000052 00000-0 31415-4 0 2316
+TLE2=2 25116 45.0181 156.8447 0004514 306.2733 53.7662 14.34418458628321
[25467]
VERSION=1.1
NAME=IRIDIUM 82 [+]
NICKNAME=IRIDIUM 82 [+]
-TLE1=1 25467U 98051A 09357.20133978 -.00000600 00000-0 -22148-3 0 9318
-TLE2=2 25467 86.3953 84.2276 0001654 106.1082 254.0341 14.34211725594897
+TLE1=1 25467U 98051A 09363.27121032 .00000112 00000-0 32949-4 0 9395
+TLE2=2 25467 86.3957 81.6919 0001976 108.1440 251.9961 14.34215642595766
[28129]
VERSION=1.1
NAME=GPS BIIR-10 (PRN 22)
NICKNAME=GPS BIIR-10 (PRN 22)
-TLE1=1 28129U 03058A 09356.92778996 -.00000042 00000-0 10000-3 0 4332
-TLE2=2 28129 53.6934 272.2541 0054150 253.3262 106.1263 2.00564400 44069
+TLE1=1 28129U 03058A 09361.91353667 -.00000017 00000-0 10000-3 0 4401
+TLE2=2 28129 53.6898 272.0458 0054076 253.1230 106.3325 2.00564440 44169
[31119]
VERSION=1.1
NAME=SAUDICOMSAT 7
NICKNAME=SAUDICOMSAT 7
-TLE1=1 31119U 07012C 09357.18239228 .00000386 00000-0 88724-4 0 8162
-TLE2=2 31119 97.9694 52.4074 0062857 26.4526 333.9833 14.59471969143067
+TLE1=1 31119U 07012C 09363.21553078 .00000385 00000-0 88724-4 0 8210
+TLE2=2 31119 97.9699 58.2050 0062552 7.7064 352.5061 14.59473221143941
[24315]
VERSION=1.1
NAME=AMC-1 (GE-1)
NICKNAME=AMC-1 (GE-1)
-TLE1=1 24315U 96054A 09356.91856219 .00000000 00000-0 10000-3 0 2619
-TLE2=2 24315 0.0164 261.7586 0003273 356.5898 60.9190 1.00269025 48677
+TLE1=1 24315U 96054A 09363.19245559 -.00000082 00000-0 10000-3 0 2640
+TLE2=2 24315 0.0359 236.6866 0003515 41.0464 146.3338 1.00271664 48731
[27601]
VERSION=1.1
NAME=H-2A R/B
NICKNAME=H-2A R/B
-TLE1=1 27601U 02056E 09357.34994263 .00000025 00000-0 25358-4 0 8042
-TLE2=2 27601 98.5664 84.3324 0073926 85.2859 275.6771 14.30728691366915
+TLE1=1 27601U 02056E 09364.20349918 .00000021 00000-0 23877-4 0 8091
+TLE2=2 27601 98.5657 91.0860 0073982 65.2673 295.6187 14.30729582367892
[25468]
VERSION=1.1
NAME=IRIDIUM 81 [+]
NICKNAME=IRIDIUM 81 [+]
-TLE1=1 25468U 98051B 09357.19499773 -.00000560 00000-0 -20716-3 0 7575
-TLE2=2 25468 86.3951 84.0555 0002351 86.3068 273.8409 14.34212467591112
+TLE1=1 25468U 98051B 09363.33463849 .00000182 00000-0 58034-4 0 7655
+TLE2=2 25468 86.3948 81.4894 0002333 87.8076 272.3399 14.34215716591998
[33108]
VERSION=1.1
NAME=COSMOS 2440
NICKNAME=COSMOS 2440
-TLE1=1 33108U 08033A 09356.81946198 -.00000120 00000-0 10000-3 0 4261
-TLE2=2 33108 1.0653 295.2386 0002231 34.1114 137.2316 1.00276936 5449
+TLE1=1 33108U 08033A 09361.77691565 -.00000115 00000-0 10000-3 0 4272
+TLE2=2 33108 1.0556 295.2632 0002408 23.4639 137.5202 1.00276685 5497
[27858]
VERSION=1.1
NAME=SCISAT 1
NICKNAME=SCISAT 1
-TLE1=1 27858U 03036A 09357.82644354 .00000008 00000-0 63328-5 0 9087
-TLE2=2 27858 73.9322 168.9313 0008555 187.2298 172.8755 14.74827142342676
+TLE1=1 27858U 03036A 09363.52438304 .00000080 00000-0 17071-4 0 9136
+TLE2=2 27858 73.9326 157.7318 0008441 175.1359 184.9913 14.74828801343516
[34839]
VERSION=1.1
NAME=YAOGAN 6
NICKNAME=YAOGAN 6
-TLE1=1 34839U 09021A 09357.67581074 .00000936 00000-0 49329-4 0 7819
-TLE2=2 34839 97.6134 68.0022 0002831 119.9649 34.7354 15.18086078 37257
+TLE1=1 34839U 09021A 09364.18747444 .00000844 00000-0 44826-4 0 8005
+TLE2=2 34839 97.6131 74.5546 0003106 107.5763 331.6029 15.18096393 38242
[25163]
VERSION=1.1
NAME=GLOBALSTAR M004
NICKNAME=GLOBALSTAR M004
-TLE1=1 25163U 98008B 09357.55191522 -.00000086 00000-0 10000-3 0 4967
-TLE2=2 25163 52.0011 21.1618 0002670 12.4276 347.6649 12.63156453547117
+TLE1=1 25163U 98008B 09363.24915253 -.00000086 00000-0 10000-3 0 5001
+TLE2=2 25163 52.0007 3.7878 0002854 24.7498 335.3501 12.63156379547839
[17589]
VERSION=1.1
NAME=COSMOS 1833
NICKNAME=COSMOS 1833
-TLE1=1 17589U 87027A 09357.12186373 -.00000332 00000-0 -15265-3 0 4817
-TLE2=2 17589 70.9133 167.9082 0004171 172.3973 187.7207 14.12758567174294
+TLE1=1 17589U 87027A 09363.77748841 -.00000348 00000-0 -16177-3 0 4864
+TLE2=2 17589 70.9131 153.9240 0003800 159.4782 200.6495 14.12754304175239
[25578]
VERSION=1.1
NAME=IRIDIUM 11 [S]
NICKNAME=IRIDIUM 11 [S]
-TLE1=1 25578U 98074B 09356.96134130 .00000140 00000-0 27615-4 0 8916
-TLE2=2 25578 86.5141 318.0066 0002488 79.8976 280.2513 14.54934642584994
+TLE1=1 25578U 98074B 09363.28872505 .00000197 00000-0 40798-4 0 9004
+TLE2=2 25578 86.5143 315.3621 0002390 79.2037 280.9447 14.54936766585912
[11849]
VERSION=1.1
NAME=SL-3 R/B
NICKNAME=SL-3 R/B
-TLE1=1 11849U 80051B 09357.76003743 .00001069 00000-0 44864-4 0 156
-TLE2=2 11849 97.7239 135.2045 0009951 314.6879 45.3586 15.25788689616579
+TLE1=1 11849U 80051B 09363.13771352 .00000657 00000-0 28745-4 0 198
+TLE2=2 11849 97.7234 140.7592 0009753 292.9351 67.0788 15.25796712617397
[27775]
VERSION=1.1
@@ -990,869 +983,862 @@
VERSION=1.1
NAME=COSMOS 1484
NICKNAME=COSMOS 1484
-TLE1=1 14207U 83075A 09356.96093774 .00003867 00000-0 81416-4 0 4875
-TLE2=2 14207 97.5563 122.3676 0014516 258.5555 101.4037 15.45842160890526
+TLE1=1 14207U 83075A 09363.43402478 .00002900 00000-0 61463-4 0 4923
+TLE2=2 14207 97.5554 129.1125 0014713 232.8858 127.1013 15.45885686891520
[24674]
VERSION=1.1
NAME=INMARSAT 3-F3
NICKNAME=INMARSAT 3-F3
-TLE1=1 24674U 96070A 09357.25079220 .00000060 00000-0 10000-3 0 1044
-TLE2=2 24674 0.0894 315.3388 0005953 335.2923 69.6750 1.00270773 47647
+TLE1=1 24674U 96070A 09363.25108027 .00000060 00000-0 10000-3 0 1140
+TLE2=2 24674 0.0779 317.9426 0006205 334.4599 73.9108 1.00272173 47709
[6236]
VERSION=1.1
NAME=OSCAR 6 (AO-6)
NICKNAME=AO-6
-TLE1=1 06236U 72082B 09356.57402302 -.00000027 00000-0 10000-3 0 2450
-TLE2=2 06236 101.3896 2.3222 0003810 242.0384 118.0299 12.53079667701007
+TLE1=1 06236U 72082B 09362.96106682 -.00000027 00000-0 10000-3 0 2508
+TLE2=2 06236 101.3901 8.4481 0003773 230.7311 129.3419 12.53079598701800
[25546]
VERSION=1.1
NAME=BONUM 1
NICKNAME=BONUM 1
-TLE1=1 25546U 98068A 09357.45623144 .00000000 00000-0 10000-3 0 4535
-TLE2=2 25546 0.0152 232.6776 0002448 0.5722 79.0700 1.00267016 40694
+TLE1=1 25546U 98068A 09363.07892759 .00000100 00000-0 10000-3 0 4575
+TLE2=2 25546 0.0525 220.6393 0002410 24.8977 296.4697 1.00270893 40743
[28474]
VERSION=1.1
NAME=GPS BIIR-13 (DASS)
NICKNAME=GPS BIIR-13 (DASS)
-TLE1=1 28474U 04045A 09357.66001497 .00000000 00000-0 10000-3 0 901
-TLE2=2 28474 53.8861 209.6146 0090698 168.6676 191.6130 2.00553138 37691
+TLE1=1 28474U 04045A 09362.64600961 .00000114 00000-0 10000-3 0 980
+TLE2=2 28474 53.8854 209.4117 0090776 168.8344 191.4489 2.00554422 37793
[27939]
VERSION=1.1
NAME=MOZHAYETS 4 (RS-22)
NICKNAME=RS-22
-TLE1=1 27939U 03042A 09357.67298473 .00000096 00000-0 27345-4 0 9696
-TLE2=2 27939 97.9147 225.3312 0012595 253.8399 106.1421 14.63367983333282
+TLE1=1 27939U 03042A 09363.69011799 .00000006 00000-0 99717-5 0 9749
+TLE2=2 27939 97.9159 231.1108 0012790 232.7666 127.2366 14.63369209334166
[31129]
VERSION=1.1
NAME=POLYSAT CP3
NICKNAME=POLYSAT CP3
-TLE1=1 31129U 07012N 09357.65724642 .00000155 00000-0 46068-4 0 4158
-TLE2=2 31129 97.9643 41.4074 0103257 58.5086 302.6150 14.52193841142389
+TLE1=1 31129U 07012N 09364.13399789 .00000084 00000-0 29984-4 0 4338
+TLE2=2 31129 97.9654 47.5567 0103190 38.6552 322.1988 14.52195074143329
[24960]
VERSION=1.1
NAME=MOLNIYA 1-90
NICKNAME=MOLNIYA 1-90
-TLE1=1 24960U 97054A 09357.66987919 .00000110 00000-0 10000-3 0 6796
-TLE2=2 24960 63.7218 59.9128 7366643 253.5181 337.1297 2.00628991 89785
+TLE1=1 24960U 97054A 09363.26463083 .00000058 00000-0 10000-3 0 6847
+TLE2=2 24960 63.7199 59.0904 7369340 253.4910 58.1140 2.00632922 89890
[20625]
VERSION=1.1
NAME=SL-16 R/B
NICKNAME=SL-16 R/B
-TLE1=1 20625U 90046B 09356.90055747 .00000098 00000-0 75937-4 0 4722
-TLE2=2 20625 70.9955 124.6407 0015513 293.7378 66.2141 14.14375894 11334
+TLE1=1 20625U 90046B 09363.69000602 .00000324 00000-0 19383-3 0 4775
+TLE2=2 20625 70.9974 110.3980 0015797 285.3853 74.5520 14.14382317 12299
[25346]
VERSION=1.1
NAME=IRIDIUM 75 [+]
NICKNAME=IRIDIUM 75 [+]
-TLE1=1 25346U 98032E 09357.15882332 -.00000407 00000-0 -15248-3 0 8397
-TLE2=2 25346 86.3961 286.2956 0002341 72.5863 287.5592 14.34212609607940
+TLE1=1 25346U 98032E 09363.29846215 .00000141 00000-0 43157-4 0 8472
+TLE2=2 25346 86.3946 283.7299 0002309 75.7700 284.3767 14.34215904608822
[25639]
VERSION=1.1
NAME=SKYNET 4E
NICKNAME=SKYNET 4E
-TLE1=1 25639U 99009B 09357.11737940 .00000167 00000-0 10000-3 0 7051
-TLE2=2 25639 5.8246 51.0598 0002944 219.8694 258.4406 1.00273778 39677
+TLE1=1 25639U 99009B 09361.80209272 .00000168 00000-0 10000-3 0 7077
+TLE2=2 25639 5.8345 51.0302 0003037 222.3889 147.1168 1.00276119 39726
[32052]
VERSION=1.1
NAME=COSMOS 2429
NICKNAME=COSMOS 2429
-TLE1=1 32052U 07038A 09357.42786441 -.00000034 00000-0 -52353-4 0 7214
-TLE2=2 32052 82.9784 320.5834 0039861 118.5259 241.9918 13.74697501114569
+TLE1=1 32052U 07038A 09363.90567497 .00000094 00000-0 81834-4 0 7278
+TLE2=2 32052 82.9790 315.8128 0040143 101.1173 259.4495 13.74698446115459
[25652]
VERSION=1.1
NAME=GLOBALSTAR M037
NICKNAME=GLOBALSTAR M037
-TLE1=1 25652U 99012D 09357.66734130 -.00000086 00000-0 10000-3 0 1187
-TLE2=2 25652 51.9992 119.9988 0000686 4.6191 1.3131 12.64130752497227
+TLE1=1 25652U 99012D 09363.75421859 -.00000086 00000-0 10000-3 0 1231
+TLE2=2 25652 52.0026 101.3966 0000081 318.6969 41.3889 12.64133457497991
[13631]
VERSION=1.1
NAME=SATCOM C5
NICKNAME=SATCOM C5
-TLE1=1 13631U 82105A 09357.11953154 .00000000 00000-0 10000-3 0 7063
-TLE2=2 13631 12.8389 29.7705 0007997 254.1648 105.7607 1.00268149 66019
+TLE1=1 13631U 82105A 09362.35470461 -.00000094 00000-0 10000-3 0 7097
+TLE2=2 13631 12.8474 29.7225 0007973 259.4024 190.3849 1.00271959 66067
[22653]
VERSION=1.1
NAME=ASTRA 1C
NICKNAME=ASTRA 1C
-TLE1=1 22653U 93031A 09353.81821589 .00000022 00000-0 10000-3 0 4887
-TLE2=2 22653 3.0441 75.2562 0004787 179.6453 130.1635 1.00272298 55910
+TLE1=1 22653U 93031A 09361.86927620 .00000033 00000-0 10000-3 0 4897
+TLE2=2 22653 3.0636 75.1563 0004761 181.0059 155.2742 1.00274224 55993
[25860]
VERSION=1.1
NAME=OKEAN-O
NICKNAME=OKEAN-O
-TLE1=1 25860U 99039A 09357.07695477 .00000054 00000-0 15573-4 0 8689
-TLE2=2 25860 97.8098 330.9996 0000668 54.8813 305.2462 14.73603891560962
+TLE1=1 25860U 99039A 09364.13876440 .00000078 00000-0 19316-4 0 8747
+TLE2=2 25860 97.8105 337.8004 0000532 66.4195 293.7079 14.73605448562001
[28082]
VERSION=1.1
NAME=ZHONGXING-20
NICKNAME=ZHONGXING-20
-TLE1=1 28082U 03052A 09356.82284553 -.00000273 00000-0 10000-3 0 9087
-TLE2=2 28082 0.0116 321.3270 0002344 356.7996 167.7090 1.00270209 22416
+TLE1=1 28082U 03052A 09363.62018411 -.00000272 00000-0 10000-3 0 9136
+TLE2=2 28082 0.0174 309.2354 0002873 11.5256 98.7498 1.00267700 22484
[2807]
VERSION=1.1
NAME=TRANSIT 16
NICKNAME=TRANSIT 16
-TLE1=1 02807U 67048A 09357.54248973 .00000074 00000-0 10000-3 0 3391
-TLE2=2 02807 89.6594 197.2005 0022059 54.3979 305.9216 13.49726151 96166
+TLE1=1 02807U 67048A 09362.58353779 .00000074 00000-0 10000-3 0 3426
+TLE2=2 02807 89.6588 197.0291 0021866 41.0650 319.2136 13.49726391 96848
[25108]
VERSION=1.1
NAME=IRIDIUM 49 [+]
NICKNAME=IRIDIUM 49 [+]
-TLE1=1 25108U 97082E 09356.99096231 .00000045 00000-0 89098-5 0 7989
-TLE2=2 25108 86.3959 317.7990 0002352 80.1253 280.0204 14.34214868628626
+TLE1=1 25108U 97082E 09363.33990442 .00000103 00000-0 29693-4 0 8061
+TLE2=2 25108 86.3946 315.1452 0002287 83.2530 276.8933 14.34216472629532
[28894]
VERSION=1.1
NAME=SSETI EXPRESS (XO-53)
NICKNAME=XO-53
-TLE1=1 28894U 05043E 09357.60463304 .00000044 00000-0 18625-4 0 6466
-TLE2=2 28894 98.0333 242.2276 0018434 115.1476 245.1644 14.59698637221480
+TLE1=1 28894U 05043E 09363.70541866 .00000021 00000-0 13783-4 0 6515
+TLE2=2 28894 98.0329 248.1382 0018568 96.8832 263.4482 14.59699328222377
[26084]
VERSION=1.1
NAME=GLOBALSTAR M064
NICKNAME=GLOBALSTAR M064
-TLE1=1 26084U 00008D 09357.58803729 -.00000086 00000-0 10000-3 0 3481
-TLE2=2 26084 52.0079 30.0468 0000196 338.6071 21.4783 12.62527022481850
+TLE1=1 26084U 00008D 09364.15896105 -.00000086 00000-0 10000-3 0 3538
+TLE2=2 26084 52.0083 10.0340 0000448 1.0418 359.0442 12.62527154482688
[21397]
VERSION=1.1
NAME=OKEAN-3
NICKNAME=OKEAN-3
-TLE1=1 21397U 91039A 09357.01371802 .00000227 00000-0 22631-4 0 8471
-TLE2=2 21397 82.5216 202.1602 0019461 340.7209 19.3286 14.86880021 2938
+TLE1=1 21397U 91039A 09363.60876692 .00000178 00000-0 17174-4 0 8538
+TLE2=2 21397 82.5212 195.9526 0018768 318.2565 41.7206 14.86881886 3912
[24873]
VERSION=1.1
NAME=IRIDIUM 921 [-]
NICKNAME=IRIDIUM 921 [-]
-TLE1=1 24873U 97034E 09357.15271408 .00000074 00000-0 36998-5 0 8461
-TLE2=2 24873 86.3858 263.5384 0006708 214.0280 146.0532 14.97256601677487
+TLE1=1 24873U 97034E 09363.23454359 .00000582 00000-0 47531-4 0 8564
+TLE2=2 24873 86.3859 260.7224 0007412 188.1279 171.9822 14.97266288678394
[23814]
VERSION=1.1
NAME=REX 2
NICKNAME=REX 2
-TLE1=1 23814U 96014A 09357.27403583 .00000065 00000-0 23317-4 0 8567
-TLE2=2 23814 90.1616 275.7064 0024622 56.6809 303.6744 14.23879835716454
+TLE1=1 23814U 96014A 09363.24744065 .00000059 00000-0 21078-4 0 8615
+TLE2=2 23814 90.1609 275.8174 0024214 38.7029 321.5912 14.23880384717303
[19120]
VERSION=1.1
NAME=SL-16 R/B
NICKNAME=SL-16 R/B
-TLE1=1 19120U 88039B 09356.48695125 -.00000114 00000-0 -31631-4 0 8146
-TLE2=2 19120 71.0108 339.2853 0021243 55.1992 305.1141 14.18586505118602
+TLE1=1 19120U 88039B 09362.55112668 .00000054 00000-0 49151-4 0 8155
+TLE2=2 19120 71.0110 326.4836 0021393 45.1291 315.1929 14.18590100119467
[26666]
VERSION=1.1
NAME=TURKSAT 2A
NICKNAME=TURKSAT 2A
-TLE1=1 26666U 01002A 09354.94072284 .00000160 00000-0 10000-3 0 5724
-TLE2=2 26666 0.0364 269.6662 0004813 357.9461 202.6838 1.00273184 32773
+TLE1=1 26666U 01002A 09360.82842779 .00000171 00000-0 10000-3 0 5746
+TLE2=2 26666 0.0242 274.4246 0004371 351.1670 170.1126 1.00274978 32835
[15935]
VERSION=1.1
NAME=OSCAR 30
NICKNAME=OSCAR 30
-TLE1=1 15935U 85066A 09356.96839378 .00000033 00000-0 45450-4 0 5112
-TLE2=2 15935 90.0583 23.8196 0169540 334.2246 25.0518 13.35269872185896
+TLE1=1 15935U 85066A 09363.56258251 .00000028 00000-0 36957-4 0 5139
+TLE2=2...
[truncated message content] |
|
From: <cs...@us...> - 2009-12-29 18:43:47
|
Revision: 564
http://gpredict.svn.sourceforge.net/gpredict/?rev=564&view=rev
Author: csete
Date: 2009-12-29 18:43:41 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Updated user manual for version 1.2
Modified Paths:
--------------
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/doc/um/gpredict-user-manual.odt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-27 13:10:47
|
Revision: 563
http://gpredict.svn.sourceforge.net/gpredict/?rev=563&view=rev
Author: csete
Date: 2009-12-27 13:10:23 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Minor edit of mode descriptor.
Modified Paths:
--------------
trunk/data/trsp/36122.trsp
Modified: trunk/data/trsp/36122.trsp
===================================================================
--- trunk/data/trsp/36122.trsp 2009-12-27 01:01:15 UTC (rev 562)
+++ trunk/data/trsp/36122.trsp 2009-12-27 13:10:23 UTC (rev 563)
@@ -15,7 +15,7 @@
UP_HIGH=145975000
INVERT=true
-[Mode V/U BBS (1k2 AFSK)]
+[Mode V/U BBS AFSK]
DOWN_LOW=145825000
UP_LOW=435675000
MODE=AFSK
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-27 01:28:05
|
Revision: 559
http://gpredict.svn.sourceforge.net/gpredict/?rev=559&view=rev
Author: csete
Date: 2009-12-27 00:12:09 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Fixed indentation.
Modified Paths:
--------------
trunk/src/sat-pass-dialogs.c
trunk/src/save-pass.c
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2009-12-26 23:03:45 UTC (rev 558)
+++ trunk/src/sat-pass-dialogs.c 2009-12-27 00:12:09 UTC (rev 559)
@@ -11,7 +11,7 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -266,7 +266,7 @@
*
*/
void
-show_pass (const gchar *satname, qth_t *qth, pass_t *pass, GtkWidget *toplevel)
+ show_pass (const gchar *satname, qth_t *qth, pass_t *pass, GtkWidget *toplevel)
{
GtkWidget *dialog; /* the dialogue window */
GtkWidget *notebook; /* the notebook widet */
@@ -369,7 +369,7 @@
SINGLE_PASS_COL_MA, detail->ma,
SINGLE_PASS_COL_PHASE, detail->phase,
-1);
-
+
/* SINGLE_PASS_COL_RA */
/* SINGLE_PASS_COL_DEC */
if (flags & (SINGLE_PASS_FLAG_RA | SINGLE_PASS_FLAG_DEC)) {
@@ -516,7 +516,7 @@
g_signal_connect (dialog, "response",
G_CALLBACK (single_pass_response), NULL);
- g_signal_connect (dialog, "destroy",
+ g_signal_connect (dialog, "destroy",
G_CALLBACK (single_pass_dialog_destroy), NULL);
g_signal_connect (dialog, "delete_event",
G_CALLBACK (single_pass_dialog_delete), NULL);
@@ -539,7 +539,7 @@
*
*/
static void
-single_pass_response (GtkWidget *dialog, gint response, gpointer data)
+ single_pass_response (GtkWidget *dialog, gint response, gpointer data)
{
switch (response) {
@@ -547,7 +547,7 @@
case RESPONSE_PRINT:
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: PRINT not implemented"),
- __FUNCTION__);
+ __FUNCTION__);
break;
case RESPONSE_SAVE:
@@ -565,9 +565,9 @@
/** \brief Set cell renderer function. */
static void
-check_and_set_single_cell_renderer (GtkTreeViewColumn *column,
- GtkCellRenderer *renderer,
- gint i)
+ check_and_set_single_cell_renderer (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ gint i)
{
switch (i) {
@@ -661,11 +661,11 @@
original flaoting point numbers. Very cool!
*/
static void
-latlon_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ latlon_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number = 0.0;
gchar *buff;
@@ -718,11 +718,11 @@
/* general floats with 2 digits + degree char */
static void
-degree_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ degree_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -742,11 +742,11 @@
/* distance and velocity, 0 decimal digits */
static void
-distance_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ distance_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -771,11 +771,11 @@
and want 2-3 decimal digits.
*/
static void
-range_rate_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ range_rate_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -798,11 +798,11 @@
/* 0 decimal digits */
static void
-float_to_int_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ float_to_int_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -820,11 +820,11 @@
/* 2 decimal digits */
static void
-two_dec_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ two_dec_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -843,11 +843,11 @@
/* AOS/LOS; convert julian date to string */
static void
-time_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ time_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar buff[TIME_FORMAT_MAX_LENGTH];
@@ -899,14 +899,14 @@
static gint
-single_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
+ single_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
{
/* dialog will be destroyed */
return FALSE;
}
static void
-single_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
+ single_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
{
pass_t *pass = PASS(g_object_get_data (G_OBJECT (dialog), "pass"));
@@ -918,13 +918,13 @@
/*** FIXME: formalise with other copies */
static void
-Calc_RADec (gdouble jul_utc, gdouble saz, gdouble sel,
- qth_t *qth, obs_astro_t *obs_set)
+ Calc_RADec (gdouble jul_utc, gdouble saz, gdouble sel,
+ qth_t *qth, obs_astro_t *obs_set)
{
double phi,theta,sin_theta,cos_theta,sin_phi,cos_phi,
- az,el,Lxh,Lyh,Lzh,Sx,Ex,Zx,Sy,Ey,Zy,Sz,Ez,Zz,
- Lx,Ly,Lz,cos_delta,sin_alpha,cos_alpha;
+ az,el,Lxh,Lyh,Lzh,Sx,Ex,Zx,Sy,Ey,Zy,Sz,Ez,Zz,
+ Lx,Ly,Lz,cos_delta,sin_alpha,cos_alpha;
geodetic_t geodetic;
@@ -979,7 +979,7 @@
*
*/
void
-show_passes (const gchar *satname, qth_t *qth, GSList *passes, GtkWidget *toplevel)
+ show_passes (const gchar *satname, qth_t *qth, GSList *passes, GtkWidget *toplevel)
{
GtkWidget *dialog;
GtkWidget *list;
@@ -1152,14 +1152,14 @@
*
*/
static void
-multi_pass_response (GtkWidget *dialog, gint response, gpointer data)
+ multi_pass_response (GtkWidget *dialog, gint response, gpointer data)
{
switch (response) {
case RESPONSE_PRINT:
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: PRINT not implemented"),
- __FUNCTION__);
+ __FUNCTION__);
break;
case RESPONSE_SAVE:
@@ -1176,7 +1176,7 @@
static gint
-multi_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
+ multi_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
{
/* dialog will be destroyed */
return FALSE;
@@ -1184,7 +1184,7 @@
static void
-multi_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
+ multi_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
{
GSList *passes = (GSList *) g_object_get_data (G_OBJECT (dialog), "passes");
@@ -1197,9 +1197,9 @@
/** \brief Set cell renderer function. */
static void
-check_and_set_multi_cell_renderer (GtkTreeViewColumn *column,
- GtkCellRenderer *renderer,
- gint i)
+ check_and_set_multi_cell_renderer (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ gint i)
{
switch (i) {
@@ -1247,11 +1247,11 @@
/* duration; convert delta t in days to HH:MM:SS */
static void
-duration_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+ duration_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -1324,7 +1324,7 @@
* for the function that actually creates the popup menu.
*/
static gboolean
-popup_menu_cb (GtkWidget *treeview, gpointer data)
+ popup_menu_cb (GtkWidget *treeview, gpointer data)
{
/* if there is no selection, select the first row */
@@ -1343,7 +1343,7 @@
*
*/
static gboolean
-button_press_cb (GtkWidget *treeview, GdkEventButton *event, gpointer data)
+ button_press_cb (GtkWidget *treeview, GdkEventButton *event, gpointer data)
{
/* single click with the right mouse button? */
@@ -1385,7 +1385,7 @@
static void
-view_popup_menu (GtkWidget *treeview, GdkEventButton *event, gpointer data)
+ view_popup_menu (GtkWidget *treeview, GdkEventButton *event, gpointer data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -1413,8 +1413,8 @@
pass = copy_pass (PASS (g_slist_nth_data (passes, rownum)));
pass_popup_menu_exec (qth, pass, event, gtk_widget_get_toplevel (treeview));
-
+
}
else {
sat_log_log (SAT_LOG_LEVEL_BUG,
Modified: trunk/src/save-pass.c
===================================================================
--- trunk/src/save-pass.c 2009-12-26 23:03:45 UTC (rev 558)
+++ trunk/src/save-pass.c 2009-12-27 00:12:09 UTC (rev 559)
@@ -11,17 +11,17 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, visit http://www.fsf.org/
*/
@@ -49,25 +49,25 @@
static void file_changed (GtkWidget *widget, gpointer data);
static void save_pass_exec (GtkWidget *parent,
- pass_t *pass, qth_t *qth,
- const gchar *savedir, const gchar *savefile,
- gint format, gint contents);
+ pass_t *pass, qth_t *qth,
+ const gchar *savedir, const gchar *savefile,
+ gint format, gint contents);
static void save_passes_exec (GtkWidget *parent,
- GSList *passes, qth_t *qth,
- const gchar *savedir, const gchar *savefile,
- gint format, gint contents);
+ GSList *passes, qth_t *qth,
+ const gchar *savedir, const gchar *savefile,
+ gint format, gint contents);
static void save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data);
enum pass_content_e {
- PASS_CONTENT_ALL = 0,
- PASS_CONTENT_TABLE,
- PASS_CONTENT_DATA,
+ PASS_CONTENT_ALL = 0,
+ PASS_CONTENT_TABLE,
+ PASS_CONTENT_DATA,
};
enum passes_content_e {
- PASSES_CONTENT_FULL = 0,
- PASSES_CONTENT_SUM,
+ PASSES_CONTENT_FULL = 0,
+ PASSES_CONTENT_SUM,
};
@@ -85,152 +85,152 @@
* \note All the relevant data are attached to the parent dialogue window.
*/
void
-save_pass (GtkWidget *parent)
+ save_pass (GtkWidget *parent)
{
- GtkWidget *dialog;
- GtkWidget *table;
- GtkWidget *dirchooser;
- GtkWidget *filchooser;
- GtkWidget *fmtchooser;
- GtkWidget *contents;
- GtkWidget *label;
- gint response;
- pass_t *pass;
- gchar *sat;
- qth_t *qth;
- gchar *savedir = NULL;
- gchar *savefile;
- gint format;
- gint cont;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *dirchooser;
+ GtkWidget *filchooser;
+ GtkWidget *fmtchooser;
+ GtkWidget *contents;
+ GtkWidget *label;
+ gint response;
+ pass_t *pass;
+ gchar *sat;
+ qth_t *qth;
+ gchar *savedir = NULL;
+ gchar *savefile;
+ gint format;
+ gint cont;
- /* get data attached to parent */
- sat = (gchar *) g_object_get_data (G_OBJECT (parent), "sat");
- qth = (qth_t *) g_object_get_data (G_OBJECT (parent), "qth");
- pass = (pass_t *) g_object_get_data (G_OBJECT (parent), "pass");
+ /* get data attached to parent */
+ sat = (gchar *) g_object_get_data (G_OBJECT (parent), "sat");
+ qth = (qth_t *) g_object_get_data (G_OBJECT (parent), "qth");
+ pass = (pass_t *) g_object_get_data (G_OBJECT (parent), "pass");
-
- /* create the dialog */
- dialog = gtk_dialog_new_with_buttons (_("Save Pass Details"), GTK_WINDOW (parent),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- GTK_STOCK_SAVE,
- GTK_RESPONSE_ACCEPT,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+ /* create the dialog */
+ dialog = gtk_dialog_new_with_buttons (_("Save Pass Details"), GTK_WINDOW (parent),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ GTK_STOCK_SAVE,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
- /* create the table */
- table = gtk_table_new (4, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 10);
- gtk_table_set_row_spacings (GTK_TABLE (table), 10);
- gtk_container_set_border_width (GTK_CONTAINER (table), 10);
- /* directory chooser */
- label = gtk_label_new (_("Save in folder:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+ /* create the table */
+ table = gtk_table_new (4, 2, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 10);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 10);
- dirchooser = gtk_file_chooser_button_new (_("Select a folder"),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- savedir = sat_cfg_get_str (SAT_CFG_STR_PRED_SAVE_DIR);
- if (savedir) {
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser), savedir);
- g_free (savedir);
- }
- else {
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser),
- g_get_home_dir ());
- }
- gtk_table_attach_defaults (GTK_TABLE (table), dirchooser, 1, 2, 0, 1);
+ /* directory chooser */
+ label = gtk_label_new (_("Save in folder:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
- /* file name */
- label = gtk_label_new (_("Save using file name:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+ dirchooser = gtk_file_chooser_button_new (_("Select a folder"),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ savedir = sat_cfg_get_str (SAT_CFG_STR_PRED_SAVE_DIR);
+ if (savedir) {
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser), savedir);
+ g_free (savedir);
+ }
+ else {
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser),
+ g_get_home_dir ());
+ }
+ gtk_table_attach_defaults (GTK_TABLE (table), dirchooser, 1, 2, 0, 1);
- filchooser = gtk_entry_new ();
- gtk_entry_set_max_length (GTK_ENTRY (filchooser), 100);
- g_signal_connect (filchooser, "changed", G_CALLBACK (file_changed), dialog);
- gtk_table_attach_defaults (GTK_TABLE (table), filchooser, 1, 2, 1, 2);
+ /* file name */
+ label = gtk_label_new (_("Save using file name:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
- /* use satellite name + orbit num as default; replace invalid characters
+ filchooser = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (filchooser), 100);
+ g_signal_connect (filchooser, "changed", G_CALLBACK (file_changed), dialog);
+ gtk_table_attach_defaults (GTK_TABLE (table), filchooser, 1, 2, 1, 2);
+
+ /* use satellite name + orbit num as default; replace invalid characters
with dash */
- savefile = g_strdup_printf ("%s-%d", pass->satname, pass->orbit);
- savefile = g_strdelimit (savefile, " ", '-');
- savefile = g_strdelimit (savefile, "!?/\()*&%$#@[]{}=+<>,.|:;", '_');
- gtk_entry_set_text (GTK_ENTRY (filchooser), savefile);
- g_free (savefile);
-
+ savefile = g_strdup_printf ("%s-%d", pass->satname, pass->orbit);
+ savefile = g_strdelimit (savefile, " ", '-');
+ savefile = g_strdelimit (savefile, "!?/\()*&%$#@[]{}=+<>,.|:;", '_');
+ gtk_entry_set_text (GTK_ENTRY (filchooser), savefile);
+ g_free (savefile);
- /* file format */
- label = gtk_label_new (_("Save as:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- fmtchooser = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Plain text (*.txt)"));
-/* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Hypertext (*.html)")); */
-/* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Docbook (*.xml)")); */
- gtk_combo_box_set_active (GTK_COMBO_BOX (fmtchooser),
- sat_cfg_get_int (SAT_CFG_INT_PRED_SAVE_FORMAT));
- gtk_table_attach_defaults (GTK_TABLE (table), fmtchooser, 1, 2, 2, 3);
+ /* file format */
+ label = gtk_label_new (_("Save as:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- gtk_widget_set_sensitive (fmtchooser, FALSE);
+ fmtchooser = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Plain text (*.txt)"));
+ /* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Hypertext (*.html)")); */
+ /* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Docbook (*.xml)")); */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (fmtchooser),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_SAVE_FORMAT));
+ gtk_table_attach_defaults (GTK_TABLE (table), fmtchooser, 1, 2, 2, 3);
- /* file contents */
- label = gtk_label_new (_("File contents:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+ gtk_widget_set_sensitive (fmtchooser, FALSE);
- contents = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Info+header+data"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Header + data"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Data only"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (contents),
- sat_cfg_get_int (SAT_CFG_INT_PRED_SAVE_CONTENTS));
- gtk_table_attach_defaults (GTK_TABLE (table), contents, 1, 2, 3, 4);
-
- gtk_widget_show_all (table);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
-
+ /* file contents */
+ label = gtk_label_new (_("File contents:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
- /* run the dialog */
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ contents = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Info+header+data"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Header + data"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Data only"));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (contents),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_SAVE_CONTENTS));
+ gtk_table_attach_defaults (GTK_TABLE (table), contents, 1, 2, 3, 4);
- switch (response) {
+ gtk_widget_show_all (table);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
- /* user clicked the save button */
- case GTK_RESPONSE_ACCEPT:
- /* get file and directory */
- savedir = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dirchooser));
- savefile = g_strdup (gtk_entry_get_text (GTK_ENTRY (filchooser)));
- format = gtk_combo_box_get_active (GTK_COMBO_BOX (fmtchooser));
- cont = gtk_combo_box_get_active (GTK_COMBO_BOX (contents));
+ /* run the dialog */
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
- /* call saver */
- save_pass_exec (dialog, pass, qth, savedir, savefile, format, cont);
+ switch (response) {
- /* store new settings */
- sat_cfg_set_str (SAT_CFG_STR_PRED_SAVE_DIR, savedir);
- sat_cfg_set_int (SAT_CFG_INT_PRED_SAVE_FORMAT, format);
- sat_cfg_set_int (SAT_CFG_INT_PRED_SAVE_CONTENTS, cont);
+ /* user clicked the save button */
+ case GTK_RESPONSE_ACCEPT:
- /* clean up */
- g_free (savedir);
- g_free (savefile);
- break;
+ /* get file and directory */
+ savedir = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dirchooser));
+ savefile = g_strdup (gtk_entry_get_text (GTK_ENTRY (filchooser)));
+ format = gtk_combo_box_get_active (GTK_COMBO_BOX (fmtchooser));
+ cont = gtk_combo_box_get_active (GTK_COMBO_BOX (contents));
- /* cancel */
- default:
- break;
+ /* call saver */
+ save_pass_exec (dialog, pass, qth, savedir, savefile, format, cont);
- }
+ /* store new settings */
+ sat_cfg_set_str (SAT_CFG_STR_PRED_SAVE_DIR, savedir);
+ sat_cfg_set_int (SAT_CFG_INT_PRED_SAVE_FORMAT, format);
+ sat_cfg_set_int (SAT_CFG_INT_PRED_SAVE_CONTENTS, cont);
- gtk_widget_destroy (dialog);
+ /* clean up */
+ g_free (savedir);
+ g_free (savefile);
+ break;
+
+ /* cancel */
+ default:
+ break;
+
+ }
+
+ gtk_widget_destroy (dialog);
}
@@ -249,150 +249,150 @@
* \note All the relevant data are attached to the parent dialogue window.
*/
void
-save_passes (GtkWidget *parent)
+ save_passes (GtkWidget *parent)
{
- GtkWidget *dialog;
- GtkWidget *table;
- GtkWidget *dirchooser;
- GtkWidget *filchooser;
- GtkWidget *fmtchooser;
- GtkWidget *contents;
- GtkWidget *label;
- gint response;
- GSList *passes;
- gchar *sat;
- qth_t *qth;
- gchar *savedir = NULL;
- gchar *savefile;
- gint format;
- gint cont;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *dirchooser;
+ GtkWidget *filchooser;
+ GtkWidget *fmtchooser;
+ GtkWidget *contents;
+ GtkWidget *label;
+ gint response;
+ GSList *passes;
+ gchar *sat;
+ qth_t *qth;
+ gchar *savedir = NULL;
+ gchar *savefile;
+ gint format;
+ gint cont;
- /* get data attached to parent */
- sat = (gchar *) g_object_get_data (G_OBJECT (parent), "sat");
- qth = (qth_t *) g_object_get_data (G_OBJECT (parent), "qth");
- passes = (GSList *) g_object_get_data (G_OBJECT (parent), "passes");
+ /* get data attached to parent */
+ sat = (gchar *) g_object_get_data (G_OBJECT (parent), "sat");
+ qth = (qth_t *) g_object_get_data (G_OBJECT (parent), "qth");
+ passes = (GSList *) g_object_get_data (G_OBJECT (parent), "passes");
-
- /* create the dialog */
- dialog = gtk_dialog_new_with_buttons (_("Save Passes"), GTK_WINDOW (parent),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- GTK_STOCK_SAVE,
- GTK_RESPONSE_ACCEPT,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+ /* create the dialog */
+ dialog = gtk_dialog_new_with_buttons (_("Save Passes"), GTK_WINDOW (parent),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ GTK_STOCK_SAVE,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
- /* create the table */
- table = gtk_table_new (4, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 10);
- gtk_table_set_row_spacings (GTK_TABLE (table), 10);
- gtk_container_set_border_width (GTK_CONTAINER (table), 10);
- /* directory chooser */
- label = gtk_label_new (_("Save in folder:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+ /* create the table */
+ table = gtk_table_new (4, 2, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 10);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 10);
- dirchooser = gtk_file_chooser_button_new (_("Select a folder"),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- savedir = sat_cfg_get_str (SAT_CFG_STR_PRED_SAVE_DIR);
- if (savedir) {
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser), savedir);
- g_free (savedir);
- }
- else {
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser),
- g_get_home_dir ());
- }
- gtk_table_attach_defaults (GTK_TABLE (table), dirchooser, 1, 2, 0, 1);
+ /* directory chooser */
+ label = gtk_label_new (_("Save in folder:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
- /* file name */
- label = gtk_label_new (_("Save using file name:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+ dirchooser = gtk_file_chooser_button_new (_("Select a folder"),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ savedir = sat_cfg_get_str (SAT_CFG_STR_PRED_SAVE_DIR);
+ if (savedir) {
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser), savedir);
+ g_free (savedir);
+ }
+ else {
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dirchooser),
+ g_get_home_dir ());
+ }
+ gtk_table_attach_defaults (GTK_TABLE (table), dirchooser, 1, 2, 0, 1);
- filchooser = gtk_entry_new ();
- gtk_entry_set_max_length (GTK_ENTRY (filchooser), 100);
- g_signal_connect (filchooser, "changed", G_CALLBACK (file_changed), dialog);
- gtk_table_attach_defaults (GTK_TABLE (table), filchooser, 1, 2, 1, 2);
+ /* file name */
+ label = gtk_label_new (_("Save using file name:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
- /* use satellite name + orbit num as default; replace invalid characters
+ filchooser = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (filchooser), 100);
+ g_signal_connect (filchooser, "changed", G_CALLBACK (file_changed), dialog);
+ gtk_table_attach_defaults (GTK_TABLE (table), filchooser, 1, 2, 1, 2);
+
+ /* use satellite name + orbit num as default; replace invalid characters
with dash */
- savefile = g_strdup_printf ("%s-passes", sat);
- savefile = g_strdelimit (savefile, " ", '-');
- savefile = g_strdelimit (savefile, "!?/\()*&%$#@[]{}=+<>,.|:;", '_');
- gtk_entry_set_text (GTK_ENTRY (filchooser), savefile);
- g_free (savefile);
-
+ savefile = g_strdup_printf ("%s-passes", sat);
+ savefile = g_strdelimit (savefile, " ", '-');
+ savefile = g_strdelimit (savefile, "!?/\()*&%$#@[]{}=+<>,.|:;", '_');
+ gtk_entry_set_text (GTK_ENTRY (filchooser), savefile);
+ g_free (savefile);
- /* file format */
- label = gtk_label_new (_("Save as:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- fmtchooser = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Plain text (*.txt)"));
-/* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Hypertext (*.html)")); */
-/* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Docbook (*.xml)")); */
- gtk_combo_box_set_active (GTK_COMBO_BOX (fmtchooser),
- sat_cfg_get_int (SAT_CFG_INT_PRED_SAVE_FORMAT));
- gtk_table_attach_defaults (GTK_TABLE (table), fmtchooser, 1, 2, 2, 3);
+ /* file format */
+ label = gtk_label_new (_("Save as:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- gtk_widget_set_sensitive (fmtchooser, FALSE);
+ fmtchooser = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Plain text (*.txt)"));
+ /* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Hypertext (*.html)")); */
+ /* gtk_combo_box_append_text (GTK_COMBO_BOX (fmtchooser), _("Docbook (*.xml)")); */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (fmtchooser),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_SAVE_FORMAT));
+ gtk_table_attach_defaults (GTK_TABLE (table), fmtchooser, 1, 2, 2, 3);
- /* file contents */
- label = gtk_label_new (_("File contents:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+ gtk_widget_set_sensitive (fmtchooser, FALSE);
- contents = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Complete report"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Summary"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (contents), 0);
- gtk_table_attach_defaults (GTK_TABLE (table), contents, 1, 2, 3, 4);
-
- gtk_widget_show_all (table);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
-
+ /* file contents */
+ label = gtk_label_new (_("File contents:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
- /* run the dialog */
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ contents = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Complete report"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (contents), _("Summary"));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (contents), 0);
+ gtk_table_attach_defaults (GTK_TABLE (table), contents, 1, 2, 3, 4);
- switch (response) {
+ gtk_widget_show_all (table);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
- /* user clicked the save button */
- case GTK_RESPONSE_ACCEPT:
- /* get file and directory */
- savedir = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dirchooser));
- savefile = g_strdup (gtk_entry_get_text (GTK_ENTRY (filchooser)));
- format = gtk_combo_box_get_active (GTK_COMBO_BOX (fmtchooser));
- cont = gtk_combo_box_get_active (GTK_COMBO_BOX (contents));
+ /* run the dialog */
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
- /* call saver */
- save_passes_exec (dialog, passes, qth, savedir, savefile, format, cont);
+ switch (response) {
- /* store new settings */
- sat_cfg_set_str (SAT_CFG_STR_PRED_SAVE_DIR, savedir);
- sat_cfg_set_int (SAT_CFG_INT_PRED_SAVE_FORMAT, format);
+ /* user clicked the save button */
+ case GTK_RESPONSE_ACCEPT:
- /* clean up */
- g_free (savedir);
- g_free (savefile);
- break;
+ /* get file and directory */
+ savedir = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dirchooser));
+ savefile = g_strdup (gtk_entry_get_text (GTK_ENTRY (filchooser)));
+ format = gtk_combo_box_get_active (GTK_COMBO_BOX (fmtchooser));
+ cont = gtk_combo_box_get_active (GTK_COMBO_BOX (contents));
- /* cancel */
- default:
- break;
+ /* call saver */
+ save_passes_exec (dialog, passes, qth, savedir, savefile, format, cont);
- }
+ /* store new settings */
+ sat_cfg_set_str (SAT_CFG_STR_PRED_SAVE_DIR, savedir);
+ sat_cfg_set_int (SAT_CFG_INT_PRED_SAVE_FORMAT, format);
- gtk_widget_destroy (dialog);
+ /* clean up */
+ g_free (savedir);
+ g_free (savefile);
+ break;
+ /* cancel */
+ default:
+ break;
+
+ }
+
+ gtk_widget_destroy (dialog);
+
}
@@ -408,51 +408,51 @@
* of the current file name.
*/
static void
-file_changed (GtkWidget *widget, gpointer data)
+ file_changed (GtkWidget *widget, gpointer data)
{
- gchar *entry, *end, *j;
- gint len, pos;
- const gchar *text;
- GtkWidget *dialog = GTK_WIDGET (data);
+ gchar *entry, *end, *j;
+ gint len, pos;
+ const gchar *text;
+ GtkWidget *dialog = GTK_WIDGET (data);
- /* ensure that only valid characters are entered
+ /* ensure that only valid characters are entered
(stolen from xlog, tnx pg4i)
*/
- entry = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
- if ((len = g_utf8_strlen (entry, -1)) > 0) {
- end = entry + g_utf8_strlen (entry, -1);
- for (j = entry; j < end; ++j) {
- switch (*j) {
- case '0' ... '9':
- case 'a' ... 'z':
- case 'A' ... 'Z':
- case '-':
- case '_':
- break;
- default:
- gdk_beep ();
- pos = gtk_editable_get_position (GTK_EDITABLE (widget));
- gtk_editable_delete_text (GTK_EDITABLE (widget),
- pos, pos+1);
- break;
- }
- }
- }
+ entry = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
+ if ((len = g_utf8_strlen (entry, -1)) > 0) {
+ end = entry + g_utf8_strlen (entry, -1);
+ for (j = entry; j < end; ++j) {
+ switch (*j) {
+ case '0' ... '9':
+ case 'a' ... 'z':
+ case 'A' ... 'Z':
+ case '-':
+ case '_':
+ break;
+ default:
+ gdk_beep ();
+ pos = gtk_editable_get_position (GTK_EDITABLE (widget));
+ gtk_editable_delete_text (GTK_EDITABLE (widget),
+ pos, pos+1);
+ break;
+ }
+ }
+ }
- /* step 2: if name seems all right, enable OK button */
- text = gtk_entry_get_text (GTK_ENTRY (widget));
+ /* step 2: if name seems all right, enable OK button */
+ text = gtk_entry_get_text (GTK_ENTRY (widget));
- if (g_utf8_strlen (text, -1) > 0) {
- gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
- GTK_RESPONSE_ACCEPT,
- TRUE);
- }
- else {
- gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
- GTK_RESPONSE_ACCEPT,
- FALSE);
- }
+ if (g_utf8_strlen (text, -1) > 0) {
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+ GTK_RESPONSE_ACCEPT,
+ TRUE);
+ }
+ else {
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+ GTK_RESPONSE_ACCEPT,
+ FALSE);
+ }
}
/** \brief Save data to file.
@@ -473,76 +473,76 @@
* file format.
*/
static void
-save_passes_exec (GtkWidget *parent,
- GSList *passes, qth_t *qth,
- const gchar *savedir, const gchar *savefile,
- gint format, gint contents)
+ save_passes_exec (GtkWidget *parent,
+ GSList *passes, qth_t *qth,
+ const gchar *savedir, const gchar *savefile,
+ gint format, gint contents)
{
- gchar *fname;
- gchar *pgheader;
- gchar *tblheader;
- gchar *tblcontents;
- gchar *buff = NULL;
- gchar *data = NULL;
- pass_t *pass;
- gint fields;
- guint i,n;
+ gchar *fname;
+ gchar *pgheader;
+ gchar *tblheader;
+ gchar *tblcontents;
+ gchar *buff = NULL;
+ gchar *data = NULL;
+ pass_t *pass;
+ gint fields;
+ guint i,n;
- switch (format) {
+ switch (format) {
- case SAVE_FORMAT_TXT:
+ case SAVE_FORMAT_TXT:
- /* prepare full file name */
- fname = g_strconcat (savedir, G_DIR_SEPARATOR_S, savefile, ".txt", NULL);
+ /* prepare full file name */
+ fname = g_strconcat (savedir, G_DIR_SEPARATOR_S, savefile, ".txt", NULL);
- /* get visible columns for summary */
- fields = sat_cfg_get_int (SAT_CFG_INT_PRED_MULTI_COL);
+ /* get visible columns for summary */
+ fields = sat_cfg_get_int (SAT_CFG_INT_PRED_MULTI_COL);
- /* create file contents */
- pgheader = passes_to_txt_pgheader (passes, qth, fields);
- tblheader = passes_to_txt_tblheader (passes, qth, fields);
- tblcontents = passes_to_txt_tblcontents (passes, qth, fields);
+ /* create file contents */
+ pgheader = passes_to_txt_pgheader (passes, qth, fields);
+ tblheader = passes_to_txt_tblheader (passes, qth, fields);
+ tblcontents = passes_to_txt_tblcontents (passes, qth, fields);
- data = g_strconcat (pgheader, tblheader, tblcontents, NULL);
+ data = g_strconcat (pgheader, tblheader, tblcontents, NULL);
- g_free (pgheader);
- g_free (tblheader);
- g_free (tblcontents);
+ g_free (pgheader);
+ g_free (tblheader);
+ g_free (tblcontents);
- if (contents == PASSES_CONTENT_FULL) {
- fields = sat_cfg_get_int (SAT_CFG_INT_PRED_SINGLE_COL);
- n = g_slist_length (passes);
- for (i = 0; i < n; i++) {
+ if (contents == PASSES_CONTENT_FULL) {
+ fields = sat_cfg_get_int (SAT_CFG_INT_PRED_SINGLE_COL);
+ n = g_slist_length (passes);
+ for (i = 0; i < n; i++) {
- pass = PASS (g_slist_nth_data (passes, i));
+ pass = PASS (g_slist_nth_data (passes, i));
- tblheader = pass_to_txt_tblheader (pass, qth, fields);
- tblcontents = pass_to_txt_tblcontents (pass, qth, fields);
- buff = g_strdup_printf ("%s\n Orbit %d\n%s%s",
- data, pass->orbit,
- tblheader, tblcontents);
- g_free (data);
- data = g_strdup (buff);
- g_free (buff);
+ tblheader = pass_to_txt_tblheader (pass, qth, fields);
+ tblcontents = pass_to_txt_tblcontents (pass, qth, fields);
+ buff = g_strdup_printf ("%s\n Orbit %d\n%s%s",
+ data, pass->orbit,
+ tblheader, tblcontents);
+ g_free (data);
+ data = g_strdup (buff);
+ g_free (buff);
- }
- }
+ }
+ }
- /* save data */
- save_to_file (parent, fname, data);
- g_free (data);
- g_free (fname);
-
- break;
+ /* save data */
+ save_to_file (parent, fname, data);
+ g_free (data);
+ g_free (fname);
+ break;
+
default:
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Invalid file format: %d"),
- __FUNCTION__, format);
- break;
- }
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Invalid file format: %d"),
+ __FUNCTION__, format);
+ break;
+ }
}
@@ -567,84 +567,84 @@
* file format.
*/
static void
-save_pass_exec (GtkWidget *parent,
- pass_t *pass, qth_t *qth,
- const gchar *savedir, const gchar *savefile,
- gint format, gint contents)
+ save_pass_exec (GtkWidget *parent,
+ pass_t *pass, qth_t *qth,
+ const gchar *savedir, const gchar *savefile,
+ gint format, gint contents)
{
- gchar *fname;
- gchar *pgheader;
- gchar *tblheader;
- gchar *tblcontents;
- gchar *buff = NULL;
- gchar *data = NULL;
- gint fields;
+ gchar *fname;
+ gchar *pgheader;
+ gchar *tblheader;
+ gchar *tblcontents;
+ gchar *buff = NULL;
+ gchar *data = NULL;
+ gint fields;
- switch (format) {
+ switch (format) {
- case SAVE_FORMAT_TXT:
+ case SAVE_FORMAT_TXT:
- /* prepare full file name */
- fname = g_strconcat (savedir, G_DIR_SEPARATOR_S, savefile, ".txt", NULL);
+ /* prepare full file name */
+ fname = g_strconcat (savedir, G_DIR_SEPARATOR_S, savefile, ".txt", NULL);
- /* get visible columns */
- fields = sat_cfg_get_int (SAT_CFG_INT_PRED_SINGLE_COL);
+ /* get visible columns */
+ fields = sat_cfg_get_int (SAT_CFG_INT_PRED_SINGLE_COL);
- /* create file contents */
- pgheader = pass_to_txt_pgheader (pass, qth, fields);
- tblheader = pass_to_txt_tblheader (pass, qth, fields);
- tblcontents = pass_to_txt_tblcontents (pass, qth, fields);
+ /* create file contents */
+ pgheader = pass_to_txt_pgheader (pass, qth, fields);
+ tblheader = pass_to_txt_tblheader (pass, qth, fields);
+ tblcontents = pass_to_txt_tblcontents (pass, qth, fields);
- /* Add page header if selected */
- if (contents == PASS_CONTENT_ALL) {
- data = g_strdup (pgheader);
- }
+ /* Add page header if selected */
+ if (contents == PASS_CONTENT_ALL) {
+ data = g_strdup (pgheader);
+ }
- /* Add table header if selected */
- if ((contents == PASS_CONTENT_ALL) || (contents == PASS_CONTENT_TABLE)) {
+ /* Add table header if selected */
+ if ((contents == PASS_CONTENT_ALL) || (contents == PASS_CONTENT_TABLE)) {
- if (data != NULL) {
- buff = g_strdup (data);
- g_free (data);
- data = g_strconcat (buff, tblheader, NULL);
- g_free (buff);
- }
- else {
- data = g_strdup (tblheader);
- }
+ if (data != NULL) {
+ buff = g_strdup (data);
+ g_free (data);
+ data = g_strconcat (buff, tblheader, NULL);
+ g_free (buff);
+ }
+ else {
+ data = g_strdup (tblheader);
+ }
- }
+ }
- /* Add data */
- if (data != NULL) {
- buff = g_strdup (data);
- g_free (data);
- data = g_strconcat (buff, tblcontents, NULL);
- g_free (buff);
- }
- else {
- data = g_strdup (tblcontents);
- }
+ /* Add data */
+ if (data != NULL) {
+ buff = g_strdup (data);
+ g_free (data);
+ data = g_strconcat (buff, tblcontents, NULL);
+ g_free (buff);
+ }
+ else {
+ data = g_strdup (tblcontents);
+ }
- /* save data */
- save_to_file (parent, fname, data);
+ /* save data */
+ save_to_file (parent, fname, data);
- /* clean up memory */
- g_free (fname);
- g_free (data);
- g_free (pgheader);
- g_free (tblheader);
- g_free (tblcontents);
-
- break;
+ /* clean up memory */
+ g_free (fname);
+ g_free (data);
+ g_free (pgheader);
+ g_free (tblheader);
+ g_free (tblcontents);
+ break;
+
default:
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Invalid file format: %d"),
- __FUNCTION__, format);
- break;
- }
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Invalid file format: %d"),
+ __FUNCTION__, format);
+ break;
+ }
}
@@ -652,65 +652,65 @@
static void
-save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data)
+ save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data)
{
- GIOChannel *chan;
- GError *err = NULL;
- GtkWidget *dialog;
- gsize count;
+ GIOChannel *chan;
+ GError *err = NULL;
+ GtkWidget *dialog;
+ gsize count;
- /* create file */
- chan = g_io_channel_new_file (fname, "w", &err);
- if (err != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create file %s (%s)"),
- __FUNCTION__, fname, err->message);
-
- /* error dialog */
- dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("Could not create file %s\n\n%s"),
- fname, err->message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-
- /* clean up and return */
- g_clear_error (&err);
-
- return;
- }
+ /* create file */
+ chan = g_io_channel_new_file (fname, "w", &err);
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create file %s (%s)"),
+ __FUNCTION__, fname, err->message);
- /* save contents to file */
- g_io_channel_write_chars (chan, data, -1, &count, &err);
- if (err != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: An error occurred while saving data to %s (%s)"),
- __FUNCTION__, fname, err->message);
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("An error occurred while saving data to %s\n\n%s"),
- fname, err->message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- g_clear_error (&err);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Written %d characters to %s"),
- __FUNCTION__, count, fname);
- }
-
- /* close file, we don't care about errors here */
- g_io_channel_shutdown (chan, TRUE, NULL);
- g_io_channel_unref (chan);
-
+ /* error dialog */
+ dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("Could not create file %s\n\n%s"),
+ fname, err->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ /* clean up and return */
+ g_clear_error (&err);
+
+ return;
+ }
+
+ /* save contents to file */
+ g_io_channel_write_chars (chan, data, -1, &count, &err);
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: An error occurred while saving data to %s (%s)"),
+ __FUNCTION__, fname, err->message);
+
+ dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("An error occurred while saving data to %s\n\n%s"),
+ fname, err->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_clear_error (&err);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Written %d characters to %s"),
+ __FUNCTION__, count, fname);
+ }
+
+ /* close file, we don't care about errors here */
+ g_io_channel_shutdown (chan, TRUE, NULL);
+ g_io_channel_unref (chan);
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-27 01:27:56
|
Revision: 560
http://gpredict.svn.sourceforge.net/gpredict/?rev=560&view=rev
Author: csete
Date: 2009-12-27 00:17:34 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Fixed indentation.
Modified Paths:
--------------
trunk/src/sat-pass-dialogs.c
trunk/src/save-pass.c
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2009-12-27 00:12:09 UTC (rev 559)
+++ trunk/src/sat-pass-dialogs.c 2009-12-27 00:17:34 UTC (rev 560)
@@ -265,8 +265,7 @@
* of fullscreen modules.
*
*/
-void
- show_pass (const gchar *satname, qth_t *qth, pass_t *pass, GtkWidget *toplevel)
+void show_pass (const gchar *satname, qth_t *qth, pass_t *pass, GtkWidget *toplevel)
{
GtkWidget *dialog; /* the dialogue window */
GtkWidget *notebook; /* the notebook widet */
@@ -538,8 +537,7 @@
* Use sat, qth, and passes labels to obtain the relevant data
*
*/
-static void
- single_pass_response (GtkWidget *dialog, gint response, gpointer data)
+static void single_pass_response (GtkWidget *dialog, gint response, gpointer data)
{
switch (response) {
@@ -564,10 +562,9 @@
/** \brief Set cell renderer function. */
-static void
- check_and_set_single_cell_renderer (GtkTreeViewColumn *column,
- GtkCellRenderer *renderer,
- gint i)
+static void check_and_set_single_cell_renderer (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ gint i)
{
switch (i) {
@@ -660,12 +657,11 @@
displayed (rendered), the tree_store will still contain the
original flaoting point numbers. Very cool!
*/
-static void
- latlon_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void latlon_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number = 0.0;
gchar *buff;
@@ -717,12 +713,11 @@
/* general floats with 2 digits + degree char */
-static void
- degree_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void degree_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -741,12 +736,11 @@
/* distance and velocity, 0 decimal digits */
-static void
- distance_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void distance_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -770,12 +764,11 @@
/* range rate is special, because we may need to convert to miles
and want 2-3 decimal digits.
*/
-static void
- range_rate_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void range_rate_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -797,12 +790,11 @@
}
/* 0 decimal digits */
-static void
- float_to_int_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void float_to_int_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -819,12 +811,11 @@
}
/* 2 decimal digits */
-static void
- two_dec_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void two_dec_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -842,12 +833,11 @@
/* AOS/LOS; convert julian date to string */
-static void
- time_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void time_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar buff[TIME_FORMAT_MAX_LENGTH];
@@ -898,15 +888,13 @@
-static gint
- single_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
+static gint single_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
{
/* dialog will be destroyed */
return FALSE;
}
-static void
- single_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
+static void single_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
{
pass_t *pass = PASS(g_object_get_data (G_OBJECT (dialog), "pass"));
@@ -917,9 +905,8 @@
/*** FIXME: formalise with other copies */
-static void
- Calc_RADec (gdouble jul_utc, gdouble saz, gdouble sel,
- qth_t *qth, obs_astro_t *obs_set)
+static void Calc_RADec (gdouble jul_utc, gdouble saz, gdouble sel,
+ qth_t *qth, obs_astro_t *obs_set)
{
double phi,theta,sin_theta,cos_theta,sin_phi,cos_phi,
@@ -978,8 +965,7 @@
* details of a pass.
*
*/
-void
- show_passes (const gchar *satname, qth_t *qth, GSList *passes, GtkWidget *toplevel)
+void show_passes (const gchar *satname, qth_t *qth, GSList *passes, GtkWidget *toplevel)
{
GtkWidget *dialog;
GtkWidget *list;
@@ -1151,8 +1137,7 @@
* Use sat, qth, and passes labels to obtain the relevant data
*
*/
-static void
- multi_pass_response (GtkWidget *dialog, gint response, gpointer data)
+static void multi_pass_response (GtkWidget *dialog, gint response, gpointer data)
{
switch (response) {
@@ -1175,16 +1160,14 @@
-static gint
- multi_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
+static gint multi_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
{
/* dialog will be destroyed */
return FALSE;
}
-static void
- multi_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
+static void multi_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
{
GSList *passes = (GSList *) g_object_get_data (G_OBJECT (dialog), "passes");
@@ -1196,10 +1179,9 @@
/** \brief Set cell renderer function. */
-static void
- check_and_set_multi_cell_renderer (GtkTreeViewColumn *column,
- GtkCellRenderer *renderer,
- gint i)
+static void check_and_set_multi_cell_renderer (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ gint i)
{
switch (i) {
@@ -1246,12 +1228,11 @@
/* duration; convert delta t in days to HH:MM:SS */
-static void
- duration_cell_data_function (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
+static void duration_cell_data_function (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
{
gdouble number;
gchar *buff;
@@ -1323,8 +1304,7 @@
* usually happens if the user presses SHJIFT-F10? It is used as a wrapper
* for the function that actually creates the popup menu.
*/
-static gboolean
- popup_menu_cb (GtkWidget *treeview, gpointer data)
+static gboolean popup_menu_cb (GtkWidget *treeview, gpointer data)
{
/* if there is no selection, select the first row */
@@ -1342,8 +1322,7 @@
* \param list Pointer to the GtkSatList widget.
*
*/
-static gboolean
- button_press_cb (GtkWidget *treeview, GdkEventButton *event, gpointer data)
+static gboolean button_press_cb (GtkWidget *treeview, GdkEventButton *event, gpointer data)
{
/* single click with the right mouse button? */
@@ -1384,8 +1363,7 @@
}
-static void
- view_popup_menu (GtkWidget *treeview, GdkEventButton *event, gpointer data)
+static void view_popup_menu (GtkWidget *treeview, GdkEventButton *event, gpointer data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
Modified: trunk/src/save-pass.c
===================================================================
--- trunk/src/save-pass.c 2009-12-27 00:12:09 UTC (rev 559)
+++ trunk/src/save-pass.c 2009-12-27 00:17:34 UTC (rev 560)
@@ -84,8 +84,7 @@
*
* \note All the relevant data are attached to the parent dialogue window.
*/
-void
- save_pass (GtkWidget *parent)
+void save_pass (GtkWidget *parent)
{
GtkWidget *dialog;
GtkWidget *table;
@@ -248,8 +247,7 @@
*
* \note All the relevant data are attached to the parent dialogue window.
*/
-void
- save_passes (GtkWidget *parent)
+void save_passes (GtkWidget *parent)
{
GtkWidget *dialog;
GtkWidget *table;
@@ -407,8 +405,7 @@
* The function sets the state of the Save button according to the validity
* of the current file name.
*/
-static void
- file_changed (GtkWidget *widget, gpointer data)
+static void file_changed (GtkWidget *widget, gpointer data)
{
gchar *entry, *end, *j;
gint len, pos;
@@ -472,11 +469,10 @@
* \note The formatting is done by external functions according to the selected
* file format.
*/
-static void
- save_passes_exec (GtkWidget *parent,
- GSList *passes, qth_t *qth,
- const gchar *savedir, const gchar *savefile,
- gint format, gint contents)
+static void save_passes_exec (GtkWidget *parent,
+ GSList *passes, qth_t *qth,
+ const gchar *savedir, const gchar *savefile,
+ gint format, gint contents)
{
gchar *fname;
gchar *pgheader;
@@ -566,11 +562,10 @@
* \note The formatting is done by external functions according to the selected
* file format.
*/
-static void
- save_pass_exec (GtkWidget *parent,
- pass_t *pass, qth_t *qth,
- const gchar *savedir, const gchar *savefile,
- gint format, gint contents)
+static void save_pass_exec (GtkWidget *parent,
+ pass_t *pass, qth_t *qth,
+ const gchar *savedir, const gchar *savefile,
+ gint format, gint contents)
{
gchar *fname;
gchar *pgheader;
@@ -651,8 +646,7 @@
-static void
- save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data)
+static void save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data)
{
GIOChannel *chan;
GError *err = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-27 01:01:22
|
Revision: 562
http://gpredict.svn.sourceforge.net/gpredict/?rev=562&view=rev
Author: csete
Date: 2009-12-27 01:01:15 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-27 01:00:53 UTC (rev 561)
+++ trunk/ChangeLog 2009-12-27 01:01:15 UTC (rev 562)
@@ -1,3 +1,12 @@
+2009-12-26 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/sat-pref-layout.c:
+ Finished implementation of layout selector.
+
+ * src/pass-to-txt.c:
+ Fixed bug 2914679: Unable to save Future passes.
+
+
2009-12-25 Alexandru Csete <oz9aec at gmail.com>
* pixmaps/icons:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-12-27 01:00:53 UTC (rev 561)
+++ trunk/NEWS 2009-12-27 01:01:15 UTC (rev 562)
@@ -2,14 +2,15 @@
* New satellite editor to manually add/edit/delete satellite data.
* New transponder editor to edit transponder data.
-* New layout engine that allows any combination of views to be created in a NxM grid.
- Closes feature request TBD.
+- New layout engine that allows any combination of views to be created in a NxM grid.
+ Closes feature request 2821408.
* Feature request 2866570: Set operating mode via CAT.
* Feature request 2873824: Flip Passes.
* Feature request 2778735: Visual indicator for RX/TX/TRX.
* Feature request 2689352: Mutual Contact Window AOS/LOS.
- Fixed bug 2877974: Incorrect uplink Doppler.
- Fixed bug 2918672: Trailing whitespace and newline in satellite names.
+- Fixed bug 2914679: Unable to save Future passes.
- Applied patch 2876485: Fix a memory leak in the rotator controller (Thanks to Charles Suprin AA1VS).
- Applied patch 2877878: Change Flag to Lock in tle-update (thanks to Charles Suprin AA1VS).
- Applied patch 2877918: Fixes segfault in TLE updater (thanks to Charles Suprin AA1VS).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-27 01:00:59
|
Revision: 561
http://gpredict.svn.sourceforge.net/gpredict/?rev=561&view=rev
Author: csete
Date: 2009-12-27 01:00:53 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Fixed bug 2914679: Unable to save Future passes.
Modified Paths:
--------------
trunk/src/pass-to-txt.c
trunk/src/save-pass.c
Modified: trunk/src/pass-to-txt.c
===================================================================
--- trunk/src/pass-to-txt.c 2009-12-27 00:17:34 UTC (rev 560)
+++ trunk/src/pass-to-txt.c 2009-12-27 01:00:53 UTC (rev 561)
@@ -599,6 +599,8 @@
/* size > TIME_FORMAT_MAX_LENGTH */
tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
+ line = g_strdup_printf (" %s", tbuff);
+
/* TCA */
t = (pass->tca - 2440587.5)*86400.;
if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
Modified: trunk/src/save-pass.c
===================================================================
--- trunk/src/save-pass.c 2009-12-27 00:17:34 UTC (rev 560)
+++ trunk/src/save-pass.c 2009-12-27 01:00:53 UTC (rev 561)
@@ -506,10 +506,10 @@
g_free (tblheader);
g_free (tblcontents);
-
if (contents == PASSES_CONTENT_FULL) {
fields = sat_cfg_get_int (SAT_CFG_INT_PRED_SINGLE_COL);
n = g_slist_length (passes);
+
for (i = 0; i < n; i++) {
pass = PASS (g_slist_nth_data (passes, i));
@@ -533,7 +533,7 @@
break;
- default:
+ default:
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s: Invalid file format: %d"),
__FUNCTION__, format);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-26 23:03:54
|
Revision: 558
http://gpredict.svn.sourceforge.net/gpredict/?rev=558&view=rev
Author: csete
Date: 2009-12-26 23:03:45 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Fixed error in linear transponder downlink.
Modified Paths:
--------------
trunk/data/trsp/36122.trsp
Modified: trunk/data/trsp/36122.trsp
===================================================================
--- trunk/data/trsp/36122.trsp 2009-12-26 22:59:27 UTC (rev 557)
+++ trunk/data/trsp/36122.trsp 2009-12-26 23:03:45 UTC (rev 558)
@@ -9,8 +9,8 @@
PL=67
[Mode V/U Linear]
-DOWN_LOW=435765000
-DOWN_HIGH=435715000
+DOWN_HIGH=435765000
+DOWN_LOW=435715000
UP_LOW=145925000
UP_HIGH=145975000
INVERT=true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-26 22:59:37
|
Revision: 557
http://gpredict.svn.sourceforge.net/gpredict/?rev=557&view=rev
Author: csete
Date: 2009-12-26 22:59:27 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/po/en_GB.po
trunk/po/en_US.po
trunk/po/fr.po
trunk/po/gpredict.pot
Modified: trunk/po/en_GB.po
===================================================================
--- trunk/po/en_GB.po 2009-12-26 22:57:52 UTC (rev 556)
+++ trunk/po/en_GB.po 2009-12-26 22:59:27 UTC (rev 557)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-07 00:28+0100\n"
+"POT-Creation-Date: 2009-12-26 23:58+0100\n"
"PO-Revision-Date: 2009-08-05 00:53+0100\n"
"Last-Translator: Michael Stephenson <mic...@go...>\n"
"Language-Team: British English\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/about.c:64
+#: ../src/about.c:65
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
"Contact: oz9aec at googlemail.com\n"
@@ -68,12 +68,12 @@
#. window title
#. icon file name
#. create window title and file name for window icon
-#: ../src/about.c:96 ../src/main.c:221 ../src/sat-log-browser.c:462
+#: ../src/about.c:97 ../src/main.c:221 ../src/sat-log-browser.c:462
#: ../src/sat-log.c:58
msgid "GPREDICT"
msgstr "GPREDICT"
-#: ../src/about.c:99
+#: ../src/about.c:100
#, fuzzy
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
@@ -84,7 +84,7 @@
"\n"
"Gpredict is available free of charge from:"
-#: ../src/about.c:116
+#: ../src/about.c:117
msgid "translator-credits"
msgstr "Michael Stephenson"
@@ -384,11 +384,13 @@
msgstr "%s:%d: Can not find clicked object (%d) in hash table"
#. next pass and predict passes
+#. Show next pass
#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97
-#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:837
+#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:836
msgid "Show next pass"
msgstr "Show next pass"
+#. Show future passes
#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108
#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851
msgid "Future passes"
@@ -402,7 +404,7 @@
#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474
#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246
#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376
-#: ../src/gtk-single-sat.c:1054 ../src/gtk-single-sat.c:1125
+#: ../src/gtk-single-sat.c:1049 ../src/gtk-single-sat.c:1120
#, c-format
msgid ""
"Satellite %s has no passes\n"
@@ -412,7 +414,7 @@
"within the next %d days"
#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192
-#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1070
+#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1065
#, c-format
msgid ""
"Satellite %s has no passes for\n"
@@ -430,7 +432,7 @@
"never comes above the horizon"
#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265
-#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1144
+#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1139
#, c-format
msgid ""
"Satellite %s has no passes for\n"
@@ -900,7 +902,7 @@
msgstr "%s:%d: Failed to load rotator configuration %s"
#: ../src/gtk-rot-ctrl.c:866 ../src/gtk-rot-ctrl.c:867
-#: ../src/gtk-sat-module-popup.c:894 ../src/gtk-sat-module-popup.c:967
+#: ../src/gtk-sat-module-popup.c:841 ../src/gtk-sat-module-popup.c:914
#: ../src/qth-data.c:94 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718
msgid "ERROR"
msgstr "ERROR"
@@ -1266,105 +1268,108 @@
msgid "Set Target"
msgstr "Set Target"
-#: ../src/gtk-sat-module.c:256
+#: ../src/gtk-sat-module.c:257
#, c-format
msgid "%s: Module %s is not valid."
msgstr "%s: Module %s is not valid."
-#: ../src/gtk-sat-module.c:299
+#: ../src/gtk-sat-module.c:300
msgid "Module options / shortcuts"
msgstr "Module options / shortcuts"
-#: ../src/gtk-sat-module.c:305
+#: ../src/gtk-sat-module.c:306
msgid "Close this module."
msgstr "Close this module."
-#: ../src/gtk-sat-module.c:439
+#: ../src/gtk-sat-module.c:375
#, c-format
-msgid "%s:%d: Invalid module layout (%d)"
-msgstr "%s:%d: Invalid module layout (%d)"
+msgid "%s: Layout has %d columns and %d rows."
+msgstr ""
-#: ../src/gtk-sat-module.c:466
-#, c-format
-msgid "%s:%d: Invalid child number (%d)"
-msgstr "%s:%d: Invalid child number (%d)"
-
-#: ../src/gtk-sat-module.c:503
-#, c-format
-msgid ""
-"%s:%d: Invalid child type (%d)\n"
-"Using GtkSatList..."
+#: ../src/gtk-sat-module.c:447
+#, fuzzy, c-format
+msgid "%s:%d: Invalid child type (%d). Using GtkSatList."
msgstr ""
"%s:%d: Invalid child type (%d)\n"
"Using GtkSatList..."
-#: ../src/gtk-sat-module.c:543
+#: ../src/gtk-sat-module.c:488
#, c-format
msgid "%s: Could not load config data from %s (%s)."
msgstr "%s: Could not load config data from %s (%s)."
-#: ../src/gtk-sat-module.c:553
+#: ../src/gtk-sat-module.c:498
#, c-format
msgid "%s: Reading configuration from %s"
msgstr "%s: Reading configuration from %s"
-#: ../src/gtk-sat-module.c:595
+#: ../src/gtk-sat-module.c:540
#, c-format
msgid "%s: Can not load default QTH file %s; using built-in defaults"
msgstr "%s: Can not load default QTH file %s; using built-in defaults"
#. settings are really screwed up; we need some safe values here
-#: ../src/gtk-sat-module.c:599 ../src/gtk-sat-module.c:600
+#: ../src/gtk-sat-module.c:544 ../src/gtk-sat-module.c:545
msgid "Error"
msgstr "Error"
-#: ../src/gtk-sat-module.c:670 ../src/mod-cfg.c:673
+#: ../src/gtk-sat-module.c:575
+#, fuzzy, c-format
+msgid "%s: Module layout is invalid: %s. Using default."
+msgstr "%s: Module has no QTH; use default."
+
+#: ../src/gtk-sat-module.c:587
+#, fuzzy, c-format
+msgid "%s: GRID(%d): %s"
+msgstr "%s:%d: Read %s"
+
+#: ../src/gtk-sat-module.c:632 ../src/mod-cfg.c:673
#, c-format
msgid "%s: Failed to get list of satellites (%s)"
msgstr "%s: Failed to get list of satellites (%s)"
-#: ../src/gtk-sat-module.c:692
+#: ../src/gtk-sat-module.c:654
#, c-format
msgid "%s: Error reading data for #%d"
msgstr "%s: Error reading data for #%d"
-#: ../src/gtk-sat-module.c:716
+#: ../src/gtk-sat-module.c:678
#, c-format
msgid "%s: Read data for #%d"
msgstr "%s: Read data for #%d"
-#: ../src/gtk-sat-module.c:723
+#: ../src/gtk-sat-module.c:685
#, c-format
msgid "%s: Sat #%d already in list"
msgstr "%s: Sat #%d already in list"
-#: ../src/gtk-sat-module.c:734
+#: ../src/gtk-sat-module.c:696
#, c-format
msgid "%s: Read %d out of %d satellites"
msgstr "%s: Read %d out of %d satellites"
-#: ../src/gtk-sat-module.c:796
+#: ../src/gtk-sat-module.c:748
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr "%s: Previous cycle missed it's deadline."
-#: ../src/gtk-sat-module.c:910 ../src/gtk-sat-module.c:1541
+#: ../src/gtk-sat-module.c:864 ../src/gtk-sat-module.c:1397
#, c-format
msgid "%f:%d: Unknown child type"
msgstr "%f:%d: Unknown child type"
-#: ../src/gtk-sat-module.c:1070
+#: ../src/gtk-sat-module.c:1016
#, c-format
msgid "%s: Module %s recevied CLOSE signal."
msgstr "%s: Module %s recevied CLOSE signal."
-#: ../src/gtk-sat-module.c:1080
+#: ../src/gtk-sat-module.c:1026
#, c-format
msgid "%s: Module %s is in DOCKED state."
msgstr "%s: Module %s is in DOCKED state."
-#: ../src/gtk-sat-module.c:1087 ../src/gtk-sat-module.c:1103
-#: ../src/gtk-sat-module.c:1131
+#: ../src/gtk-sat-module.c:1033 ../src/gtk-sat-module.c:1049
+#: ../src/gtk-sat-module.c:1077
#, c-format
msgid ""
"%s: Module %s was not found in mod-mgr (%d)\n"
@@ -1373,32 +1378,32 @@
"%s: Module %s was not found in mod-mgr (%d)\n"
"Internal state is corrupt?"
-#: ../src/gtk-sat-module.c:1096
+#: ../src/gtk-sat-module.c:1042
#, c-format
msgid "%s: Module %s is in WINDOW state."
msgstr "%s: Module %s is in WINDOW state."
-#: ../src/gtk-sat-module.c:1124
+#: ../src/gtk-sat-module.c:1070
#, c-format
msgid "%s: Module %s is in FULLSCREEN state."
msgstr "%s: Module %s is in FULLSCREEN state."
-#: ../src/gtk-sat-module.c:1153 ../src/gtk-sat-module.c:1320
+#: ../src/gtk-sat-module.c:1099 ../src/gtk-sat-module.c:1258
#, c-format
msgid "%s: Module %s has unknown state: %d"
msgstr "%s: Module %s has unknown state: %d"
-#: ../src/gtk-sat-module.c:1162
+#: ../src/gtk-sat-module.c:1108
#, c-format
msgid "%s: Module %s closed."
msgstr "%s: Module %s closed."
-#: ../src/gtk-sat-module.c:1203
+#: ../src/gtk-sat-module.c:1148
#, c-format
msgid "%s: Module %s recevied CONFIG signal."
msgstr "%s: Module %s recevied CONFIG signal."
-#: ../src/gtk-sat-module.c:1212
+#: ../src/gtk-sat-module.c:1157
#, c-format
msgid ""
"%s: Could not stop timeout callback\n"
@@ -1407,12 +1412,12 @@
"%s: Could not stop timeout callback\n"
"%s: Source ID %d seems invalid."
-#: ../src/gtk-sat-module.c:1230
+#: ../src/gtk-sat-module.c:1175
#, c-format
msgid "%s: Module configuration failed for some reason."
msgstr "%s: Module configuration failed for some reason."
-#: ../src/gtk-sat-module.c:1488
+#: ../src/gtk-sat-module.c:1348
#, c-format
msgid "%s: Reloading satellites for module %s"
msgstr "%s: Reloading satellites for module %s"
@@ -1542,27 +1547,27 @@
msgid "%s:%d: Successfully cloned %s."
msgstr "%s:%d: Successfully cloned %s."
-#: ../src/gtk-sat-module-popup.c:463
+#: ../src/gtk-sat-module-popup.c:442
#, c-format
msgid "%s:%d: Cloning cancelled by user."
msgstr "%s:%d: Cloning cancelled by user."
-#: ../src/gtk-sat-module-popup.c:469
+#: ../src/gtk-sat-module-popup.c:448
#, c-format
msgid "%s:%d: Cloning interrupted."
msgstr "%s:%d: Cloning interrupted."
-#: ../src/gtk-sat-module-popup.c:656 ../src/gtk-sat-module-popup.c:799
+#: ../src/gtk-sat-module-popup.c:624 ../src/gtk-sat-module-popup.c:746
#, c-format
msgid "%s:%d: Unknown module state: %d"
msgstr "%s:%d: Unknown module state: %d"
-#: ../src/gtk-sat-module-popup.c:825
+#: ../src/gtk-sat-module-popup.c:772
#, c-format
msgid "The sky at a glance (%s)"
msgstr "The sky at a glance (%s)"
-#: ../src/gtk-sat-module-popup.c:889
+#: ../src/gtk-sat-module-popup.c:836
msgid ""
"You have no radio configuration!\n"
"Please configure a radio first."
@@ -1570,12 +1575,12 @@
"You have no radio configuration!\n"
"Please configure a radio first."
-#: ../src/gtk-sat-module-popup.c:902
+#: ../src/gtk-sat-module-popup.c:849
#, c-format
msgid "Gpredict Radio Control: %s"
msgstr "Gpredict Radio Control: %s"
-#: ../src/gtk-sat-module-popup.c:962
+#: ../src/gtk-sat-module-popup.c:909
msgid ""
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
@@ -1583,12 +1588,12 @@
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
-#: ../src/gtk-sat-module-popup.c:975
+#: ../src/gtk-sat-module-popup.c:922
#, c-format
msgid "Gpredict Rotator Control: %s"
msgstr "Gpredict Rotator Control: %s"
-#: ../src/gtk-sat-module-popup.c:1060
+#: ../src/gtk-sat-module-popup.c:1007
#, c-format
msgid ""
"This operation will permanently delete\n"
@@ -1601,12 +1606,12 @@
"from the disk.\n"
"Do you you want to proceed?"
-#: ../src/gtk-sat-module-popup.c:1070
+#: ../src/gtk-sat-module-popup.c:1017
#, c-format
msgid "%s:%d: Failed to delete %s."
msgstr "%s:%d: Failed to delete %s."
-#: ../src/gtk-sat-module-popup.c:1075
+#: ../src/gtk-sat-module-popup.c:1022
#, c-format
msgid "%s:%d: %s deleted permanently."
msgstr "%s:%d: %s deleted permanently."
@@ -1632,7 +1637,7 @@
#. reset button
#: ../src/gtk-sat-module-tmg.c:125 ../src/sat-pref-conditions.c:427
#: ../src/sat-pref-debug.c:141 ../src/sat-pref-formats.c:118
-#: ../src/sat-pref-layout.c:576 ../src/sat-pref-list-view.c:253
+#: ../src/sat-pref-layout.c:427 ../src/sat-pref-list-view.c:253
#: ../src/sat-pref-map-view.c:644 ../src/sat-pref-multi-pass.c:190
#: ../src/sat-pref-polar-view.c:627 ../src/sat-pref-refresh.c:419
#: ../src/sat-pref-single-pass.c:184 ../src/sat-pref-single-sat.c:222
@@ -1998,11 +2003,6 @@
msgid "%s:%d: Invalid field number (%d)"
msgstr "%s:%d: Invalid field number (%d)"
-#. select sat
-#: ../src/gtk-single-sat.c:908
-msgid "Select satellite"
-msgstr "Select satellite"
-
#. no satellites
#: ../src/gtk-sky-glance.c:238
#, fuzzy
@@ -2062,27 +2062,27 @@
msgid "%s: %s does not exist!"
msgstr "%s: %s does not exist!"
-#: ../src/loc-tree.c:445
+#: ../src/loc-tree.c:447
#, c-format
msgid "%s: Read %d cities."
msgstr "%s: Read %d cities."
-#: ../src/loc-tree.c:463
+#: ../src/loc-tree.c:465
#, c-format
msgid "%s: Failed to open locfile (%s)"
msgstr "%s: Failed to open locfile (%s)"
-#: ../src/loc-tree.c:522
+#: ../src/loc-tree.c:524
#, c-format
msgid "%s: Invalid column: %d"
msgstr "%s: Invalid column: %d"
-#: ../src/loc-tree.c:670
+#: ../src/loc-tree.c:672
#, c-format
msgid "%s: Failed to get parent for %s."
msgstr "%s: Failed to get parent for %s."
-#: ../src/loc-tree.c:684
+#: ../src/loc-tree.c:686
#, c-format
msgid "%s: No selection found!"
msgstr "%s: No selection found!"
@@ -2314,52 +2314,52 @@
msgid "Failed to build menubar: %s"
msgstr "Failed to build menubar: %s"
-#: ../src/menubar.c:272
+#: ../src/menubar.c:270
#, c-format
msgid "%s: Starting new module configurator..."
msgstr "%s: Starting new module configurator..."
-#: ../src/menubar.c:279
+#: ../src/menubar.c:277
#, c-format
msgid "%s: New module name is %s."
msgstr "%s: New module name is %s."
-#: ../src/menubar.c:299 ../src/menubar.c:367
+#: ../src/menubar.c:297 ../src/menubar.c:356
#, c-format
msgid "Could not open %s. Please examine the log messages for details."
msgstr "Could not open %s. Please examine the log messages for details."
-#: ../src/menubar.c:323
+#: ../src/menubar.c:313
#, c-format
msgid "%s: New module config cancelled."
msgstr "%s: New module config cancelled."
-#: ../src/menubar.c:340
+#: ../src/menubar.c:329
#, c-format
msgid "%s: Open existing module..."
msgstr "%s: Open existing module..."
-#: ../src/menubar.c:347
+#: ../src/menubar.c:336
#, c-format
msgid "%s: Open module %s."
msgstr "%s: Open module %s."
-#: ../src/menubar.c:405
+#: ../src/menubar.c:384
#, c-format
msgid "%s: Open module cancelled."
msgstr "%s: Open module cancelled."
#. create new dialog with progress indicator
-#: ../src/menubar.c:460 ../src/menubar.c:630 ../src/sat-pref-general.c:61
+#: ../src/menubar.c:439 ../src/menubar.c:609 ../src/sat-pref-general.c:61
msgid "TLE Update"
msgstr "TLE Update"
-#: ../src/menubar.c:481
+#: ../src/menubar.c:460
msgid "<b>Updating TLE files from network</b>"
msgstr "<b>Updating TLE files from network</b>"
#. statistics
-#: ../src/menubar.c:494 ../src/menubar.c:664
+#: ../src/menubar.c:473 ../src/menubar.c:643
msgid ""
"Satellites updated:\t 0\n"
"Satellites skipped:\t 0\n"
@@ -2369,56 +2369,56 @@
"Satellites skipped:\t 0\n"
"Missing Satellites:\t 0\n"
-#: ../src/menubar.c:520 ../src/menubar.c:690
+#: ../src/menubar.c:499 ../src/menubar.c:669
msgid "Finished"
msgstr "Finished"
#. create file chooser
-#: ../src/menubar.c:573
+#: ../src/menubar.c:552
msgid "Select directory"
msgstr "Select directory"
#. create label
-#: ../src/menubar.c:579
+#: ../src/menubar.c:558
msgid "Select TLE directory:"
msgstr "Select TLE directory:"
#. create the dalog
-#: ../src/menubar.c:588
+#: ../src/menubar.c:567
msgid "Update TLE from files"
msgstr "Update TLE from files"
-#: ../src/menubar.c:623
+#: ../src/menubar.c:602
#, c-format
msgid "%s: Running TLE update from %s"
msgstr "%s: Running TLE update from %s"
-#: ../src/menubar.c:650
+#: ../src/menubar.c:629
msgid "<b>Updating TLE files from files</b>"
msgstr "<b>Updating TLE files from files</b>"
-#: ../src/menubar.c:728 ../src/menubar.c:749
+#: ../src/menubar.c:707 ../src/menubar.c:728
msgid "This function is still under development."
msgstr "This function is still under development."
-#: ../src/menubar.c:776
+#: ../src/menubar.c:755
msgid ""
"A comprehensive PDF user manual and \n"
"video tutorials are available from the \n"
"Gpredict website:"
msgstr ""
-#: ../src/menubar.c:850
+#: ../src/menubar.c:829
#, c-format
msgid "%s:%s: Scanning directory %s for modules."
msgstr "%s:%s: Scanning directory %s for modules."
-#: ../src/menubar.c:873
+#: ../src/menubar.c:852
#, c-format
msgid "%s:%d: Failed to open module dir %s (%s)"
msgstr "%s:%d: Failed to open module dir %s (%s)"
-#: ../src/menubar.c:888
+#: ../src/menubar.c:867
msgid ""
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
@@ -2426,21 +2426,21 @@
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
-#: ../src/menubar.c:906
+#: ../src/menubar.c:885
msgid "Module"
msgstr "Module"
#. create dialog
-#: ../src/menubar.c:914
+#: ../src/menubar.c:893
msgid "Select a module"
msgstr "Select a module"
-#: ../src/menubar.c:941
+#: ../src/menubar.c:920
#, c-format
msgid "%s:%s: Selected module is: %s"
msgstr "%s:%s: Selected module is: %s"
-#: ../src/menubar.c:946
+#: ../src/menubar.c:925
#, c-format
msgid "%s:%s: No selection is list of modules."
msgstr "%s:%s: No selection is list of modules."
@@ -2483,22 +2483,22 @@
msgid "%s: Attempt to save NULL data."
msgstr "%s: Attempt to save NULL data."
-#: ../src/mod-cfg.c:343 ../src/sat-cfg.c:324
+#: ../src/mod-cfg.c:343 ../src/sat-cfg.c:325
#, c-format
msgid "%s: Could not create config data (%s)."
msgstr "%s: Could not create config data (%s)."
-#: ../src/mod-cfg.c:360 ../src/sat-cfg.c:341
+#: ../src/mod-cfg.c:360 ../src/sat-cfg.c:342
#, c-format
msgid "%s: Could not create config file (%s)."
msgstr "%s: Could not create config file (%s)."
-#: ../src/mod-cfg.c:379 ../src/sat-cfg.c:360
+#: ../src/mod-cfg.c:379 ../src/sat-cfg.c:361
#, c-format
msgid "%s: Error writing config data (%s)."
msgstr "%s: Error writing config data (%s)."
-#: ../src/mod-cfg.c:388 ../src/qth-data.c:341 ../src/sat-cfg.c:369
+#: ../src/mod-cfg.c:388 ../src/qth-data.c:341 ../src/sat-cfg.c:370
#, c-format
msgid "%s: Wrote only %d out of %d chars."
msgstr "%s: Wrote only %d out of %d chars."
@@ -2667,7 +2667,7 @@
msgid "%s: Saved states for %d modules."
msgstr "%s: Saved states for %d modules."
-#: ../src/mod-mgr.c:426 ../src/mod-mgr.c:495
+#: ../src/mod-mgr.c:426 ../src/mod-mgr.c:492
#, c-format
msgid "%s: Module %s not found in list. Trying to recover."
msgstr "%s: Module %s not found in list. Trying to recover."
@@ -2677,36 +2677,36 @@
msgid "%s: Module %s already in notebook!"
msgstr "%s: Module %s already in notebook!"
-#: ../src/mod-mgr.c:448
+#: ../src/mod-mgr.c:445
#, c-format
msgid "%s: Docked %s into notebook (page %d)"
msgstr "%s: Docked %s into notebook (page %d)"
-#: ../src/mod-mgr.c:503
+#: ../src/mod-mgr.c:500
#, c-format
msgid "%s: Module %s does not seem to be docked!"
msgstr "%s: Module %s does not seem to be docked!"
-#: ../src/mod-mgr.c:512
+#: ../src/mod-mgr.c:509
#, c-format
msgid "%s: Removed %s from notebook page %d."
msgstr "%s: Removed %s from notebook page %d."
-#: ../src/mod-mgr.c:546
+#: ../src/mod-mgr.c:543
msgid "GPREDICT: (none)"
msgstr "GPREDICT: (none)"
-#: ../src/mod-mgr.c:551 ../src/mod-mgr.c:568
+#: ../src/mod-mgr.c:548 ../src/mod-mgr.c:565
#, c-format
msgid "GPREDICT: %s"
msgstr "GPREDICT: %s"
-#: ../src/mod-mgr.c:586
+#: ../src/mod-mgr.c:583
#, c-format
msgid "%s: Attempt to reload sats but mod-mgr is NULL?"
msgstr "%s: Attempt to reload sats but mod-mgr is NULL?"
-#: ../src/mod-mgr.c:595
+#: ../src/mod-mgr.c:592
#, c-format
msgid "%s: No modules need to reload sats."
msgstr "%s: No modules need to reload sats."
@@ -3157,47 +3157,47 @@
msgid "%s: MaxEl not defined for %s. Assuming 90°."
msgstr "%s: MaxEl not defined for %s. Assuming 90°."
-#: ../src/sat-cfg.c:271
+#: ../src/sat-cfg.c:273
#, c-format
msgid "%s: Error reading config file (%s)"
msgstr "%s: Error reading config file (%s)"
-#: ../src/sat-cfg.c:275
+#: ../src/sat-cfg.c:277
#, c-format
msgid "%s: Using built-in defaults"
msgstr "%s: Using built-in defaults"
-#: ../src/sat-cfg.c:284
+#: ../src/sat-cfg.c:286
#, c-format
msgid "%s: Everything OK."
msgstr "%s: Everything OK."
-#: ../src/sat-cfg.c:376
+#: ../src/sat-cfg.c:377
#, c-format
msgid "%s: Configuration saved."
msgstr "%s: Configuration saved."
-#: ../src/sat-cfg.c:419 ../src/sat-cfg.c:482 ../src/sat-cfg.c:508
-#: ../src/sat-cfg.c:541 ../src/sat-cfg.c:606 ../src/sat-cfg.c:642
-#: ../src/sat-cfg.c:670 ../src/sat-cfg.c:726 ../src/sat-cfg.c:752
+#: ../src/sat-cfg.c:419 ../src/sat-cfg.c:480 ../src/sat-cfg.c:506
+#: ../src/sat-cfg.c:538 ../src/sat-cfg.c:601 ../src/sat-cfg.c:636
+#: ../src/sat-cfg.c:663 ../src/sat-cfg.c:717 ../src/sat-cfg.c:742
#, c-format
msgid "%s: Module not initialised\n"
msgstr "%s: Module not initialised\n"
-#: ../src/sat-cfg.c:442 ../src/sat-cfg.c:460 ../src/sat-cfg.c:495
-#: ../src/sat-cfg.c:521
+#: ../src/sat-cfg.c:442 ../src/sat-cfg.c:459 ../src/sat-cfg.c:493
+#: ../src/sat-cfg.c:519
#, c-format
msgid "%s: Unknown BOOL param index (%d)\n"
msgstr "%s: Unknown BOOL param index (%d)\n"
-#: ../src/sat-cfg.c:564 ../src/sat-cfg.c:587 ../src/sat-cfg.c:628
-#: ../src/sat-cfg.c:655
+#: ../src/sat-cfg.c:561 ../src/sat-cfg.c:583 ../src/sat-cfg.c:623
+#: ../src/sat-cfg.c:649
#, c-format
msgid "%s: Unknown STR param index (%d)\n"
msgstr "%s: Unknown STR param index (%d)\n"
-#: ../src/sat-cfg.c:693 ../src/sat-cfg.c:711 ../src/sat-cfg.c:739
-#: ../src/sat-cfg.c:765
+#: ../src/sat-cfg.c:686 ../src/sat-cfg.c:703 ../src/sat-cfg.c:730
+#: ../src/sat-cfg.c:755
#, c-format
msgid "%s: Unknown INT param index (%d)\n"
msgstr "%s: Unknown INT param index (%d)\n"
@@ -3744,7 +3744,7 @@
"satellite passes."
#: ../src/sat-pref-conditions.c:433 ../src/sat-pref-debug.c:144
-#: ../src/sat-pref-layout.c:583 ../src/sat-pref-list-view.c:260
+#: ../src/sat-pref-layout.c:434 ../src/sat-pref-list-view.c:260
#: ../src/sat-pref-map-view.c:651 ../src/sat-pref-multi-pass.c:196
#: ../src/sat-pref-polar-view.c:633 ../src/sat-pref-refresh.c:426
#: ../src/sat-pref-single-pass.c:190 ../src/sat-pref-single-sat.c:229
@@ -3938,58 +3938,74 @@
msgid "Rotators"
msgstr "Rotators"
-#: ../src/sat-pref-layout.c:237
-msgid "<b>Default Layout:</b>"
-msgstr "<b>Default Layout:</b>"
+#: ../src/sat-pref-layout.c:76
+msgid "World map, polar and single sat"
+msgstr ""
-#: ../src/sat-pref-layout.c:309 ../src/sat-pref-layout.c:664
-#, c-format
-msgid "%s: Invalid module layout (%d)"
-msgstr "%s: Invalid module layout (%d)"
+#: ../src/sat-pref-layout.c:77
+msgid "World map"
+msgstr ""
-#: ../src/sat-pref-layout.c:384
-msgid "<b>Views:</b>"
-msgstr "<b>Views:</b>"
+#: ../src/sat-pref-layout.c:78
+msgid "Table"
+msgstr ""
-#. labels
-#: ../src/sat-pref-layout.c:389
-msgid "View 1:"
-msgstr "View 1:"
+#: ../src/sat-pref-layout.c:79
+msgid "World map and table"
+msgstr ""
-#: ../src/sat-pref-layout.c:394
-msgid "View 2:"
-msgstr "View 2:"
+#: ../src/sat-pref-layout.c:80
+msgid "Polar and single sat"
+msgstr ""
-#: ../src/sat-pref-layout.c:399
-msgid "View 3:"
-msgstr "View 3:"
+#: ../src/sat-pref-layout.c:81
+msgid "Polar and upcoming passes"
+msgstr ""
-#: ../src/sat-pref-layout.c:481 ../src/sat-pref-modules.c:70
-msgid "List View"
-msgstr "List View"
+#: ../src/sat-pref-layout.c:82
+msgid "All views (narrow)"
+msgstr ""
-#: ../src/sat-pref-layout.c:482 ../src/sat-pref-modules.c:73
-msgid "Map View"
-msgstr "Map View"
+#: ../src/sat-pref-layout.c:83
+msgid "All views (wide)"
+msgstr ""
-#: ../src/sat-pref-layout.c:483 ../src/sat-pref-modules.c:76
-msgid "Polar View"
-msgstr "Polar View"
+#: ../src/sat-pref-layout.c:84
+msgid "Map, table, polar and single sat (wide)"
+msgstr ""
-#: ../src/sat-pref-layout.c:484
-msgid "Single Sat"
-msgstr "Single Sat"
+#: ../src/sat-pref-layout.c:85
+msgid "Custom"
+msgstr ""
-#: ../src/sat-pref-layout.c:513
+#. create header
+#: ../src/sat-pref-layout.c:222
+#, fuzzy
+msgid "Select layout:"
+msgstr "Selected Sat.:"
+
+#. layout string
+#: ../src/sat-pref-layout.c:258
+#, fuzzy
+msgid "Layout code:"
+msgstr "Layout"
+
+#: ../src/sat-pref-layout.c:269
+msgid ""
+"This entry holds the layout code for the module.\n"
+"Consult the user manual for how to create custom layouts using layout codes."
+msgstr ""
+
+#: ../src/sat-pref-layout.c:365
msgid "<b>Window Placements:</b>"
msgstr "<b>Window Placements:</b>"
#. main window setting
-#: ../src/sat-pref-layout.c:517
+#: ../src/sat-pref-layout.c:369
msgid "Restore position of main window"
msgstr "Restore position of main window"
-#: ../src/sat-pref-layout.c:522
+#: ../src/sat-pref-layout.c:374
msgid ""
"If you check this button, gpredict will try to place the main window at the "
"position it was during the last session.\n"
@@ -4000,11 +4016,11 @@
"Note that window managers can ignore this request."
#. module window setting
-#: ../src/sat-pref-layout.c:532
+#: ../src/sat-pref-layout.c:384
msgid "Restore position of module windows"
msgstr "Restore position of module windows"
-#: ../src/sat-pref-layout.c:537
+#: ../src/sat-pref-layout.c:389
msgid ""
"If you check this button, gpredict will try to place the module windows at "
"the position they were the last time.\n"
@@ -4015,11 +4031,11 @@
"Note that window managers can ignore this request."
#. module state
-#: ../src/sat-pref-layout.c:547
+#: ../src/sat-pref-layout.c:399
msgid "Restore the state of modules when reopened (docked or window)"
msgstr "Restore the state of modules when reopened (docked or window)"
-#: ../src/sat-pref-layout.c:552
+#: ../src/sat-pref-layout.c:404
msgid ""
"If you check this button, gpredict will restore the states of the modules "
"from the last time they were used."
@@ -4027,7 +4043,7 @@
"If you check this button, gpredict will restore the states of the modules "
"from the last time they were used."
-#: ../src/sat-pref-layout.c:588 ../src/sat-pref-list-view.c:265
+#: ../src/sat-pref-layout.c:439 ../src/sat-pref-list-view.c:265
#: ../src/sat-pref-map-view.c:656 ../src/sat-pref-polar-view.c:638
#: ../src/sat-pref-refresh.c:431 ../src/sat-pref-single-sat.c:234
msgid "Reset module settings to the global values."
@@ -4210,6 +4226,18 @@
msgid "Refresh Rates"
msgstr "Refresh Rates"
+#: ../src/sat-pref-modules.c:70
+msgid "List View"
+msgstr "List View"
+
+#: ../src/sat-pref-modules.c:73
+msgid "Map View"
+msgstr "Map View"
+
+#: ../src/sat-pref-modules.c:76
+msgid "Polar View"
+msgstr "Polar View"
+
#: ../src/sat-pref-modules.c:79
msgid "Single Sat View"
msgstr "Single Sat View"
@@ -5461,6 +5489,36 @@
msgid "%s: Not implemented!"
msgstr "%s: Not implemented!"
+#~ msgid "%s:%d: Invalid module layout (%d)"
+#~ msgstr "%s:%d: Invalid module layout (%d)"
+
+#~ msgid "%s:%d: Invalid child number (%d)"
+#~ msgstr "%s:%d: Invalid child number (%d)"
+
+#~ msgid "Select satellite"
+#~ msgstr "Select satellite"
+
+#~ msgid "<b>Default Layout:</b>"
+#~ msgstr "<b>Default Layout:</b>"
+
+#~ msgid "%s: Invalid module layout (%d)"
+#~ msgstr "%s: Invalid module layout (%d)"
+
+#~ msgid "<b>Views:</b>"
+#~ msgstr "<b>Views:</b>"
+
+#~ msgid "View 1:"
+#~ msgstr "View 1:"
+
+#~ msgid "View 2:"
+#~ msgstr "View 2:"
+
+#~ msgid "View 3:"
+#~ msgstr "View 3:"
+
+#~ msgid "Single Sat"
+#~ msgstr "Single Sat"
+
#~ msgid "User Manual"
#~ msgstr "User Manual"
Modified: trunk/po/en_US.po
===================================================================
--- trunk/po/en_US.po 2009-12-26 22:57:52 UTC (rev 556)
+++ trunk/po/en_US.po 2009-12-26 22:59:27 UTC (rev 557)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-07 00:28+0100\n"
+"POT-Creation-Date: 2009-12-26 23:58+0100\n"
"PO-Revision-Date: 2009-08-05 00:53+0100\n"
"Last-Translator: Michael Stephenson <mic...@go...>\n"
"Language-Team: US English\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/about.c:64
+#: ../src/about.c:65
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
"Contact: oz9aec at googlemail.com\n"
@@ -68,12 +68,12 @@
#. window title
#. icon file name
#. create window title and file name for window icon
-#: ../src/about.c:96 ../src/main.c:221 ../src/sat-log-browser.c:462
+#: ../src/about.c:97 ../src/main.c:221 ../src/sat-log-browser.c:462
#: ../src/sat-log.c:58
msgid "GPREDICT"
msgstr "GPREDICT"
-#: ../src/about.c:99
+#: ../src/about.c:100
#, fuzzy
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
@@ -84,7 +84,7 @@
"\n"
"Gpredict is available free of charge from:"
-#: ../src/about.c:116
+#: ../src/about.c:117
msgid "translator-credits"
msgstr "Michael Stephenson"
@@ -384,11 +384,13 @@
msgstr "%s:%d: Can not find clicked object (%d) in hash table"
#. next pass and predict passes
+#. Show next pass
#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97
-#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:837
+#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:836
msgid "Show next pass"
msgstr "Show next pass"
+#. Show future passes
#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108
#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851
msgid "Future passes"
@@ -402,7 +404,7 @@
#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474
#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246
#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376
-#: ../src/gtk-single-sat.c:1054 ../src/gtk-single-sat.c:1125
+#: ../src/gtk-single-sat.c:1049 ../src/gtk-single-sat.c:1120
#, c-format
msgid ""
"Satellite %s has no passes\n"
@@ -412,7 +414,7 @@
"within the next %d days"
#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192
-#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1070
+#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1065
#, c-format
msgid ""
"Satellite %s has no passes for\n"
@@ -430,7 +432,7 @@
"never comes above the horizon"
#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265
-#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1144
+#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1139
#, c-format
msgid ""
"Satellite %s has no passes for\n"
@@ -900,7 +902,7 @@
msgstr "%s:%d: Failed to load rotator configuration %s"
#: ../src/gtk-rot-ctrl.c:866 ../src/gtk-rot-ctrl.c:867
-#: ../src/gtk-sat-module-popup.c:894 ../src/gtk-sat-module-popup.c:967
+#: ../src/gtk-sat-module-popup.c:841 ../src/gtk-sat-module-popup.c:914
#: ../src/qth-data.c:94 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718
msgid "ERROR"
msgstr "ERROR"
@@ -1266,105 +1268,108 @@
msgid "Set Target"
msgstr "Set Target"
-#: ../src/gtk-sat-module.c:256
+#: ../src/gtk-sat-module.c:257
#, c-format
msgid "%s: Module %s is not valid."
msgstr "%s: Module %s is not valid."
-#: ../src/gtk-sat-module.c:299
+#: ../src/gtk-sat-module.c:300
msgid "Module options / shortcuts"
msgstr "Module options / shortcuts"
-#: ../src/gtk-sat-module.c:305
+#: ../src/gtk-sat-module.c:306
msgid "Close this module."
msgstr "Close this module."
-#: ../src/gtk-sat-module.c:439
+#: ../src/gtk-sat-module.c:375
#, c-format
-msgid "%s:%d: Invalid module layout (%d)"
-msgstr "%s:%d: Invalid module layout (%d)"
+msgid "%s: Layout has %d columns and %d rows."
+msgstr ""
-#: ../src/gtk-sat-module.c:466
-#, c-format
-msgid "%s:%d: Invalid child number (%d)"
-msgstr "%s:%d: Invalid child number (%d)"
-
-#: ../src/gtk-sat-module.c:503
-#, c-format
-msgid ""
-"%s:%d: Invalid child type (%d)\n"
-"Using GtkSatList..."
+#: ../src/gtk-sat-module.c:447
+#, fuzzy, c-format
+msgid "%s:%d: Invalid child type (%d). Using GtkSatList."
msgstr ""
"%s:%d: Invalid child type (%d)\n"
"Using GtkSatList..."
-#: ../src/gtk-sat-module.c:543
+#: ../src/gtk-sat-module.c:488
#, c-format
msgid "%s: Could not load config data from %s (%s)."
msgstr "%s: Could not load config data from %s (%s)."
-#: ../src/gtk-sat-module.c:553
+#: ../src/gtk-sat-module.c:498
#, c-format
msgid "%s: Reading configuration from %s"
msgstr "%s: Reading configuration from %s"
-#: ../src/gtk-sat-module.c:595
+#: ../src/gtk-sat-module.c:540
#, c-format
msgid "%s: Can not load default QTH file %s; using built-in defaults"
msgstr "%s: Can not load default QTH file %s; using built-in defaults"
#. settings are really screwed up; we need some safe values here
-#: ../src/gtk-sat-module.c:599 ../src/gtk-sat-module.c:600
+#: ../src/gtk-sat-module.c:544 ../src/gtk-sat-module.c:545
msgid "Error"
msgstr "Error"
-#: ../src/gtk-sat-module.c:670 ../src/mod-cfg.c:673
+#: ../src/gtk-sat-module.c:575
+#, fuzzy, c-format
+msgid "%s: Module layout is invalid: %s. Using default."
+msgstr "%s: Module has no QTH; use default."
+
+#: ../src/gtk-sat-module.c:587
+#, fuzzy, c-format
+msgid "%s: GRID(%d): %s"
+msgstr "%s:%d: Read %s"
+
+#: ../src/gtk-sat-module.c:632 ../src/mod-cfg.c:673
#, c-format
msgid "%s: Failed to get list of satellites (%s)"
msgstr "%s: Failed to get list of satellites (%s)"
-#: ../src/gtk-sat-module.c:692
+#: ../src/gtk-sat-module.c:654
#, c-format
msgid "%s: Error reading data for #%d"
msgstr "%s: Error reading data for #%d"
-#: ../src/gtk-sat-module.c:716
+#: ../src/gtk-sat-module.c:678
#, c-format
msgid "%s: Read data for #%d"
msgstr "%s: Read data for #%d"
-#: ../src/gtk-sat-module.c:723
+#: ../src/gtk-sat-module.c:685
#, c-format
msgid "%s: Sat #%d already in list"
msgstr "%s: Sat #%d already in list"
-#: ../src/gtk-sat-module.c:734
+#: ../src/gtk-sat-module.c:696
#, c-format
msgid "%s: Read %d out of %d satellites"
msgstr "%s: Read %d out of %d satellites"
-#: ../src/gtk-sat-module.c:796
+#: ../src/gtk-sat-module.c:748
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr "%s: Previous cycle missed it's deadline."
-#: ../src/gtk-sat-module.c:910 ../src/gtk-sat-module.c:1541
+#: ../src/gtk-sat-module.c:864 ../src/gtk-sat-module.c:1397
#, c-format
msgid "%f:%d: Unknown child type"
msgstr "%f:%d: Unknown child type"
-#: ../src/gtk-sat-module.c:1070
+#: ../src/gtk-sat-module.c:1016
#, c-format
msgid "%s: Module %s recevied CLOSE signal."
msgstr "%s: Module %s recevied CLOSE signal."
-#: ../src/gtk-sat-module.c:1080
+#: ../src/gtk-sat-module.c:1026
#, c-format
msgid "%s: Module %s is in DOCKED state."
msgstr "%s: Module %s is in DOCKED state."
-#: ../src/gtk-sat-module.c:1087 ../src/gtk-sat-module.c:1103
-#: ../src/gtk-sat-module.c:1131
+#: ../src/gtk-sat-module.c:1033 ../src/gtk-sat-module.c:1049
+#: ../src/gtk-sat-module.c:1077
#, c-format
msgid ""
"%s: Module %s was not found in mod-mgr (%d)\n"
@@ -1373,32 +1378,32 @@
"%s: Module %s was not found in mod-mgr (%d)\n"
"Internal state is corrupt?"
-#: ../src/gtk-sat-module.c:1096
+#: ../src/gtk-sat-module.c:1042
#, c-format
msgid "%s: Module %s is in WINDOW state."
msgstr "%s: Module %s is in WINDOW state."
-#: ../src/gtk-sat-module.c:1124
+#: ../src/gtk-sat-module.c:1070
#, c-format
msgid "%s: Module %s is in FULLSCREEN state."
msgstr "%s: Module %s is in FULLSCREEN state."
-#: ../src/gtk-sat-module.c:1153 ../src/gtk-sat-module.c:1320
+#: ../src/gtk-sat-module.c:1099 ../src/gtk-sat-module.c:1258
#, c-format
msgid "%s: Module %s has unknown state: %d"
msgstr "%s: Module %s has unknown state: %d"
-#: ../src/gtk-sat-module.c:1162
+#: ../src/gtk-sat-module.c:1108
#, c-format
msgid "%s: Module %s closed."
msgstr "%s: Module %s closed."
-#: ../src/gtk-sat-module.c:1203
+#: ../src/gtk-sat-module.c:1148
#, c-format
msgid "%s: Module %s recevied CONFIG signal."
msgstr "%s: Module %s recevied CONFIG signal."
-#: ../src/gtk-sat-module.c:1212
+#: ../src/gtk-sat-module.c:1157
#, c-format
msgid ""
"%s: Could not stop timeout callback\n"
@@ -1407,12 +1412,12 @@
"%s: Could not stop timeout callback\n"
"%s: Source ID %d seems invalid."
-#: ../src/gtk-sat-module.c:1230
+#: ../src/gtk-sat-module.c:1175
#, c-format
msgid "%s: Module configuration failed for some reason."
msgstr "%s: Module configuration failed for some reason."
-#: ../src/gtk-sat-module.c:1488
+#: ../src/gtk-sat-module.c:1348
#, c-format
msgid "%s: Reloading satellites for module %s"
msgstr "%s: Reloading satellites for module %s"
@@ -1542,27 +1547,27 @@
msgid "%s:%d: Successfully cloned %s."
msgstr "%s:%d: Successfully cloned %s."
-#: ../src/gtk-sat-module-popup.c:463
+#: ../src/gtk-sat-module-popup.c:442
#, c-format
msgid "%s:%d: Cloning cancelled by user."
msgstr "%s:%d: Cloning cancelled by user."
-#: ../src/gtk-sat-module-popup.c:469
+#: ../src/gtk-sat-module-popup.c:448
#, c-format
msgid "%s:%d: Cloning interrupted."
msgstr "%s:%d: Cloning interrupted."
-#: ../src/gtk-sat-module-popup.c:656 ../src/gtk-sat-module-popup.c:799
+#: ../src/gtk-sat-module-popup.c:624 ../src/gtk-sat-module-popup.c:746
#, c-format
msgid "%s:%d: Unknown module state: %d"
msgstr "%s:%d: Unknown module state: %d"
-#: ../src/gtk-sat-module-popup.c:825
+#: ../src/gtk-sat-module-popup.c:772
#, c-format
msgid "The sky at a glance (%s)"
msgstr "The sky at a glance (%s)"
-#: ../src/gtk-sat-module-popup.c:889
+#: ../src/gtk-sat-module-popup.c:836
msgid ""
"You have no radio configuration!\n"
"Please configure a radio first."
@@ -1570,12 +1575,12 @@
"You have no radio configuration!\n"
"Please configure a radio first."
-#: ../src/gtk-sat-module-popup.c:902
+#: ../src/gtk-sat-module-popup.c:849
#, c-format
msgid "Gpredict Radio Control: %s"
msgstr "Gpredict Radio Control: %s"
-#: ../src/gtk-sat-module-popup.c:962
+#: ../src/gtk-sat-module-popup.c:909
msgid ""
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
@@ -1583,12 +1588,12 @@
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
-#: ../src/gtk-sat-module-popup.c:975
+#: ../src/gtk-sat-module-popup.c:922
#, c-format
msgid "Gpredict Rotator Control: %s"
msgstr "Gpredict Rotator Control: %s"
-#: ../src/gtk-sat-module-popup.c:1060
+#: ../src/gtk-sat-module-popup.c:1007
#, c-format
msgid ""
"This operation will permanently delete\n"
@@ -1601,12 +1606,12 @@
"from the disk.\n"
"Do you you want to proceed?"
-#: ../src/gtk-sat-module-popup.c:1070
+#: ../src/gtk-sat-module-popup.c:1017
#, c-format
msgid "%s:%d: Failed to delete %s."
msgstr "%s:%d: Failed to delete %s."
-#: ../src/gtk-sat-module-popup.c:1075
+#: ../src/gtk-sat-module-popup.c:1022
#, c-format
msgid "%s:%d: %s deleted permanently."
msgstr "%s:%d: %s deleted permanently."
@@ -1632,7 +1637,7 @@
#. reset button
#: ../src/gtk-sat-module-tmg.c:125 ../src/sat-pref-conditions.c:427
#: ../src/sat-pref-debug.c:141 ../src/sat-pref-formats.c:118
-#: ../src/sat-pref-layout.c:576 ../src/sat-pref-list-view.c:253
+#: ../src/sat-pref-layout.c:427 ../src/sat-pref-list-view.c:253
#: ../src/sat-pref-map-view.c:644 ../src/sat-pref-multi-pass.c:190
#: ../src/sat-pref-polar-view.c:627 ../src/sat-pref-refresh.c:419
#: ../src/sat-pref-single-pass.c:184 ../src/sat-pref-single-sat.c:222
@@ -1998,11 +2003,6 @@
msgid "%s:%d: Invalid field number (%d)"
msgstr "%s:%d: Invalid field number (%d)"
-#. select sat
-#: ../src/gtk-single-sat.c:908
-msgid "Select satellite"
-msgstr "Select satellite"
-
#. no satellites
#: ../src/gtk-sky-glance.c:238
#, fuzzy
@@ -2062,27 +2062,27 @@
msgid "%s: %s does not exist!"
msgstr "%s: %s does not exist!"
-#: ../src/loc-tree.c:445
+#: ../src/loc-tree.c:447
#, c-format
msgid "%s: Read %d cities."
msgstr "%s: Read %d cities."
-#: ../src/loc-tree.c:463
+#: ../src/loc-tree.c:465
#, c-format
msgid "%s: Failed to open locfile (%s)"
msgstr "%s: Failed to open locfile (%s)"
-#: ../src/loc-tree.c:522
+#: ../src/loc-tree.c:524
#, c-format
msgid "%s: Invalid column: %d"
msgstr "%s: Invalid column: %d"
-#: ../src/loc-tree.c:670
+#: ../src/loc-tree.c:672
#, c-format
msgid "%s: Failed to get parent for %s."
msgstr "%s: Failed to get parent for %s."
-#: ../src/loc-tree.c:684
+#: ../src/loc-tree.c:686
#, c-format
msgid "%s: No selection found!"
msgstr "%s: No selection found!"
@@ -2314,52 +2314,52 @@
msgid "Failed to build menubar: %s"
msgstr "Failed to build menubar: %s"
-#: ../src/menubar.c:272
+#: ../src/menubar.c:270
#, c-format
msgid "%s: Starting new module configurator..."
msgstr "%s: Starting new module configurator..."
-#: ../src/menubar.c:279
+#: ../src/menubar.c:277
#, c-format
msgid "%s: New module name is %s."
msgstr "%s: New module name is %s."
-#: ../src/menubar.c:299 ../src/menubar.c:367
+#: ../src/menubar.c:297 ../src/menubar.c:356
#, c-format
msgid "Could not open %s. Please examine the log messages for details."
msgstr "Could not open %s. Please examine the log messages for details."
-#: ../src/menubar.c:323
+#: ../src/menubar.c:313
#, c-format
msgid "%s: New module config cancelled."
msgstr "%s: New module config cancelled."
-#: ../src/menubar.c:340
+#: ../src/menubar.c:329
#, c-format
msgid "%s: Open existing module..."
msgstr "%s: Open existing module..."
-#: ../src/menubar.c:347
+#: ../src/menubar.c:336
#, c-format
msgid "%s: Open module %s."
msgstr "%s: Open module %s."
-#: ../src/menubar.c:405
+#: ../src/menubar.c:384
#, c-format
msgid "%s: Open module cancelled."
msgstr "%s: Open module cancelled."
#. create new dialog with progress indicator
-#: ../src/menubar.c:460 ../src/menubar.c:630 ../src/sat-pref-general.c:61
+#: ../src/menubar.c:439 ../src/menubar.c:609 ../src/sat-pref-general.c:61
msgid "TLE Update"
msgstr "TLE Update"
-#: ../src/menubar.c:481
+#: ../src/menubar.c:460
msgid "<b>Updating TLE files from network</b>"
msgstr "<b>Updating TLE files from network</b>"
#. statistics
-#: ../src/menubar.c:494 ../src/menubar.c:664
+#: ../src/menubar.c:473 ../src/menubar.c:643
msgid ""
"Satellites updated:\t 0\n"
"Satellites skipped:\t 0\n"
@@ -2369,56 +2369,56 @@
"Satellites skipped:\t 0\n"
"Missing Satellites:\t 0\n"
-#: ../src/menubar.c:520 ../src/menubar.c:690
+#: ../src/menubar.c:499 ../src/menubar.c:669
msgid "Finished"
msgstr "Finished"
#. create file chooser
-#: ../src/menubar.c:573
+#: ../src/menubar.c:552
msgid "Select directory"
msgstr "Select directory"
#. create label
-#: ../src/menubar.c:579
+#: ../src/menubar.c:558
msgid "Select TLE directory:"
msgstr "Select TLE directory:"
#. create the dalog
-#: ../src/menubar.c:588
+#: ../src/menubar.c:567
msgid "Update TLE from files"
msgstr "Update TLE from files"
-#: ../src/menubar.c:623
+#: ../src/menubar.c:602
#, c-format
msgid "%s: Running TLE update from %s"
msgstr "%s: Running TLE update from %s"
-#: ../src/menubar.c:650
+#: ../src/menubar.c:629
msgid "<b>Updating TLE files from files</b>"
msgstr "<b>Updating TLE files from files</b>"
-#: ../src/menubar.c:728 ../src/menubar.c:749
+#: ../src/menubar.c:707 ../src/menubar.c:728
msgid "This function is still under development."
msgstr "This function is still under development."
-#: ../src/menubar.c:776
+#: ../src/menubar.c:755
msgid ""
"A comprehensive PDF user manual and \n"
"video tutorials are available from the \n"
"Gpredict website:"
msgstr ""
-#: ../src/menubar.c:850
+#: ../src/menubar.c:829
#, c-format
msgid "%s:%s: Scanning directory %s for modules."
msgstr "%s:%s: Scanning directory %s for modules."
-#: ../src/menubar.c:873
+#: ../src/menubar.c:852
#, c-format
msgid "%s:%d: Failed to open module dir %s (%s)"
msgstr "%s:%d: Failed to open module dir %s (%s)"
-#: ../src/menubar.c:888
+#: ../src/menubar.c:867
msgid ""
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
@@ -2426,21 +2426,21 @@
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
-#: ../src/menubar.c:906
+#: ../src/menubar.c:885
msgid "Module"
msgstr "Module"
#. create dialog
-#: ../src/menubar.c:914
+#: ../src/menubar.c:893
msgid "Select a module"
msgstr "Select a module"
-#: ../src/menubar.c:941
+#: ../src/menubar.c:920
#, c-format
msgid "%s:%s: Selected module is: %s"
msgstr "%s:%s: Selected module is: %s"
-#: ../src/menubar.c:946
+#: ../src/menubar.c:925
#, c-format
msgid "%s:%s: No selection is list of modules."
msgstr "%s:%s: No selection is list of modules."
@@ -2483,22 +2483,22 @@
msgid "%s: Attempt to save NULL data."
msgstr "%s: Attempt to save NULL data."
-#: ../src/mod-cfg.c:343 ../src/sat-cfg.c:324
+#: ../src/mod-cfg.c:343 ../src/sat-cfg.c:325
#, c-format
msgid "%s: Could not create config data (%s)."
msgstr "%s: Could not create config data (%s)."
-#: ../src/mod-cfg.c:360 ../src/sat-cfg.c:341
+#: ../src/mod-cfg.c:360 ../src/sat-cfg.c:342
#, c-format
msgid "%s: Could not create config file (%s)."
msgstr "%s: Could not create config file (%s)."
-#: ../src/mod-cfg.c:379 ../src/sat-cfg.c:360
+#: ../src/mod-cfg.c:379 ../src/sat-cfg.c:361
#, c-format
msgid "%s: Error writing config data (%s)."
msgstr "%s: Error writing config data (%s)."
-#: ../src/mod-cfg.c:388 ../src/qth-data.c:341 ../src/sat-cfg.c:369
+#: ../src/mod-cfg.c:388 ../src/qth-data.c:341 ../src/sat-cfg.c:370
#, c-format
msgid "%s: Wrote only %d out of %d chars."
msgstr "%s: Wrote only %d out of %d chars."
@@ -2667,7 +2667,7 @@
msgid "%s: Saved states for %d modules."
msgstr "%s: Saved states for %d modules."
-#: ../src/mod-mgr.c:426 ../src/mod-mgr.c:495
+#: ../src/mod-mgr.c:426 ../src/mod-mgr.c:492
#, c-format
msgid "%s: Module %s not found in list. Trying to recover."
msgstr "%s: Module %s not found in list. Trying to recover."
@@ -2677,36 +2677,36 @@
msgid "%s: Module %s already in notebook!"
msgstr "%s: Module %s already in notebook!"
-#: ../src/mod-mgr.c:448
+#: ../src/mod-mgr.c:445
#, c-format
msgid "%s: Docked %s into notebook (page %d)"
msgstr "%s: Docked %s into notebook (page %d)"
-#: ../src/mod-mgr.c:503
+#: ../src/mod-mgr.c:500
#, c-format
msgid "%s: Module %s does not seem to be docked!"
msgstr "%s: Module %s does not seem to be docked!"
-#: ../src/mod-mgr.c:512
+#: ../src/mod-mgr.c:509
#, c-format
msgid "%s: Removed %s from notebook page %d."
msgstr "%s: Removed %s from notebook page %d."
-#: ../src/mod-mgr.c:546
+#: ../src/mod-mgr.c:543
msgid "GPREDICT: (none)"
msgstr "GPREDICT: (none)"
-#: ../src/mod-mgr.c:551 ../src/mod-mgr.c:568
+#: ../src/mod-mgr.c:548 ../src/mod-mgr.c:565
#, c-format
msgid "GPREDICT: %s"
msgstr "GPREDICT: %s"
-#: ../src/mod-mgr.c:586
+#: ../src/mod-mgr.c:583
#, c-format
msgid "%s: Attempt to reload sats but mod-mgr is NULL?"
msgstr "%s: Attempt to reload sats but mod-mgr is NULL?"
-#: ../src/mod-mgr.c:595
+#: ../src/mod-mgr.c:592
#, c-format
msgid "%s: No modules need to reload sats."
msgstr "%s: No modules need to reload sats."
@@ -3157,47 +3157,47 @@
msgid "%s: MaxEl not defined for %s. Assuming 90°."
msgstr "%s: MaxEl not defined for %s. Assuming 90°."
-#: ../src/sat-cfg.c:271
+#: ../src/sat-cfg.c:273
#, c-format
msgid "%s: Error reading config file (%s)"
msgstr "%s: Error reading config file (%s)"
-#: ../src/sat-cfg.c:275
+#: ../src/sat-cfg.c:277
#, c-format
msgid "%s: Using built-in defaults"
msgstr "%s: Using built-in defaults"
-#: ../src/sat-cfg.c:284
+#: ../src/sat-cfg.c:286
#, c-format
msgid "%s: Everything OK."
msgstr "%s: Everything OK."
-#: ../src/sat-cfg.c:376
+#: ../src/sat-cfg.c:377
#, c-format
msgid "%s: Configuration saved."
msgstr "%s: Configuration saved."
-#: ../src/sat-cfg.c:419 ../src/sat-cfg.c:482 ../src/sat-cfg.c:508
-#: ../src/sat-cfg.c:541 ../src/sat-cfg.c:606 ../src/sat-cfg.c:642
-#: ../src/sat-cfg.c:670 ../src/sat-cfg.c:726 ../src/sat-cfg.c:752
+#: ../src/sat-cfg.c:419 ../src/sat-cfg.c:480 ../src/sat-cfg.c:506
+#: ../src/sat-cfg.c:538 ../src/sat-cfg.c:601 ../src/sat-cfg.c:636
+#: ../src/sat-cfg.c:663 ../src/sat-cfg.c:717 ../src/sat-cfg.c:742
#, c-format
msgid "%s: Module not initialised\n"
msgstr "%s: Module not initialised\n"
-#: ../src/sat-cfg.c:442 ../src/sat-cfg.c:460 ../src/sat-cfg.c:495
-#: ../src/sat-cfg.c:521
+#: ../src/sat-cfg.c:442 ../src/sat-cfg.c:459 ../src/sat-cfg.c:493
+#: ../src/sat-cfg.c:519
#, c-format
msgid "%s: Unknown BOOL param index (%d)\n"
msgstr "%s: Unknown BOOL param index (%d)\n"
-#: ../src/sat-cfg.c:564 ../src/sat-cfg.c:587 ../src/sat-cfg.c:628
-#: ../src/sat-cfg.c:655
+#: ../src/sat-cfg.c:561 ../src/sat-cfg.c:583 ../src/sat-cfg.c:623
+#: ../src/sat-cfg.c:649
#, c-format
msgid "%s: Unknown STR param index (%d)\n"
msgstr "%s: Unknown STR param index (%d)\n"
-#: ../src/sat-cfg.c:693 ../src/sat-cfg.c:711 ../src/sat-cfg.c:739
-#: ../src/sat-cfg.c:765
+#: ../src/sat-cfg.c:686 ../src/sat-cfg.c:703 ../src/sat-cfg.c:730
+#: ../src/sat-cfg.c:755
#, c-format
msgid "%s: Unknown INT param index (%d)\n"
msgstr "%s: Unknown INT param index (%d)\n"
@@ -3744,7 +3744,7 @@
"satellite passes."
#: ../src/sat-pref-conditions.c:433 ../src/sat-pref-debug.c:144
-#: ../src/sat-pref-layout.c:583 ../src/sat-pref-list-view.c:260
+#: ../src/sat-pref-layout.c:434 ../src/sat-pref-list-view.c:260
#: ../src/sat-pref-map-view.c:651 ../src/sat-pref-multi-pass.c:196
#: ../src/sat-pref-polar-view.c:633 ../src/sat-pref-refresh.c:426
#: ../src/sat-pref-single-pass.c:190 ../src/sat-pref-single-sat.c:229
@@ -3938,58 +3938,74 @@
msgid "Rotators"
msgstr "Rotators"
-#: ../src/sat-pref-layout.c:237
-msgid "<b>Default Layout:</b>"
-msgstr "<b>Default Layout:</b>"
+#: ../src/sat-pref-layout.c:76
+msgid "World map, polar and single sat"
+msgstr ""
-#: ../src/sat-pref-layout.c:309 ../src/sat-pref-layout.c:664
-#, c-format
-msgid "%s: Invalid module layout (%d)"
-msgstr "%s: Invalid module layout (%d)"
+#: ../src/sat-pref-layout.c:77
+msgid "World map"
+msgstr ""
-#: ../src/sat-pref-layout.c:384
-msgid "<b>Views:</b>"
-msgstr "<b>Views:</b>"
+#: ../src/sat-pref-layout.c:78
+msgid "Table"
+msgstr ""
-#. labels
-#: ../src/sat-pref-layout.c:389
-msgid "View 1:"
-msgstr "View 1:"
+#: ../src/sat-pref-layout.c:79
+msgid "World map and table"
+msgstr ""
-#: ../src/sat-pref-layout.c:394
-msgid "View 2:"
-msgstr "View 2:"
+#: ../src/sat-pref-layout.c:80
+msgid "Polar and single sat"
+msgstr ""
-#: ../src/sat-pref-layout.c:399
-msgid "View 3:"
-msgstr "View 3:"
+#: ../src/sat-pref-layout.c:81
+msgid "Polar and upcoming passes"
+msgstr ""
-#: ../src/sat-pref-layout.c:481 ../src/sat-pref-modules.c:70
-msgid "List View"
-msgstr "List View"
+#: ../src/sat-pref-layout.c:82
+msgid "All views (narrow)"
+msgstr ""
-#: ../src/sat-pref-layout.c:482 ../src/sat-pref-modules.c:73
-msgid "Map View"
-msgstr "Map View"
+#: ../src/sat-pref-layout.c:83
+msgid "All views (wide)"
+msgstr ""
-#: ../src/sat-pref-layout.c:483 ../src/sat-pref-modules.c:76
-msgid "Polar View"
-msgstr "Polar View"
+#: ../src/sat-pref-layout.c:84
+msgid "Map, table, polar and single sat (wide)"
+msgstr ""
-#: ../src/sat-pref-layout.c:484
-msgid "Single Sat"
-msgstr "Single Sat"
+#: ../src/sat-pref-layout.c:85
+msgid "Custom"
+msgstr ""
-#: ../src/sat-pref-layout.c:513
+#. create header
+#: ../src/sat-pref-layout.c:222
+#, fuzzy
+msgid "Select layout:"
+msgstr "Selected Sat.:"
+
+#. layout string
+#: ../src/sat-pref-layout.c:258
+#, fuzzy
+msgid "Layout code:"
+msgstr "Layout"
+
+#: ../src/sat-pref-layout.c:269
+msgid ""
+"This entry holds the layout code for the module.\n"
+"Consult the user manual for how to create custom layouts using layout codes."
+msgstr ""
+
+#: ../src/sat-pref-layout.c:365
msgid "<b>Window Placements:</b>"
msgstr "<b>Window Placements:</b>"
#. main window setting
-#: ../src/sat-pref-layout.c:517
+#: ../src/sat-pref-layout.c:369
msgid "Restore position of main window"
msgstr "Restore position of main window"
-#: ../src/sat-pref-layout.c:522
+#: ../src/sat-pref-layout.c:374
msgid ""
"If you check this button, gpredict will try to place the main window at the "
"position it was during the last session.\n"
@@ -4000,11 +4016,11 @@
"Note that window managers can ignore this request."
#. module window setting
-#: ../src/sat-pref-layout.c:532
+#: ../src/sat-pref-layout.c:384
msgid "Restore position of module windows"
msgstr "Restore position of module windows"
-#: ../src/sat-pref-layout.c:537
+#: ../src/sat-pref-layout.c:389
msgid ""
"If you check this button, gpredict will try to place the module windows at "
"the position they were the last time.\n"
@@ -4015,11 +4031,11 @@
"Note that window managers can ignore this request."
#. module state
-#: ../src/sat-pref-layout.c:547
+#: ../src/sat-pref-layout.c:399
msgid "Restore the state of modules when reopened (docked or window)"
msgstr "Restore the state of modules when reopened (docked or window)"
-#: ../src/sat-pref-layout.c:552
+#: ../src/sat-pref-layout.c:404
msgid ""
"If you check this button, gpredict will restore the states of the modules "
"from the last time they were used."
@@ -4027,7 +4043,7 @@
"If you check this button, gpredict will restore the states of the modules "
"from the last time they were used."
-#: ../src/sat-pref-layout.c:588 ../src/sat-pref-list-view.c:265
+#: ../src/sat-pref-layout.c:439 ../src/sat-pref-list-view.c:265
#: ../src/sat-pref-map-view.c:656 ../src/sat-pref-polar-view.c:638
#: ../src/sat-pref-refresh.c:431 ../src/sat-pref-single-sat.c:234
msgid "Reset module settings to the global values."
@@ -4210,6 +4226,18 @@
msgid "Refresh Rates"
msgstr "Refresh Rates"
+#: ../src/sat-pref-modules.c:70
+msgid "List View"
+msgstr "List View"
+
+#: ../src/sat-pref-modules.c:73
+msgid "Map View"
+msgstr "Map View"
+
+#: ../src/sat-pref-modules.c:76
+msgid "Polar View"
+msgstr "Polar View"
+
#: ../src/sat-pref-modules.c:79
msgid "Single Sat View"
msgstr "Single Sat View"
@@ -5461,6 +5489,36 @@
msgid "%s: Not implemented!"
msgstr "%s: Not implemented!"
+#~ msgid "%s:%d: Invalid module layout (%d)"
+#~ msgstr "%s:%d: Invalid module layout (%d)"
+
+#~ msgid "%s:%d: Invalid child number (%d)"
+#~ msgstr "%s:%d: Invalid child number (%d)"
+
+#~ msgid "Select satellite"
+#~ msgstr "Select satellite"
+
+#~ msgid "<b>Default Layout:</b>"
+#~ msgstr "<b>Default Layout:</b>"
+
+#~ msgid "%s: Invalid module layout (%d)"
+#~ msgstr "%s: Invalid module layout (%d)"
+
+#~ msgid "<b>Views:</b>"
+#~ msgstr "<b>Views:</b>"
+
+#~ msgid "View 1:"
+#~ msgstr "View 1:"
+
+#~ msgid "View 2:"
+#~ msgstr "View 2:"
+
+#~ msgid "View 3:"
+#~ msgstr "View 3:"
+
+#~ msgid "Single Sat"
+#~ msgstr "Single Sat"
+
#~ msgid "User Manual"
#~ msgstr "User Manual"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2009-12-26 22:57:52 UTC (rev 556)
+++ trunk/po/fr.po 2009-12-26 22:59:27 UTC (rev 557)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-07 00:28+0100\n"
+"POT-Creation-Date: 2009-12-26 23:58+0100\n"
"PO-Revision-Date: 2009-03-19 23:06+0200\n"
"Last-Translator: Stéphane Fillod <fi...@us...>\n"
"Language-Team: French <deb...@li...>\n"
@@ -16,7 +16,7 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../src/about.c:64
+#: ../src/about.c:65
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
"Contact: oz9aec at googlemail.com\n"
@@ -46,12 +46,12 @@
#. window title
#. icon file name
#. create window title and file name for window icon
-#: ../src/about.c:96 ../src/main.c:221 ../src/sat-log-browser.c:462
+#: ../src/about.c:97 ../src/main.c:221 ../src/sat-log-browser.c:462
#: ../src/sat-log.c:58
msgid "GPREDICT"
msgstr "GPREDICT"
-#: ../src/about.c:99
+#: ../src/about.c:100
#, fuzzy
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
@@ -62,7 +62,7 @@
"\n"
"Gpredict est disponible libre de droit depuis:"
-#: ../src/about.c:116
+#: ../src/about.c:117
msgid "translator-credits"
msgstr "Stéphane Fillod"
@@ -356,11 +356,13 @@
msgstr ""
#. next pass and predict passes
+#. Show next pass
#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97
-#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:837
+#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:836
msgid "Show next pass"
msgstr "Montre le prochain passage"
+#. Show future passes
#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108
#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851
msgid "Future passes"
@@ -374,7 +376,7 @@
#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474
#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246
#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376
-#: ../src/gtk-single-sat.c:1054 ../src/gtk-single-sat.c:1125
+#: ../src/gtk-single-sat.c:1049 ../src/gtk-single-sat.c:1120
#, c-format
msgid ""
"Satellite %s has no passes\n"
@@ -382,7 +384,7 @@
msgstr ""
#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192
-#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1070
+#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1065
#, c-format
msgid ""
"Satellite %s has no passes for\n"
@@ -394,7 +396,7 @@
msgstr ""
#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265
-#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1144
+#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1139
#, c-format
msgid ""
"Satellite %s has no passes for\n"
@@ -834,7 +836,7 @@
msgstr ""
#: ../src/gtk-rot-ctrl.c:866 ../src/gtk-rot-ctrl.c:867
-#: ../src/gtk-sat-module-popup.c:894 ../src/gtk-sat-module-popup.c:967
+#: ../src/gtk-sat-module-popup.c:841 ../src/gtk-sat-module-popup.c:914
#: ../src/qth-data.c:94 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718
msgid "ERROR"
msgstr "ERREUR"
@@ -1200,147 +1202,150 @@
msgid "Set Target"
msgstr ""
-#: ../src/gtk-sat-module.c:256
+#: ../src/gtk-sat-module.c:257
#, c-format
msgid "%s: Module %s is not valid."
msgstr ""
-#: ../src/gtk-sat-module.c:299
+#: ../src/gtk-sat-module.c:300
msgid "Module options / shortcuts"
msgstr ""
-#: ../src/gtk-sat-module.c:305
+#: ../src/gtk-sat-module.c:306
msgid "Close this module."
msgstr ""
-#: ../src/gtk-sat-module.c:439
+#: ../src/gtk-sat-module.c:375
#, c-format
-msgid "%s:%d: Invalid module layout (%d)"
+msgid "%s: Layout has %d columns and %d rows."
msgstr ""
-#: ../src/gtk-sat-module.c:466
+#: ../src/gtk-sat-module.c:447
#, c-format
-msgid "%s:%d: Invalid child number (%d)"
+msgid "%s:%d: Invalid child type (%d). Using GtkSatList."
msgstr ""
-#: ../src/gtk-sat-module.c:503
+#: ../src/gtk-sat-module.c:488
#, c-format
-msgid ""
-"%s:%d: Invalid child type (%d)\n"
-"Using GtkSatList..."
-msgstr ""
-
-#: ../src/gtk-sat-module.c:543
-#, c-format
msgid "%s: Could not load config data from %s (%s)."
msgstr ""
-#: ../src/gtk-sat-module.c:553
+#: ../src/gtk-sat-module.c:498
#, c-format
msgid "%s: Reading configuration from %s"
msgstr ""
-#: ../src/gtk-sat-module.c:595
+#: ../src/gtk-sat-module.c:540
#, c-format
msgid "%s: Can not load default QTH file %s; using built-in defaults"
msgstr ""
#. settings are really screwed up; we need some safe values here
-#: ../src/gtk-sat-module.c:599 ../src/gtk-sat-module.c:600
+#: ../src/gtk-sat-module.c:544 ../src/gtk-sat-module.c:545
msgid "Error"
msgstr ""
-#: ../src/gtk-sat-module.c:670 ../src/mod-cfg.c:673
+#: ../src/gtk-sat-module.c:575
#, c-format
+msgid "%s: Module layout is invalid: %s. Using default."
+msgstr ""
+
+#: ../src/gtk-sat-module.c:587
+#, c-format
+msgid "%s: GRID(%d): %s"
+msgstr ""
+
+#: ../src/gtk-sat-module.c:632 ../src/mod-cfg.c:673
+#, c-format
msgid "%s: Failed to get list of satellites (%s)"
msgstr ""
-#: ../src/gtk-sat-module.c:692
+#: ../src/gtk-sat-module.c:654
#, c-format
msgid "%s: Error reading data for #%d"
msgstr ""
-#: ../src/gtk-sat-module.c:716
+#: ../src/gtk-sat-module.c:678
#, c-format
msgid "%s: Read data for #%d"
msgstr ""
-#: ../src/gtk-sat-module.c:723
+#: ../src/gtk-sat-module.c:685
#, c-format
msgid "%s: Sat #%d already in list"
msgstr ""
-#: ../src/gtk-sat-module.c:734
+#: ../src/gtk-sat-module.c:696
#, c-format
msgid "%s: Read %d out of %d satellites"
msgstr ""
-#: ../src/gtk-sat-module.c:796
+#: ../src/gtk-sat-module.c:748
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr ""
-#: ../src/gtk-sat-module.c:910 ../src/gtk-sat-module.c:1541
+#: ../src/gtk-sat-module.c:864 ../src/gtk-...
[truncated message content] |
|
From: <cs...@us...> - 2009-12-26 22:58:01
|
Revision: 556
http://gpredict.svn.sourceforge.net/gpredict/?rev=556&view=rev
Author: csete
Date: 2009-12-26 22:57:52 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Finished implementation of layout configurator.
Modified Paths:
--------------
trunk/src/sat-pref-layout.c
Modified: trunk/src/sat-pref-layout.c
===================================================================
--- trunk/src/sat-pref-layout.c 2009-12-26 00:21:15 UTC (rev 555)
+++ trunk/src/sat-pref-layout.c 2009-12-26 22:57:52 UTC (rev 556)
@@ -11,7 +11,7 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -48,23 +48,32 @@
/* Text entry for layout string */
static GtkWidget *gridstr;
+static gulong gridstr_sigid;
+/* layout selector combo */
+static GtkWidget *selector;
+
+/* layout thumbnail */
+static GtkWidget *thumb;
+
+
/* private functions */
static void create_layout_selector (GKeyFile *cfg, GtkTable *table);
-static void layout_selected_cb (GtkToggleButton *but, gpointer data);
+static void layout_selected_cb (GtkComboBox *combo, gpointer data);
static void create_window_placement (GtkBox *vbox);
static void create_reset_button (GKeyFile *cfg, GtkBox *vbox);
-static GtkWidget *create_combo (void);
-static void combo_changed_cb (GtkComboBox *widget, gpointer data);
static void reset_cb (GtkWidget *button, gpointer cfg);
static void window_pos_toggle_cb (GtkWidget *toggle, gpointer data);
static void layout_code_changed (GtkWidget *widget, gpointer data);
+static gchar *thumb_file_from_sel (guint sel);
+/** \brief the number of predefined layouts (+1 for custom). */
#define PREDEF_NUM 10
+/** \brief Predefined layouts. */
gchar *predef_layout[PREDEF_NUM][3] = {
- { "1;0;2;0;1;2;0;1;1;2;3;1;2;1;2", N_("World map, polar and single sat (default)"), "gpredict-layout-00.png" },
+ { "1;0;2;0;1;2;0;1;1;2;3;1;2;1;2", N_("World map, polar and single sat"), "gpredict-layout-00.png" },
{ "1;0;2;0;1", N_("World map"), "gpredict-layout-01.png" },
{ "1;0;2;0;1", N_("Table"), "gpredict-layout-02.png" },
{ "1;0;2;0;2;0;0;2;2;3", N_("World map and table"), "gpredict-layout-03.png" },
@@ -85,44 +94,44 @@
*/
GtkWidget *sat_pref_layout_create (GKeyFile *cfg)
{
- GtkWidget *table;
- GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *vbox;
- /* create the table */
- table = gtk_table_new (8, 5, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 10);
- gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ /* create the table */
+ table = gtk_table_new (8, 5, FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 10);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
- /* layout selector */
- create_layout_selector (cfg, GTK_TABLE (table));
+ /* layout selector */
+ create_layout_selector (cfg, GTK_TABLE (table));
- /* separator */
- gtk_table_attach (GTK_TABLE (table),
- gtk_hseparator_new (),
+ /* separator */
+ gtk_table_attach (GTK_TABLE (table),
+ gtk_hseparator_new (),
0, 5, 3, 4,
- GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+ GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
- /* create vertical box */
- vbox = gtk_vbox_new (FALSE, 5);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, TRUE, 0);
+ /* create vertical box */
+ vbox = gtk_vbox_new (FALSE, 5);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
+ gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, TRUE, 0);
- /* window placement */
- if (cfg == NULL) {
- create_window_placement (GTK_BOX (vbox));
- }
+ /* window placement */
+ if (cfg == NULL) {
+ create_window_placement (GTK_BOX (vbox));
+ }
- /* create RESET button */
- create_reset_button (cfg, GTK_BOX (vbox));
+ /* create RESET button */
+ create_reset_button (cfg, GTK_BOX (vbox));
- /* reset flags */
- dirty = FALSE;
- reset = FALSE;
+ /* reset flags */
+ dirty = FALSE;
+ reset = FALSE;
- return vbox;;
+ return vbox;;
}
@@ -136,7 +145,7 @@
gtk_entry_set_text (GTK_ENTRY (gridstr), str);
g_free (str);
- dirty = FALSE;
+ dirty = FALSE;
}
@@ -144,74 +153,61 @@
*/
void sat_pref_layout_ok (GKeyFile *cfg)
{
- if (dirty) {
- /* we have new settings */
- if (cfg != NULL) {
+ if (dirty) {
+ /* we have new settings */
+ if (cfg != NULL) {
g_key_file_set_string (cfg,
MOD_CFG_GLOBAL_SECTION,
MOD_CFG_GRID,
gtk_entry_get_text (GTK_ENTRY (gridstr)));
- }
- else {
+ }
+ else {
sat_cfg_set_str (SAT_CFG_STR_MODULE_GRID,
gtk_entry_get_text (GTK_ENTRY (gridstr)));
- sat_cfg_set_bool (SAT_CFG_BOOL_MAIN_WIN_POS,
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mwin)));
- sat_cfg_set_bool (SAT_CFG_BOOL_MOD_WIN_POS,
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mod)));
+ sat_cfg_set_bool (SAT_CFG_BOOL_MAIN_WIN_POS,
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mwin)));
+ sat_cfg_set_bool (SAT_CFG_BOOL_MOD_WIN_POS,
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mod)));
sat_cfg_set_bool (SAT_CFG_BOOL_MOD_STATE,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (state)));
}
- }
+ }
- else if (reset) {
- /* we have to reset the values to global or default settings */
- if (cfg == NULL) {
+ else if (reset) {
+ /* we have to reset the values to global or default settings */
+ if (cfg == NULL) {
- /* layout */
+ /* layout */
sat_cfg_reset_str (SAT_CFG_STR_MODULE_GRID);
- /* window placement */
- sat_cfg_reset_bool (SAT_CFG_BOOL_MAIN_WIN_POS);
- sat_cfg_reset_bool (SAT_CFG_BOOL_MOD_WIN_POS);
+ /* window placement */
+ sat_cfg_reset_bool (SAT_CFG_BOOL_MAIN_WIN_POS);
+ sat_cfg_reset_bool (SAT_CFG_BOOL_MOD_WIN_POS);
sat_cfg_reset_bool (SAT_CFG_BOOL_MOD_STATE);
}
- else {
+ else {
g_key_file_remove_key ((GKeyFile *)(cfg),
MOD_CFG_GLOBAL_SECTION,
MOD_CFG_GRID,
NULL);
- }
+ }
- }
- dirty = FALSE;
- reset = FALSE;
+ }
+ dirty = FALSE;
+ reset = FALSE;
}
/** \brief Create layout selector. */
static void create_layout_selector (GKeyFile *cfg, GtkTable *table)
{
- GtkWidget *label;
+ GtkWidget *label;
gchar *buffer;
- GtkWidget *image;
- gchar *fname;
+ gchar *thumbfile;
+ guint i,sel=PREDEF_NUM-1;
- /* create header */
- label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_label_set_markup (GTK_LABEL (label),
- _("<b>Select Layout:</b>"));
- gtk_table_attach (GTK_TABLE (table), label, 0, 2, 0, 1,
- GTK_FILL, GTK_SHRINK, 0, 0);
-
- /* layout string */
- label = gtk_label_new (_("Layout code:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
- GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 0);
-
+ /* get the current settings */
if (cfg != NULL) {
buffer = mod_cfg_get_str (cfg,
MOD_CFG_GLOBAL_SECTION,
@@ -222,6 +218,49 @@
buffer = sat_cfg_get_str (SAT_CFG_STR_MODULE_GRID);
}
+ /* create header */
+ label = gtk_label_new (_("Select layout:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+ GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 0);
+
+ /* layout selector */
+ selector = gtk_combo_box_new_text ();
+ gtk_table_attach (GTK_TABLE (table), selector, 1, 3, 0, 1,
+ GTK_FILL, GTK_SHRINK, 0, 0);
+
+ for (i = 0; i < PREDEF_NUM; i++) {
+ /* append default layout string to combo box */
+ gtk_combo_box_append_text (GTK_COMBO_BOX (selector), predef_layout[i][1]);
+
+ /* check if this layout corresponds to the settings */
+ if (!g_ascii_strcasecmp (buffer, predef_layout[i][0])) {
+ sel = i;
+ }
+ }
+
+ /* select settings */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (selector), sel);
+
+ /* connect signal handler */
+ g_signal_connect (selector, "changed", G_CALLBACK (layout_selected_cb), NULL);
+
+
+ /* layout preview thumbnail */
+ thumbfile = thumb_file_from_sel (sel);
+ thumb = gtk_image_new_from_file (thumbfile);
+ g_free (thumbfile);
+ gtk_table_attach (GTK_TABLE (table), thumb, 1, 3, 1, 2,
+ GTK_EXPAND, GTK_EXPAND, 0, 5);
+
+
+ /* layout string */
+ label = gtk_label_new (_("Layout code:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+ GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 0);
+
+
gridstr = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (gridstr), buffer);
g_free (buffer);
@@ -231,24 +270,79 @@
"Consult the user manual for how to create custom layouts "\
"using layout codes."));
+ /* disable if it is a predefined layout */
+ if (sel < PREDEF_NUM-1) {
+ gtk_widget_set_sensitive (gridstr, FALSE);
+ }
+
/* connect changed signal handler */
- g_signal_connect (gridstr, "changed", G_CALLBACK (layout_code_changed), NULL);
+ gridstr_sigid = g_signal_connect (gridstr, "changed", G_CALLBACK (layout_code_changed), NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), gridstr, 1, 2, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), gridstr, 1, 4, 2, 3);
}
-/** \brief Callback to manage radio button clicks.
+
+/** \brief Get thumbnail icon filename from selection ID.
+ * \param sel The ID of the predefined layout or PREDEF_NUM-1 for custom.
+ * \return A newly allocated string containing the full path of the icon.
+ *
+ * This function generates an icon file name from the ID of a predefined
+ * layout. PREDEF_NUM-1 corresponds to the last entry in predef_layout[][],
+ * which is the custom layout. The returned string should be freed when no
+ * longer needed.
+ *
+ * The function checks that sel is within valid range (0...PREDEF_NUM-1). If
+ * sel is outside the range, the custom layout icon is returned.
+ */
+static gchar *thumb_file_from_sel (guint sel)
+{
+ gchar *fname;
+
+ if (sel < PREDEF_NUM) {
+ fname = icon_file_name (predef_layout[sel][2]);
+ }
+ else {
+ fname = icon_file_name (predef_layout[PREDEF_NUM-1][2]);
+ }
+
+ return fname;
+}
+
+
+/** \brief Callback to manage layout selection via combo box.
*
- * This function is called when the user makes a new layout selection,
- * i.e. a radio button is clicked. The function is called for both the
- * newly selected radio button and the de-selected radio button. It must
- * therefore check whether the button is currently active or not
+ * This function is called when the user selects a new layout using the
+ * layout selector combo box. The function updates the thumbnail and the
+ * layout code text entry.
*/
-static void layout_selected_cb (GtkToggleButton *but, gpointer data)
+static void layout_selected_cb (GtkComboBox *combo, gpointer data)
{
+ gint idx;
+ gchar *icon;
+
+ idx = gtk_combo_box_get_active (combo);
+ if (idx < PREDEF_NUM) {
+ dirty = TRUE;
+
+ /* update icon */
+ icon = thumb_file_from_sel (idx);
+ gtk_image_set_from_file (GTK_IMAGE (thumb), icon);
+ g_free (icon);
+
+ /* update layout code, unless Custom is selected */
+ if (idx < PREDEF_NUM-1) {
+ g_signal_handler_block (gridstr, gridstr_sigid);
+ gtk_entry_set_text (GTK_ENTRY (gridstr), predef_layout[idx][0]);
+ g_signal_handler_unblock (gridstr, gridstr_sigid);
+ gtk_widget_set_sensitive (gridstr, FALSE);
+ }
+ else {
+ gtk_widget_set_sensitive (gridstr, TRUE);
+ }
+ }
}
@@ -260,46 +354,46 @@
*/
static void create_window_placement (GtkBox *vbox)
{
- GtkWidget *label;
- GtkTooltips *tips;
+ GtkWidget *label;
+ GtkTooltips *tips;
- /* create header */
- label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_label_set_markup (GTK_LABEL (label),
- _("<b>Window Placements:</b>"));
- gtk_box_pack_start (vbox, label, FALSE, FALSE, 0);
+ /* create header */
+ label = gtk_label_new (NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_markup (GTK_LABEL (label),
+ _("<b>Window Placements:</b>"));
+ gtk_box_pack_start (vbox, label, FALSE, FALSE, 0);
- /* main window setting */
- mwin = gtk_check_button_new_with_label (_("Restore position of main window"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mwin),
- sat_cfg_get_bool (SAT_CFG_BOOL_MAIN_WIN_POS));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mwin,
- _("If you check this button, gpredict will try to "\
- "place the main window at the position it was "\
- "during the last session.\n"\
- "Note that window managers can ignore this request."),
- NULL);
- g_signal_connect (G_OBJECT (mwin), "toggled",
- G_CALLBACK (window_pos_toggle_cb), NULL);
- gtk_box_pack_start (vbox, mwin, FALSE, FALSE, 0);
+ /* main window setting */
+ mwin = gtk_check_button_new_with_label (_("Restore position of main window"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mwin),
+ sat_cfg_get_bool (SAT_CFG_BOOL_MAIN_WIN_POS));
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mwin,
+ _("If you check this button, gpredict will try to "\
+ "place the main window at the position it was "\
+ "during the last session.\n"\
+ "Note that window managers can ignore this request."),
+ NULL);
+ g_signal_connect (G_OBJECT (mwin), "toggled",
+ G_CALLBACK (window_pos_toggle_cb), NULL);
+ gtk_box_pack_start (vbox, mwin, FALSE, FALSE, 0);
- /* module window setting */
- mod = gtk_check_button_new_with_label (_("Restore position of module windows"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mod),
- sat_cfg_get_bool (SAT_CFG_BOOL_MOD_WIN_POS));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mod,
- _("If you check this button, gpredict will try to "\
- "place the module windows at the position they were "\
- "the last time.\n"\
- "Note that window managers can ignore this request."),
- NULL);
- g_signal_connect (G_OBJECT (mod), "toggled",
- G_CALLBACK (window_pos_toggle_cb), NULL);
- gtk_box_pack_start (vbox, mod, FALSE, FALSE, 0);
+ /* module window setting */
+ mod = gtk_check_button_new_with_label (_("Restore position of module windows"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mod),
+ sat_cfg_get_bool (SAT_CFG_BOOL_MOD_WIN_POS));
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mod,
+ _("If you check this button, gpredict will try to "\
+ "place the module windows at the position they were "\
+ "the last time.\n"\
+ "Note that window managers can ignore this request."),
+ NULL);
+ g_signal_connect (G_OBJECT (mod), "toggled",
+ G_CALLBACK (window_pos_toggle_cb), NULL);
+ gtk_box_pack_start (vbox, mod, FALSE, FALSE, 0);
/* module state */
state = gtk_check_button_new_with_label (_("Restore the state of modules when reopened (docked or window)"));
@@ -325,32 +419,32 @@
*/
static void create_reset_button (GKeyFile *cfg, GtkBox *vbox)
{
- GtkWidget *button;
- GtkWidget *butbox;
- GtkTooltips *tips;
+ GtkWidget *button;
+ GtkWidget *butbox;
+ GtkTooltips *tips;
- button = gtk_button_new_with_label (_("Reset"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (reset_cb), cfg);
+ button = gtk_button_new_with_label (_("Reset"));
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (reset_cb), cfg);
- tips = gtk_tooltips_new ();
- if (cfg == NULL) {
- gtk_tooltips_set_tip (tips, button,
- _("Reset settings to the default values."),
- NULL);
- }
- else {
- gtk_tooltips_set_tip (tips, button,
- _("Reset module settings to the global values."),
- NULL);
- }
+ tips = gtk_tooltips_new ();
+ if (cfg == NULL) {
+ gtk_tooltips_set_tip (tips, button,
+ _("Reset settings to the default values."),
+ NULL);
+ }
+ else {
+ gtk_tooltips_set_tip (tips, button,
+ _("Reset module settings to the global values."),
+ NULL);
+ }
- butbox = gtk_hbutton_box_new ();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (butbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end (GTK_BOX (butbox), button, FALSE, TRUE, 10);
+ butbox = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (butbox), GTK_BUTTONBOX_END);
+ gtk_box_pack_end (GTK_BOX (butbox), button, FALSE, TRUE, 10);
- gtk_box_pack_end (vbox, butbox, FALSE, TRUE, 0);
+ gtk_box_pack_end (vbox, butbox, FALSE, TRUE, 0);
}
@@ -366,38 +460,47 @@
*/
static void reset_cb (GtkWidget *button, gpointer cfg)
{
- gint idx;
+ guint i,sel=PREDEF_NUM-1;
gchar *buffer;
- /* views */
- if (cfg == NULL) {
- /* global mode, get defaults */
+ /* views */
+ if (cfg == NULL) {
+ /* global mode, get defaults */
buffer = sat_cfg_get_str_def (SAT_CFG_STR_MODULE_GRID);
gtk_entry_set_text (GTK_ENTRY (gridstr), buffer);
- g_free (buffer);
- }
- else {
- /* local mode, get global value */
+ }
+ else {
+ /* local mode, get global value */
buffer = sat_cfg_get_str (SAT_CFG_STR_MODULE_GRID);
gtk_entry_set_text (GTK_ENTRY (gridstr), buffer);
- g_free (buffer);
- }
+ }
- /* window placement settings */
- if (cfg == NULL) {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mwin),
- sat_cfg_get_bool_def (SAT_CFG_BOOL_MAIN_WIN_POS));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mod),
- sat_cfg_get_bool_def (SAT_CFG_BOOL_MOD_WIN_POS));
+ /* findcombo box setting */
+ for (i = 0; i < PREDEF_NUM; i++) {
+ /* check if this layout corresponds to the settings */
+ if (!g_ascii_strcasecmp (buffer, predef_layout[i][0])) {
+ sel = i;
+ }
+ }
+ gtk_combo_box_set_active (GTK_COMBO_BOX(selector),sel);
+ g_free (buffer);
+
+
+ /* window placement settings */
+ if (cfg == NULL) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mwin),
+ sat_cfg_get_bool_def (SAT_CFG_BOOL_MAIN_WIN_POS));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mod),
+ sat_cfg_get_bool_def (SAT_CFG_BOOL_MOD_WIN_POS));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state),
sat_cfg_get_bool_def (SAT_CFG_BOOL_MOD_STATE));
}
- /* reset flags */
- reset = TRUE;
- dirty = FALSE;
+ /* reset flags */
+ reset = TRUE;
+ dirty = FALSE;
}
@@ -406,7 +509,7 @@
/** \brief Toggle window positioning settings. */
static void window_pos_toggle_cb (GtkWidget *toggle, gpointer data)
{
- dirty = TRUE;
+ dirty = TRUE;
}
/** \brief Manage layout code changes.
@@ -432,6 +535,10 @@
case '0' ... '9':
case ';':
dirty = TRUE;
+ /* ensure combo box is set to custom */
+ if (gtk_combo_box_get_active (GTK_COMBO_BOX(selector)) != PREDEF_NUM-1) {
+ gtk_combo_box_set_active (GTK_COMBO_BOX(selector), PREDEF_NUM-1);
+ }
break;
default:
gdk_beep ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-26 00:24:13
|
Revision: 555
http://gpredict.svn.sourceforge.net/gpredict/?rev=555&view=rev
Author: csete
Date: 2009-12-26 00:21:15 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/sat-pref-layout.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-25 15:16:44 UTC (rev 554)
+++ trunk/ChangeLog 2009-12-26 00:21:15 UTC (rev 555)
@@ -1,3 +1,9 @@
+2009-12-25 Alexandru Csete <oz9aec at gmail.com>
+
+ * pixmaps/icons:
+ Added thumbnails for predefined layouts.
+
+
2009-12-24 Alexandru Csete <oz9aec at gmail.com>
* data/satdata:
@@ -2,3 +8,3 @@
* data/trsp:
- Added TLE and transponder data for XW-1 / HO68.
+ Added TLE and transponder data for XW-1 / HO-68.
Modified: trunk/src/sat-pref-layout.c
===================================================================
--- trunk/src/sat-pref-layout.c 2009-12-25 15:16:44 UTC (rev 554)
+++ trunk/src/sat-pref-layout.c 2009-12-26 00:21:15 UTC (rev 555)
@@ -61,7 +61,22 @@
static void layout_code_changed (GtkWidget *widget, gpointer data);
+#define PREDEF_NUM 10
+gchar *predef_layout[PREDEF_NUM][3] = {
+ { "1;0;2;0;1;2;0;1;1;2;3;1;2;1;2", N_("World map, polar and single sat (default)"), "gpredict-layout-00.png" },
+ { "1;0;2;0;1", N_("World map"), "gpredict-layout-01.png" },
+ { "1;0;2;0;1", N_("Table"), "gpredict-layout-02.png" },
+ { "1;0;2;0;2;0;0;2;2;3", N_("World map and table"), "gpredict-layout-03.png" },
+ { "2;0;1;0;1;3;1;2;0;1", N_("Polar and single sat"), "gpredict-layout-04.png" },
+ { "2;0;1;0;1;4;1;2;0;1", N_("Polar and upcoming passes"), "gpredict-layout-05.png" },
+ { "1;0;3;0;4;0;0;3;4;6;2;0;1;6;8;3;1;2;6;8;4;2;3;6;8", N_("All views (narrow)"), "gpredict-layout-06.png" },
+ { "1;0;3;0;3;0;0;3;3;4;2;3;4;0;2;4;3;4;2;3;3;3;4;3;4", N_("All views (wide)"), "gpredict-layout-07.png"},
+ { "1;0;3;0;3;0;0;3;3;4;2;3;4;0;2;3;3;4;2;4", N_("Map, table, polar and single sat (wide)"), "gpredict-layout-08.png"},
+ { "", N_("Custom"), "gpredict-layout-99.png" }
+};
+
+
/** \brief Create and initialise widgets for the layout view preferences tab.
*
* The widgets must be preloaded with values from config. If a config value
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-25 15:16:50
|
Revision: 554
http://gpredict.svn.sourceforge.net/gpredict/?rev=554&view=rev
Author: csete
Date: 2009-12-25 15:16:44 +0000 (Fri, 25 Dec 2009)
Log Message:
-----------
Added thumbnails for predefined layouts.
Modified Paths:
--------------
trunk/pixmaps/icons/Makefile.am
Added Paths:
-----------
trunk/pixmaps/icons/gpredict-layout-00.png
trunk/pixmaps/icons/gpredict-layout-01.png
trunk/pixmaps/icons/gpredict-layout-02.png
trunk/pixmaps/icons/gpredict-layout-03.png
trunk/pixmaps/icons/gpredict-layout-04.png
trunk/pixmaps/icons/gpredict-layout-05.png
trunk/pixmaps/icons/gpredict-layout-06.png
trunk/pixmaps/icons/gpredict-layout-07.png
trunk/pixmaps/icons/gpredict-layout-08.png
trunk/pixmaps/icons/gpredict-layout-99.png
Modified: trunk/pixmaps/icons/Makefile.am
===================================================================
--- trunk/pixmaps/icons/Makefile.am 2009-12-24 16:28:06 UTC (rev 553)
+++ trunk/pixmaps/icons/Makefile.am 2009-12-25 15:16:44 UTC (rev 554)
@@ -9,6 +9,16 @@
gpredict-clock-small.png \
gpredict-crash.png \
gpredict-icon.png \
+ gpredict-layout-00.png \
+ gpredict-layout-01.png \
+ gpredict-layout-02.png \
+ gpredict-layout-03.png \
+ gpredict-layout-04.png \
+ gpredict-layout-05.png \
+ gpredict-layout-06.png \
+ gpredict-layout-07.png \
+ gpredict-layout-08.png \
+ gpredict-layout-99.png \
gpredict-leds.png \
gpredict-mod-attach.png \
gpredict-mod-close.png \
Added: trunk/pixmaps/icons/gpredict-layout-00.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-00.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-01.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-02.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-03.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-03.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-04.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-04.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-05.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-05.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-06.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-06.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-07.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-07.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-08.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-08.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixmaps/icons/gpredict-layout-99.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-layout-99.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-24 16:28:13
|
Revision: 553
http://gpredict.svn.sourceforge.net/gpredict/?rev=553&view=rev
Author: csete
Date: 2009-12-24 16:28:06 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Removed obsolete icons.
Modified Paths:
--------------
trunk/pixmaps/icons/Makefile.am
Modified: trunk/pixmaps/icons/Makefile.am
===================================================================
--- trunk/pixmaps/icons/Makefile.am 2009-12-24 16:02:16 UTC (rev 552)
+++ trunk/pixmaps/icons/Makefile.am 2009-12-24 16:28:06 UTC (rev 553)
@@ -16,10 +16,6 @@
gpredict-mod-detach.png \
gpredict-mod-popup.png \
gpredict-notebook.png \
- gpredict-layout-1.png \
- gpredict-layout-2.png \
- gpredict-layout-3.png \
- gpredict-layout-4.png \
gpredict-oscilloscope.png \
gpredict-oscilloscope-small.png \
gpredict-planner.png \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-24 16:02:27
|
Revision: 552
http://gpredict.svn.sourceforge.net/gpredict/?rev=552&view=rev
Author: csete
Date: 2009-12-24 16:02:16 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Removed obsolete icons.
Removed Paths:
-------------
trunk/pixmaps/icons/gpredict-layout-1.png
trunk/pixmaps/icons/gpredict-layout-2.png
trunk/pixmaps/icons/gpredict-layout-3.png
trunk/pixmaps/icons/gpredict-layout-4.png
Deleted: trunk/pixmaps/icons/gpredict-layout-1.png
===================================================================
(Binary files differ)
Deleted: trunk/pixmaps/icons/gpredict-layout-2.png
===================================================================
(Binary files differ)
Deleted: trunk/pixmaps/icons/gpredict-layout-3.png
===================================================================
(Binary files differ)
Deleted: trunk/pixmaps/icons/gpredict-layout-4.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-24 13:53:45
|
Revision: 551
http://gpredict.svn.sourceforge.net/gpredict/?rev=551&view=rev
Author: csete
Date: 2009-12-24 13:53:36 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-24 13:00:16 UTC (rev 550)
+++ trunk/ChangeLog 2009-12-24 13:53:36 UTC (rev 551)
@@ -1,3 +1,10 @@
+2009-12-24 Alexandru Csete <oz9aec at gmail.com>
+
+ * data/satdata:
+ * data/trsp:
+ Added TLE and transponder data for XW-1 / HO68.
+
+
2009-12-21 Alexandru Csete <oz9aec at gmail.com>
* doc/man/gpredict.1.in:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-24 13:00:31
|
Revision: 550
http://gpredict.svn.sourceforge.net/gpredict/?rev=550&view=rev
Author: csete
Date: 2009-12-24 13:00:16 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Added transponder data for XW-1 / HO-68.
Added Paths:
-----------
trunk/data/trsp/36122.trsp
Added: trunk/data/trsp/36122.trsp
===================================================================
--- trunk/data/trsp/36122.trsp (rev 0)
+++ trunk/data/trsp/36122.trsp 2009-12-24 13:00:16 UTC (rev 550)
@@ -0,0 +1,22 @@
+[CW Beacon]
+DOWN_LOW=435790000
+MODE=CW
+
+[Mode V/U FM]
+DOWN_LOW=435675000
+UP_LOW=145825000
+MODE=FM
+PL=67
+
+[Mode V/U Linear]
+DOWN_LOW=435765000
+DOWN_HIGH=435715000
+UP_LOW=145925000
+UP_HIGH=145975000
+INVERT=true
+
+[Mode V/U BBS (1k2 AFSK)]
+DOWN_LOW=145825000
+UP_LOW=435675000
+MODE=AFSK
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fi...@us...> - 2009-12-24 12:55:30
|
Revision: 548
http://gpredict.svn.sourceforge.net/gpredict/?rev=548&view=rev
Author: fillods
Date: 2009-12-24 12:55:12 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
- Clean hangup with rigctld/rotctld
- Misc fr.po update
Modified Paths:
--------------
trunk/po/fr.po
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2009-12-24 10:36:39 UTC (rev 547)
+++ trunk/po/fr.po 2009-12-24 12:55:12 UTC (rev 548)
@@ -359,7 +359,7 @@
#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97
#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:837
msgid "Show next pass"
-msgstr "Montre prochain passage"
+msgstr "Montre le prochain passage"
#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108
#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851
@@ -1794,22 +1794,20 @@
msgstr ""
#: ../src/gtk-single-sat.c:73
-#, fuzzy
msgid "Sig. Loss"
-msgstr "Perte"
+msgstr "Perte Sig."
#: ../src/gtk-single-sat.c:74
msgid "Sig. Delay"
-msgstr ""
+msgstr "Délai Sig."
#: ../src/gtk-single-sat.c:75
msgid "Mean Anom."
msgstr ""
#: ../src/gtk-single-sat.c:77
-#, fuzzy
msgid "Orbit Num."
-msgstr "Num Orbite"
+msgstr "Num. Orbite"
#: ../src/gtk-single-sat.c:84
msgid "Azimuth of the satellite"
@@ -2272,7 +2270,7 @@
"Satellites skipped:\t 0\n"
"Missing Satellites:\t 0\n"
msgstr ""
-"Satellites mis-à-jour:\t 0\n"
+"Satellites mis à jour:\t 0\n"
"Satellites sautés: \t 0\n"
"Satellites manquants: \t 0\n"
@@ -3212,9 +3210,8 @@
msgstr "Info Satellite"
#: ../src/sat-info.c:427
-#, fuzzy
msgid "No transponders"
-msgstr "Transpondeurs"
+msgstr "Aucun Transpondeur"
#. we have a range
#: ../src/sat-info.c:454
@@ -5029,10 +5026,10 @@
"Missing Satellites:\t %d\n"
"New Satellites:\t\t %d"
msgstr ""
-"Satellites mis-à-jour:\t %d\n"
+"Satellites mis à jour:\t %d\n"
"Satellites sautés: \t %d\n"
"Satellites manquants: \t %d\n"
-"Nouveaux Satellites: \t %d"
+"Nouveaux satellites: \t %d"
#: ../src/tle-update.c:337
#, c-format
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2009-12-24 10:36:39 UTC (rev 547)
+++ trunk/src/gtk-rig-ctrl.c 2009-12-24 12:55:12 UTC (rev 548)
@@ -1860,13 +1860,13 @@
if (conf->ptt == PTT_TYPE_CAT) {
/* send command get_ptt (t) */
- buff = g_strdup_printf ("t");
- size = 1;
+ buff = g_strdup_printf ("t\x0aq\x0a");
+ size = 4;
}
else {
/* send command \get_dcd */
- buff = g_strdup_printf ("%c",0x8b);
- size = 1;
+ buff = g_strdup_printf ("%c\x0aq\x0a",0x8b);
+ size = 4;
}
written = send(sock, buff, size, 0);
@@ -1982,9 +1982,9 @@
}
/* send command */
- buff = g_strdup_printf ("F %10.0f", freq);
+ buff = g_strdup_printf ("F %10.0f\x0aq\x0a", freq);
- size = 12;
+ size = 15;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -2065,9 +2065,9 @@
}
/* send command */
- buff = g_strdup_printf ("f");
+ buff = g_strdup_printf ("f\x0aq\x0a");
- size = 1;
+ size = 4;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -2178,23 +2178,23 @@
/* prepare command */
switch (vfo) {
case VFO_A:
- buff = g_strdup_printf ("V VFOA");
- size = 6;
+ buff = g_strdup_printf ("V VFOA\x0aq\x0a");
+ size = 9;
break;
case VFO_B:
- buff = g_strdup_printf ("V VFOB");
- size = 6;
+ buff = g_strdup_printf ("V VFOB\x0aq\x0a");
+ size = 9;
break;
case VFO_MAIN:
- buff = g_strdup_printf ("V Main");
- size = 6;
+ buff = g_strdup_printf ("V Main\x0aq\x0a");
+ size = 9;
break;
case VFO_SUB:
- buff = g_strdup_printf ("V Sub");
- size = 5;
+ buff = g_strdup_printf ("V Sub\x0aq\x0a");
+ size = 8;
break;
default:
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2009-12-24 10:36:39 UTC (rev 547)
+++ trunk/src/gtk-rot-ctrl.c 2009-12-24 12:55:12 UTC (rev 548)
@@ -991,9 +991,9 @@
}
/* send command */
- buff = g_strdup_printf ("p");
+ buff = g_strdup_printf ("p\x0aq\x0a");
- size = 1;
+ size = 4;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -1114,9 +1114,9 @@
/* send command */
g_ascii_formatd (azstr, 8, "%7.2f", az);
g_ascii_formatd (elstr, 8, "%7.2f", el);
- buff = g_strdup_printf ("P %s %s", azstr, elstr);
+ buff = g_strdup_printf ("P %s %s\x0aq\x0a", azstr, elstr);
- size = 17;
+ size = 20;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-24 12:55:20
|
Revision: 549
http://gpredict.svn.sourceforge.net/gpredict/?rev=549&view=rev
Author: csete
Date: 2009-12-24 12:55:13 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Added PL tone for SO-67
Modified Paths:
--------------
trunk/data/trsp/35870.trsp
Modified: trunk/data/trsp/35870.trsp
===================================================================
--- trunk/data/trsp/35870.trsp 2009-12-24 12:55:12 UTC (rev 548)
+++ trunk/data/trsp/35870.trsp 2009-12-24 12:55:13 UTC (rev 549)
@@ -2,6 +2,7 @@
DOWN_LOW=435345000
UP_LOW=145875000
MODE=FMN
+PL=233.6
[Voice Beacon]
DOWN_LOW=435300000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-24 10:36:50
|
Revision: 547
http://gpredict.svn.sourceforge.net/gpredict/?rev=547&view=rev
Author: csete
Date: 2009-12-24 10:36:39 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Updated satellite database with new satellites.
Modified Paths:
--------------
trunk/data/satdata/amateur.cat
trunk/data/satdata/glo-ops.cat
trunk/data/satdata/gps-ops.cat
trunk/data/satdata/intelsat.cat
trunk/data/satdata/resource.cat
trunk/data/satdata/satellites.dat
trunk/data/satdata/science.cat
trunk/data/satdata/tdrss.cat
trunk/data/satdata/tle-new.cat
Modified: trunk/data/satdata/amateur.cat
===================================================================
--- trunk/data/satdata/amateur.cat 2009-12-24 10:33:12 UTC (rev 546)
+++ trunk/data/satdata/amateur.cat 2009-12-24 10:36:39 UTC (rev 547)
@@ -65,3 +65,4 @@
35693
35694
35870
+36122
Modified: trunk/data/satdata/glo-ops.cat
===================================================================
--- trunk/data/satdata/glo-ops.cat 2009-12-24 10:33:12 UTC (rev 546)
+++ trunk/data/satdata/glo-ops.cat 2009-12-24 10:36:39 UTC (rev 547)
@@ -1,5 +1,4 @@
Glonass Operational
-28112
28509
28915
28916
Modified: trunk/data/satdata/gps-ops.cat
===================================================================
--- trunk/data/satdata/gps-ops.cat 2009-12-24 10:33:12 UTC (rev 546)
+++ trunk/data/satdata/gps-ops.cat 2009-12-24 10:36:39 UTC (rev 547)
@@ -1,7 +1,6 @@
GPS Operational
20959
21552
-21890
22014
22108
22700
Modified: trunk/data/satdata/intelsat.cat
===================================================================
--- trunk/data/satdata/intelsat.cat 2009-12-24 10:33:12 UTC (rev 546)
+++ trunk/data/satdata/intelsat.cat 2009-12-24 10:36:39 UTC (rev 547)
@@ -51,3 +51,5 @@
32253
32388
32951
+36097
+36106
Modified: trunk/data/satdata/resource.cat
===================================================================
--- trunk/data/satdata/resource.cat 2009-12-24 10:33:12 UTC (rev 546)
+++ trunk/data/satdata/resource.cat 2009-12-24 10:36:39 UTC (rev 547)
@@ -75,8 +75,10 @@
33412
33446
33456
+34839
35578
35681
35931
35946
36036
+36110
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2009-12-24 10:33:12 UTC (rev 546)
+++ trunk/data/satdata/satellites.dat 2009-12-24 10:36:39 UTC (rev 547)
@@ -1,8659 +1,8701 @@
-[28082]
+[25260]
VERSION=1.1
-NAME=ZHONGXING-20
-NICKNAME=ZHONGXING-20
-TLE1=1 28082U 03052A 09336.74327373 -.00000275 00000-0 10000-3 0 8928
-TLE2=2 28082 0.0562 273.6372 0002047 14.7054 149.0704 1.00270767 22211
+NAME=SPOT 4
+NICKNAME=SPOT 4
+TLE1=1 25260U 98017A 09357.68545683 .00000103 00000-0 69855-4 0 7695
+TLE2=2 25260 98.6788 67.1135 0001446 82.2245 69.4444 14.19350937609226
-[35004]
+[26390]
VERSION=1.1
-NAME=POLYSAT CP6
-NICKNAME=POLYSAT CP6
-TLE1=1 35004U 09028D 09337.23243077 .00006403 00000-0 15149-3 0 1528
-TLE2=2 35004 40.4659 306.6499 0025486 345.8712 14.1385 15.41780882 30429
+NAME=SIRIUS-1
+NICKNAME=SIRIUS-1
+TLE1=1 26390U 00035A 09357.63002396 .00000000 00000-0 10000-3 0 6071
+TLE2=2 26390 61.3550 253.7220 2678665 269.6705 60.1348 1.00282572 34756
-[24714]
+[24971]
VERSION=1.1
-NAME=NAHUEL 1A
-NICKNAME=NAHUEL 1A
-TLE1=1 24714U 97002B 09335.40433101 -.00000239 00000-0 10000-3 0 9777
-TLE2=2 24714 2.1777 76.8245 0004237 162.8245 264.5144 1.00269701 47025
+NAME=IRS-1D
+NICKNAME=IRS-1D
+TLE1=1 24971U 97057A 09357.65537844 .00000031 00000-0 25513-4 0 9564
+TLE2=2 24971 98.2175 24.3663 0055154 89.5618 271.1867 14.32965075639965
-[25482]
+[25418]
VERSION=1.1
-NAME=ORBCOMM FM28 [-]
-NICKNAME=ORBCOMM FM28 [-]
-TLE1=1 25482U 98053H 09336.24686364 .00000290 00000-0 16471-3 0 7548
-TLE2=2 25482 45.0122 258.3683 0002534 102.9982 257.1145 14.30116300584345
+NAME=ORBCOMM FM15 [+]
+NICKNAME=ORBCOMM FM15 [+]
+TLE1=1 25418U 98046F 09357.71984732 -.00000049 00000-0 36019-4 0 2688
+TLE2=2 25418 45.0003 99.8022 0003926 226.2983 133.7523 14.27683367593778
-[25732]
+[25285]
VERSION=1.1
-NAME=CZ-4B R/B
-NICKNAME=CZ-4B R/B
-TLE1=1 25732U 99025C 09336.49939442 -.00000008 00000-0 17190-4 0 2612
-TLE2=2 25732 98.6657 307.4971 0038279 38.5241 321.8645 14.17195662546540
+NAME=IRIDIUM 62 [+]
+NICKNAME=IRIDIUM 62 [+]
+TLE1=1 25285U 98021A 09357.17150878 -.00000446 00000-0 -16637-3 0 8040
+TLE2=2 25285 86.3957 286.1688 0002389 80.0729 280.0738 14.34212032613290
-[28353]
+[25354]
VERSION=1.1
-NAME=SL-16 R/B
-NICKNAME=SL-16 R/B
-TLE1=1 28353U 04021B 09336.17511281 -.00000337 00000-0 -15254-3 0 5097
-TLE2=2 28353 70.9980 92.7132 0003035 43.4566 316.6806 14.13909945282859
+NAME=CHINASTAR 1
+NICKNAME=CHINASTAR 1
+TLE1=1 25354U 98033A 09356.94829256 .00000000 00000-0 10000-3 0 6991
+TLE2=2 25354 0.0078 245.5403 0001939 32.1703 242.8177 1.00267923 46929
-[28493]
+[27811]
VERSION=1.1
-NAME=NANOSAT-1
-NICKNAME=NANOSAT-1
-TLE1=1 28493U 04049B 09336.88812623 .00000178 00000-0 37995-4 0 4989
-TLE2=2 28493 98.2870 300.5937 0005908 82.4635 277.7264 14.70347592265953
+NAME=HELLAS-SAT 2
+NICKNAME=HELLAS-SAT 2
+TLE1=1 27811U 03020A 09355.87021866 .00000169 00000-0 10000-3 0 311
+TLE2=2 27811 0.0077 293.1284 0002099 323.8590 185.8406 1.00273857 24117
-[24653]
+[23571]
VERSION=1.1
-NAME=MEASAT-2
-NICKNAME=MEASAT-2
-TLE1=1 24653U 96063B 09336.87536735 .00000142 00000-0 10000-3 0 700
-TLE2=2 24653 1.9787 76.9365 0000821 203.2325 160.4990 0.99907737 47863
+NAME=INTELSAT 706 (IS-706)
+NICKNAME=INTELSAT 706 (IS-706)
+TLE1=1 23571U 95023A 09355.83580892 .00000102 00000-0 10000-3 0 350
+TLE2=2 23571 0.0161 8.3428 0002589 252.0634 185.8612 1.00273071 53458
-[24871]
+[12389]
VERSION=1.1
-NAME=IRIDIUM 920 [-]
-NICKNAME=IRIDIUM 920 [-]
-TLE1=1 24871U 97034C 09336.39257692 .00000083 00000-0 20932-4 0 4579
-TLE2=2 24871 86.3964 85.3772 0013490 36.9272 323.2848 14.38085892650401
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 12389U 81033B 09356.58820194 .00003028 00000-0 98897-4 0 5341
+TLE2=2 12389 82.9172 156.5111 0404181 289.5131 66.2855 14.78151689464827
-[27414]
+[28485]
VERSION=1.1
-NAME=NSS-7
-NICKNAME=NSS-7
-TLE1=1 27414U 02019A 09334.80921146 -.00000145 00000-0 10000-3 0 4349
-TLE2=2 27414 0.0240 185.5364 0002637 50.1669 103.4378 1.00271304 27994
+NAME=SWIFT
+NICKNAME=SWIFT
+TLE1=1 28485U 04047A 09357.11531699 .00000663 00000-0 24339-4 0 4660
+TLE2=2 28485 20.5609 342.7203 0014516 237.9395 121.9640 14.92624968277939
-[18362]
+[29107]
VERSION=1.1
-NAME=OSCAR 29
-NICKNAME=OSCAR 29
-TLE1=1 18362U 87080B 09336.74013157 .00000069 00000-0 10000-3 0 8068
-TLE2=2 18362 90.3398 239.1486 0109529 69.1592 292.1234 13.43705110 89033
+NAME=CLOUDSAT
+NICKNAME=CLOUDSAT
+TLE1=1 29107U 06016A 09357.31683233 .00000241 00000-0 63598-4 0 1630
+TLE2=2 29107 98.2008 298.6270 0001349 87.0035 273.1298 14.57116666194416
-[25983]
+[25736]
VERSION=1.1
-NAME=ORBCOMM FM33 [-]
-NICKNAME=ORBCOMM FM33 [-]
-TLE1=1 25983U 99065D 09336.70517003 .00000385 00000-0 20615-3 0 6934
-TLE2=2 25983 45.0313 89.4281 0003358 237.1725 122.8798 14.28823352521376
+NAME=MUBLCOM
+NICKNAME=MUBLCOM
+TLE1=1 25736U 99026B 09357.33414558 .00000194 00000-0 66917-4 0 9083
+TLE2=2 25736 97.7745 272.4242 0005135 186.7537 173.3594 14.44620246558102
-[25407]
+[28496]
VERSION=1.1
-NAME=SL-16 R/B
-NICKNAME=SL-16 R/B
-TLE1=1 25407U 98045B 09337.05587924 .00000247 00000-0 15073-3 0 1990
-TLE2=2 25407 71.0110 65.7346 0006010 80.3995 279.7792 14.15510215586560
+NAME=ESSAIM-3
+NICKNAME=ESSAIM-3
+TLE1=1 28496U 04049E 09342.61919833 -.00000015 00000-0 60751-5 0 5878
+TLE2=2 28496 98.2942 308.6273 0009789 59.1704 301.0444 14.70161453266892
-[31573]
+[902]
VERSION=1.1
-NAME=GLOBALSTAR M069
-NICKNAME=GLOBALSTAR M069
-TLE1=1 31573U 07020C 09336.55511247 -.00000086 00000-0 10000-3 0 3992
-TLE2=2 31573 51.9934 182.8125 0000907 113.1284 246.9693 12.62734893117716
+NAME=CALSPHERE 2
+NICKNAME=CALSPHERE 2
+TLE1=1 00902U 64063E 09357.33409409 .00000075 00000-0 10000-3 0 2366
+TLE2=2 00902 90.1537 333.1300 0019949 61.1634 299.1510 13.52470315 42930
-[26867]
+[23711]
VERSION=1.1
-NAME=MOLNIYA 3-51
-NICKNAME=MOLNIYA 3-51
-TLE1=1 26867U 01030A 09335.69947226 .00000862 00000-0 00000+0 0 73
-TLE2=2 26867 64.0872 183.7567 6970053 265.0325 45.9717 2.00607738 61315
+NAME=SURFSAT
+NICKNAME=SURFSAT
+TLE1=1 23711U 95059B 09357.22918175 -.00000108 00000-0 -13151-3 0 4058
+TLE2=2 23711 100.3094 354.4268 0368472 47.3229 315.8219 13.12570635677239
-[23546]
+[24842]
VERSION=1.1
-NAME=ORBCOMM FM02 [+]
-NICKNAME=ORBCOMM FM02 [+]
-TLE1=1 23546U 95017B 09336.01491591 .00000248 00000-0 63858-4 0 4211
-TLE2=2 23546 69.9736 108.7698 0011256 330.2608 29.7891 14.61273651778608
+NAME=IRIDIUM 911 [-]
+NICKNAME=IRIDIUM 911 [-]
+TLE1=1 24842U 97030G 09356.75069805 .00000171 00000-0 44736-4 0 5388
+TLE2=2 24842 86.4444 55.3661 0015572 146.7377 213.4804 14.43207040658481
-[25789]
+[22220]
VERSION=1.1
-NAME=QUIKSCAT
-NICKNAME=QUIKSCAT
-TLE1=1 25789U 99034A 09336.54126340 .00000008 00000-0 21128-4 0 5859
-TLE2=2 25789 98.6282 163.4552 0001085 103.1132 257.0180 14.26794321544464
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 22220U 92076B 09357.48417730 -.00000207 00000-0 -80502-4 0 687
+TLE2=2 22220 70.9990 50.1099 0011222 121.8011 238.4232 14.16147382883864
-[9478]
+[32388]
VERSION=1.1
-NAME=MARISAT 2
-NICKNAME=MARISAT 2
-TLE1=1 09478U 76101A 09333.48317595 -.00000146 00000-0 10000-3 0 2082
-TLE2=2 09478 13.2596 354.8709 0101014 203.9888 155.5160 0.97590681 64500
+NAME=HORIZONS 2
+NICKNAME=HORIZONS 2
+TLE1=1 32388U 07063B 09356.36105843 -.00000235 00000-0 10000-3 0 3116
+TLE2=2 32388 0.0143 286.8207 0001952 2.7181 217.4299 1.00271073 7500
-[28902]
+[25772]
VERSION=1.1
-NAME=TELKOM 2
-NICKNAME=TELKOM 2
-TLE1=1 28902U 05046A 09334.64150244 -.00000339 00000-0 10000-3 0 7337
-TLE2=2 28902 0.0368 150.0303 0001601 109.3761 159.1817 1.00268907 14827
+NAME=GLOBALSTAR M047
+NICKNAME=GLOBALSTAR M047
+TLE1=1 25772U 99031C 09357.79835264 -.00000086 00000-0 10000-3 0 1590
+TLE2=2 25772 51.9929 162.3646 0002619 113.9001 246.2140 12.62276358486112
-[33056]
+[15427]
VERSION=1.1
-NAME=TURKSAT 3A
-NICKNAME=TURKSAT 3A
-TLE1=1 33056U 08030B 09333.97856993 .00000170 00000-0 10000-3 0 2638
-TLE2=2 33056 0.0109 7.0116 0003191 231.5903 224.6824 1.00273889 5484
+NAME=NOAA 9 [P]
+NICKNAME=NOAA 9 [P]
+TLE1=1 15427U 84123A 09357.04432480 -.00000219 00000-0 -91234-4 0 9465
+TLE2=2 15427 98.4542 344.8979 0014146 233.7846 126.2043 14.15335055291671
-[29644]
+[28190]
VERSION=1.1
-NAME=AMC-18
-NICKNAME=AMC-18
-TLE1=1 29644U 06054B 09336.24233444 -.00000071 00000-0 10000-3 0 5424
-TLE2=2 29644 0.0500 57.4425 0003219 194.1315 161.9460 1.00271690 10989
+NAME=GPS BIIR-11 (DASS)
+NICKNAME=GPS BIIR-11 (DASS)
+TLE1=1 28190U 04009A 09356.37693301 .00000086 00000-0 10000-3 0 3787
+TLE2=2 28190 54.8689 154.8682 0060249 347.1001 12.7314 2.00562749 42226
-[25113]
+[36113]
VERSION=1.1
-NAME=ORBCOMM FM10 [+]
-NICKNAME=ORBCOMM FM10 [+]
-TLE1=1 25113U 97084B 09336.21918402 .00000015 00000-0 55057-4 0 1161
-TLE2=2 25113 45.0225 286.6262 0004474 208.7725 151.2875 14.34425040624372
+NAME=COSMOS 2457 [GLONASS-M]
+NICKNAME=COSMOS 2457 [GLONASS-M]
+TLE1=1 36113U 09070C 09357.70000000 -.00000032 00000-0 00000+0 0 212
+TLE2=2 36113 64.7880 277.5630 0042744 231.5060 316.6160 2.14594994 197
-[24277]
+[25288]
VERSION=1.1
-NAME=MIDORI (ADEOS)
-NICKNAME=MIDORI (ADEOS)
-TLE1=1 24277U 96046A 09337.44578686 -.00000012 00000-0 12031-4 0 2221
-TLE2=2 24277 98.3881 295.3309 0001721 104.3628 255.7744 14.28604359693090
+NAME=IRIDIUM 65 [+]
+NICKNAME=IRIDIUM 65 [+]
+TLE1=1 25288U 98021D 09357.05099713 -.00000480 00000-0 -17848-3 0 8032
+TLE2=2 25288 86.3956 286.1922 0001959 74.0650 286.0726 14.34212761613271
-[28935]
+[25922]
VERSION=1.1
-NAME=ECHOSTAR 10
-NICKNAME=ECHOSTAR 10
-TLE1=1 28935U 06003A 09335.26370907 -.00000034 00000-0 10000-3 0 8047
-TLE2=2 28935 0.0363 20.0176 0002054 232.8417 162.1487 1.00272599 13935
+NAME=GALAXY 27 (G-27)
+NICKNAME=GALAXY 27 (G-27)
+TLE1=1 25922U 99052A 09354.72658137 .00000072 00000-0 10000-3 0 5781
+TLE2=2 25922 0.0109 26.9070 0002122 252.3648 302.7232 1.00272051 37493
-[12054]
+[26766]
VERSION=1.1
-NAME=COSMOS 1220
-NICKNAME=COSMOS 1220
-TLE1=1 12054U 80089A 09336.75569648 .00002211 00000-0 99351-4 0 1447
-TLE2=2 12054 64.9752 114.9713 0034849 87.6124 272.8974 15.23560283493908
+NAME=INTELSAT 10 (IS-10)
+NICKNAME=INTELSAT 10 (IS-10)
+TLE1=1 26766U 01019A 09354.88544038 -.00000010 00000-0 10000-3 0 4888
+TLE2=2 26766 0.0287 202.1586 0002476 48.2352 226.4400 1.00271691 31541
-[19688]
+[24841]
VERSION=1.1
-NAME=ASTRA 1A
-NICKNAME=ASTRA 1A
-TLE1=1 19688U 88109B 09335.22682363 .00000002 00000-0 10000-3 0 6274
-TLE2=2 19688 8.0199 62.3391 0013520 301.9763 57.7386 0.98335655 56691
+NAME=IRIDIUM 16 [-]
+NICKNAME=IRIDIUM 16 [-]
+TLE1=1 24841U 97030F 09357.17263046 .00000097 00000-0 26984-4 0 8810
+TLE2=2 24841 86.4011 53.0529 0001545 140.4153 219.7149 14.35312151655384
-[733]
+[22970]
VERSION=1.1
-NAME=THOR AGENA D R/B
-NICKNAME=THOR AGENA D R/B
-TLE1=1 00733U 64002A 09336.58374092 .00000000 00000-0 18369-4 0 9388
-TLE2=2 00733 99.1045 6.6324 0033624 265.6371 94.0967 14.31275977388293
+NAME=TUBSAT B
+NICKNAME=TUBSAT B
+TLE1=1 22970U 94003B 09357.76835791 .00000051 00000-0 10000-3 0 2247
+TLE2=2 22970 82.5606 15.8448 0016997 130.9152 229.3508 13.16916773764934
-[25651]
+[25331]
VERSION=1.1
-NAME=GLOBALSTAR M046
-NICKNAME=GLOBALSTAR M046
-TLE1=1 25651U 99012C 09336.72290777 -.00000086 00000-0 10000-3 0 1274
-TLE2=2 25651 52.0025 182.4893 0002747 85.8335 274.2841 12.62267182494611
+NAME=ECHOSTAR 4
+NICKNAME=ECHOSTAR 4
+TLE1=1 25331U 98028A 09357.24523399 -.00000225 00000-0 10000-3 0 1167
+TLE2=2 25331 1.5198 55.7166 0004518 205.0678 202.6026 1.00273126 42710
-[27811]
+[24794]
VERSION=1.1
-NAME=HELLAS-SAT 2
-NICKNAME=HELLAS-SAT 2
-TLE1=1 27811U 03020A 09336.75734872 .00000169 00000-0 10000-3 0 214
-TLE2=2 27811 0.0138 274.8591 0003516 332.0701 136.4244 1.00271257 23925
+NAME=IRIDIUM 6 [+]
+NICKNAME=IRIDIUM 6 [+]
+TLE1=1 24794U 97020C 09357.18178346 -.00000053 00000-0 -26163-4 0 6704
+TLE2=2 24794 86.3941 21.0560 0002094 83.1016 277.0428 14.34219067661478
-[25397]
+[26464]
VERSION=1.1
-NAME=TECHSAT 1B (GO-32)
-NICKNAME=GO-32
-TLE1=1 25397U 98043D 09336.45589818 -.00000039 00000-0 53186-6 0 543
-TLE2=2 25397 98.3179 349.7125 0002073 106.7850 253.3569 14.23167167592068
+NAME=CLUSTER II-FM8
+NICKNAME=CLUSTER II-FM8
+TLE1=1 26464U 00045B 09357.45833333 .00001146 00000-0 00000+0 0 4162
+TLE2=2 26464 114.1246 192.5262 8719939 32.5799 356.3676 0.44209948 5372
-[27651]
+[26626]
VERSION=1.1
-NAME=SORCE
-NICKNAME=SORCE
-TLE1=1 27651U 03004A 09336.51695612 -.00000039 00000-0 11099-4 0 655
-TLE2=2 27651 39.9950 105.0133 0024551 73.5590 286.7906 14.82232229371270
+NAME=SIRIUS-3
+NICKNAME=SIRIUS-3
+TLE1=1 26626U 00077A 09355.97040168 -.00000129 00000-0 10000-3 0 5244
+TLE2=2 26626 64.2033 13.5877 2661970 270.6951 59.1934 1.00274943 33191
-[25946]
+[28915]
VERSION=1.1
-NAME=GLOBALSTAR M031
-NICKNAME=GLOBALSTAR M031
-TLE1=1 25946U 99058D 09335.90627399 -.00000086 00000-0 10000-3 0 600
-TLE2=2 25946 51.9959 94.5484 0002557 194.9893 165.0897 12.62267764467794
+NAME=COSMOS 2419 (714)
+NICKNAME=COSMOS 2419 (714)
+TLE1=1 28915U 05050A 09357.63746146 .00000109 00000-0 10000-3 0 1194
+TLE2=2 28915 64.8646 157.5316 0007049 353.9364 106.2986 2.13101865 31106
-[25621]
+[22826]
VERSION=1.1
-NAME=GLOBALSTAR M023
-NICKNAME=GLOBALSTAR M023
-TLE1=1 25621U 99004A 09336.70990835 -.00000086 00000-0 10000-3 0 1698
-TLE2=2 25621 52.0117 50.4658 0009877 183.5880 176.4913 12.62224331499038
+NAME=ITAMSAT (IO-26)
+NICKNAME=IO-26
+TLE1=1 22826U 93061D 09357.81775154 .00000016 00000-0 22958-4 0 1495
+TLE2=2 22826 98.4579 306.1851 0009835 63.0891 297.1324 14.29535528847102
-[36088]
+[23705]
VERSION=1.1
-NAME=SJ-11-01
-NICKNAME=SJ-11-01
-TLE1=1 36088U 09061A 09337.35246460 .00000422 00000-0 10000-3 0 716
-TLE2=2 36088 98.2757 27.9482 0010682 202.6862 157.3834 14.58937480 3081
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 23705U 95058B 09357.58967453 -.00000018 00000-0 15339-4 0 36
+TLE2=2 23705 71.0201 0.9624 0011641 151.8180 208.3508 14.14873162730652
-[34264]
+[3230]
VERSION=1.1
-NAME=RADUGA-1 8
-NICKNAME=RADUGA-1 8
-TLE1=1 34264U 09010A 09336.70565186 .00000129 00000-0 10000-3 0 2100
-TLE2=2 34264 0.9981 204.3758 0027031 260.8642 237.4491 1.00267040 2785
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 03230U 68040B 09357.35309824 .00000184 00000-0 26222-4 0 8365
+TLE2=2 03230 74.0378 285.5665 0035114 242.2439 117.5175 14.84270785229316
-[26038]
+[28187]
VERSION=1.1
-NAME=GALAXY 11 (G-11)
-NICKNAME=GALAXY 11 (G-11)
-TLE1=1 26038U 99071A 09334.99233735 .00000178 00000-0 00000+0 0 8090
-TLE2=2 26038 0.0266 249.4059 0001085 330.6489 240.0198 1.00275600 36526
+NAME=EUTELSAT W3A
+NICKNAME=EUTELSAT W3A
+TLE1=1 28187U 04008A 09356.90260654 .00000067 00000-0 10000-3 0 8764
+TLE2=2 28187 0.0610 349.4557 0003450 272.1245 161.9267 1.00272543 21219
-[25509]
+[27426]
VERSION=1.1
-NAME=SEDSAT 1 (SO-33)
-NICKNAME=SO-33
-TLE1=1 25509U 98061B 09335.73666657 .00000100 00000-0 87746-5 0 5984
-TLE2=2 25509 31.4328 185.0637 0354489 3.3628 356.9278 14.28271187579809
+NAME=DIRECTV 5 (TEMPO 1)
+NICKNAME=DIRECTV 5 (TEMPO 1)
+TLE1=1 27426U 02023A 09357.12048900 .00000000 00000-0 10000-3 0 4311
+TLE2=2 27426 0.0198 46.3680 0003183 209.3745 129.3159 1.00270149 27961
-[27004]
+[28230]
VERSION=1.1
-NAME=MAROC-TUBSAT
-NICKNAME=MAROC-TUBSAT
-TLE1=1 27004U 01056D 09335.75796040 .00000023 00000-0 74373-4 0 4070
-TLE2=2 27004 99.2223 190.1382 0020087 326.6515 33.3363 13.70030077398875
+NAME=GP-B
+NICKNAME=GP-B
+TLE1=1 28230U 04014A 09357.52617981 .00000096 00000-0 11682-4 0 6744
+TLE2=2 28230 89.9353 156.6716 0002576 100.5660 259.5846 14.76005350305709
-[25964]
+[27378]
VERSION=1.1
-NAME=GLOBALSTAR M061
-NICKNAME=GLOBALSTAR M061
-TLE1=1 25964U 99062D 09337.33641379 -.00000074 00000-0 10000-3 0 256
-TLE2=2 25964 51.9758 110.0937 0007118 102.3647 257.7987 11.76684721453408
+NAME=ECHOSTAR 7
+NICKNAME=ECHOSTAR 7
+TLE1=1 27378U 02006A 09357.07069758 .00000000 00000-0 10000-3 0 4619
+TLE2=2 27378 0.0065 342.2646 0001903 299.1155 76.9524 1.00271875 28703
-[24968]
+[29505]
VERSION=1.1
-NAME=IRIDIUM 37 [+]
-NICKNAME=IRIDIUM 37 [+]
-TLE1=1 24968U 97056D 09336.20685693 .00000154 00000-0 48060-4 0 8324
-TLE2=2 24968 86.3976 29.8057 0002398 84.4651 275.6818 14.34221382637802
+NAME=SJ-6C
+NICKNAME=SJ-6C
+TLE1=1 29505U 06046A 09357.67164002 .00000127 00000-0 18475-4 0 5576
+TLE2=2 29505 97.6895 359.5901 0003553 143.7114 216.4248 14.90692123172314
-[24904]
+[22245]
VERSION=1.1
-NAME=IRIDIUM 25 [+]
-NICKNAME=IRIDIUM 25 [+]
-TLE1=1 24904U 97043B 09336.51702944 -.00000026 00000-0 -16214-4 0 8486
-TLE2=2 24904 86.3936 326.3754 0002383 81.7722 278.3741 14.34215019643138
+NAME=GORIZONT 27
+NICKNAME=GORIZONT 27
+TLE1=1 22245U 92082A 09356.61247811 -.00000203 00000-0 10000-3 0 5007
+TLE2=2 22245 11.6474 42.8744 0015690 231.7718 128.0784 1.00142453 66832
-[19822]
+[22877]
VERSION=1.1
-NAME=AKEBONO (EXOS-D)
-NICKNAME=AKEBONO (EXOS-D)
-TLE1=1 19822U 89016A 09337.40846287 .00007672 -16546-6 24919-3 0 3923
-TLE2=2 19822 75.0616 136.0274 2687251 117.4345 272.4790 10.02099369612399
+NAME=GPS BIIA-23 (PRN 04)
+NICKNAME=GPS BIIA-23 (PRN 04)
+TLE1=1 22877U 93068A 09356.61945022 .00000059 00000-0 10000-3 0 9981
+TLE2=2 22877 53.8435 210.6981 0090150 31.9342 328.6786 2.00572447118405
-[25112]
+[25043]
VERSION=1.1
-NAME=ORBCOMM FM08 [+]
-NICKNAME=ORBCOMM FM08 [+]
-TLE1=1 25112U 97084A 09336.32363275 .00000040 00000-0 63831-4 0 3860
-TLE2=2 25112 45.0219 285.3261 0008126 231.2164 128.7957 14.34433596624392
+NAME=IRIDIUM 38 [-]
+NICKNAME=IRIDIUM 38 [-]
+TLE1=1 25043U 97069E 09356.96581371 .00000044 00000-0 85952-5 0 8652
+TLE2=2 25043 86.3944 83.5686 0001716 113.4615 246.6771 14.34717192634670
-[24869]
+[23439]
VERSION=1.1
-NAME=IRIDIUM 15 [+]
-NICKNAME=IRIDIUM 15 [+]
-TLE1=1 24869U 97034A 09336.39759892 .00000117 00000-0 34728-4 0 8924
-TLE2=2 24869 86.3947 92.7790 0002229 85.5230 274.6220 14.34216806649210
+NAME=RADIO ROSTO (RS-15)
+NICKNAME=RS-15
+TLE1=1 23439U 94085A 09356.89259785 -.00000039 00000-0 10000-3 0 2522
+TLE2=2 23439 64.8200 319.6573 0153693 16.0150 344.5556 11.27553829617398
-[25159]
+[26089]
VERSION=1.1
-NAME=ORBCOMM FM04 [+]
-NICKNAME=ORBCOMM FM04 [+]
-TLE1=1 25159U 98007C 09336.86594052 .00000137 00000-0 11162-3 0 374
-TLE2=2 25159 107.9664 96.0915 0045864 356.3943 3.6854 14.25514220613582
+NAME=GARUDA 1
+NICKNAME=GARUDA 1
+TLE1=1 26089U 00011A 09356.88635468 -.00000337 00000-0 10000-3 0 5059
+TLE2=2 26089 1.2989 251.1927 0002796 36.4293 246.0867 1.00269071 36158
-[13969]
+[27941]
VERSION=1.1
-NAME=TDRS 1
-NICKNAME=TDRS 1
-TLE1=1 13969U 83026B 09336.23246067 -.00000293 00000-0 10000-3 0 9773
-TLE2=2 13969 13.4618 7.9456 0031581 240.7938 209.6026 1.00260217 70680
+NAME=NIGERIASAT 1
+NICKNAME=NIGERIASAT 1
+TLE1=1 27941U 03042C 09357.66054549 .00000061 00000-0 20667-4 0 864
+TLE2=2 27941 97.9156 225.0811 0010268 258.9604 101.0455 14.63048828333247
-[23816]
+[28393]
VERSION=1.1
-NAME=INTELSAT 707 (IS-707)
-NICKNAME=INTELSAT 707 (IS-707)
-TLE1=1 23816U 96015A 09335.25761286 -.00000263 00000-0 10000-3 0 9220
-TLE2=2 23816 0.0056 357.4057 0003272 255.6302 216.9807 1.00271089 50254
+NAME=AMAZONAS
+NICKNAME=AMAZONAS
+TLE1=1 28393U 04031A 09355.63030801 -.00000267 00000-0 00000+0 0 7045
+TLE2=2 28393 0.0285 37.7801 0001833 219.3202 359.1290 1.00274046 19746
-[24839]
+[28916]
VERSION=1.1
-NAME=IRIDIUM 10 [+]
-NICKNAME=IRIDIUM 10 [+]
-TLE1=1 24839U 97030D 09336.31806520 .00000146 00000-0 44892-4 0 8677
-TLE2=2 24839 86.3961 61.1234 0002349 84.0075 276.1386 14.34220317652249
+NAME=COSMOS 2418 (713)
+NICKNAME=COSMOS 2418 (713)
+TLE1=1 28916U 05050B 09357.65029821 .00000109 00000-0 10000-3 0 1135
+TLE2=2 28916 64.8833 157.5695 0017624 342.6438 82.6810 2.13104944 31106
-[25880]
+[32763]
VERSION=1.1
-NAME=TELKOM 1
-NICKNAME=TELKOM 1
-TLE1=1 25880U 99042A 09334.74464745 -.00000321 00000-0 10000-3 0 8267
-TLE2=2 25880 0.0061 328.6014 0002734 271.2892 205.9718 1.00273683 37803
+NAME=ICO G1
+NICKNAME=ICO G1
+TLE1=1 32763U 08016A 09356.49937741 -.00000157 00000-0 10000-3 0 3669
+TLE2=2 32763 5.3220 330.3740 0003031 300.4922 267.2529 1.00271341 6224
-[22698]
+[26892]
VERSION=1.1
-NAME=RADCAL
-NICKNAME=RADCAL
-TLE1=1 22698U 93041A 09336.49667113 -.00000020 00000-0 -14655-4 0 4862
-TLE2=2 22698 89.5393 18.3107 0091161 126.8654 234.0925 14.22825866853203
+NAME=COSMOS 2379
+NICKNAME=COSMOS 2379
+TLE1=1 26892U 01037A 09357.29117507 .00000125 00000-0 10000-3 0 4698
+TLE2=2 26892 5.3048 67.0642 0001579 186.4088 319.5835 1.00300697 30509
-[26643]
+[25276]
VERSION=1.1
-NAME=BEIDOU 1B
-NICKNAME=BEIDOU 1B
-TLE1=1 26643U 00082A 09336.57960954 -.00000122 00000-0 10000-3 0 4903
-TLE2=2 26643 2.4300 75.5182 0004471 183.1338 101.8280 1.00269530 32824
+NAME=IRIDIUM 60 [+]
+NICKNAME=IRIDIUM 60 [+]
+TLE1=1 25276U 98019E 09357.07051962 .00000000 00000-0 -69093-5 0 8401
+TLE2=2 25276 86.3949 349.3704 0002370 81.6785 278.4672 14.34216184614326
-[33314]
+[36128]
VERSION=1.1
-NAME=RAPIDEYE 1
-NICKNAME=RAPIDEYE 1
-TLE1=1 33314U 08040C 09337.16434827 .00000048 00000-0 13401-4 0 4768
-TLE2=2 33314 97.9668 61.2219 0023885 298.2059 61.6741 14.79908777 68180
+NAME=SL-12 DEB
+NICKNAME=SL-12 DEB
+TLE1=1 36128U 09070L 09352.45445746 .10633637 75698-5 19569-2 0 19
+TLE2=2 36128 64.9487 264.0261 0101875 71.9730 291.7104 16.18393219 535
-[20693]
+[26610]
VERSION=1.1
-NAME=COSMOS 2085
-NICKNAME=COSMOS 2085
-TLE1=1 20693U 90061A 09336.69803287 -.00000053 00000-0 10000-3 0 9993
-TLE2=2 20693 12.4374 34.1195 0002960 273.3084 86.6194 1.00265825 70932
+NAME=STRV 1C
+NICKNAME=STRV 1C
+TLE1=1 26610U 00072C 09355.95051997 -.00000131 00000-0 10000-3 0 116
+TLE2=2 26610 6.2797 222.6223 7341597 188.9594 141.0120 2.03456282 67641
-[23051]
+[28935]
VERSION=1.1
-NAME=GOES 8 [-]
-NICKNAME=GOES 8 [-]
-TLE1=1 23051U 94022A 09335.36580168 .00000074 00000-0 10000-3 0 395
-TLE2=2 23051 6.1647 71.2861 0008982 177.2544 182.5351 0.98904220 64378
+NAME=ECHOSTAR 10
+NICKNAME=ECHOSTAR 10
+TLE1=1 28935U 06003A 09357.30300100 -.00000035 00000-0 10000-3 0 8191
+TLE2=2 28935 0.0273 5.0389 0002190 252.8865 192.9271 1.00272327 14150
-[28051]
+[25158]
VERSION=1.1
-NAME=IRS-P6 (RESOURCESAT-1)
-NICKNAME=IRS-P6 (RESOURCESAT-1)
-TLE1=1 28051U 03046A 09337.37960337 .00000012 00000-0 25562-4 0 2102
-TLE2=2 28051 98.6998 50.9793 0002475 38.2155 321.9197 14.21636834318150
+NAME=ORBCOMM FM03 [-]
+NICKNAME=ORBCOMM FM03 [-]
+TLE1=1 25158U 98007B 09357.13905622 .00000037 00000-0 69990-4 0 568
+TLE2=2 25158 107.9651 137.3236 0052129 320.4906 39.2411 14.25497373616446
-[25354]
+[26483]
VERSION=1.1
-NAME=CHINASTAR 1
-NICKNAME=CHINASTAR 1
-TLE1=1 25354U 98033A 09336.90342150 -.00000190 00000-0 10000-3 0 6832
-TLE2=2 25354 0.0096 237.4601 0002321 24.8288 222.3397 1.00270309 46728
+NAME=SIRIUS-2
+NICKNAME=SIRIUS-2
+TLE1=1 26483U 00051A 09355.30061011 .00000106 00000-0 10000-3 0 2863
+TLE2=2 26483 63.7576 133.5958 2688899 268.9595 60.4572 1.00275938 34058
-[32958]
+[24901]
VERSION=1.1
-NAME=FENGYUN 3A
-NICKNAME=FENGYUN 3A
-TLE1=1 32958U 08026A 09336.29679395 .00000167 00000-0 10000-3 0 4650
-TLE2=2 32958 98.7535 46.0211 0001077 56.1358 303.9878 14.19600412 78633
+NAME=AGILA 2
+NICKNAME=AGILA 2
+TLE1=1 24901U 97042A 09357.16671060 .00000000 00000-0 10000-3 0 9409
+TLE2=2 24901 0.0217 242.3664 0003670 10.6480 44.7767 1.00265785 45200
-[32711]
+[23710]
VERSION=1.1
-NAME=GPS BIIRM-6 (PRN 07)
-NICKNAME=GPS BIIRM-6 (PRN 07)
-TLE1=1 32711U 08012A 09335.84842056 -.00000049 00000-0 10000-3 0 3231
-TLE2=2 32711 55.5608 31.4361 0032324 178.0930 181.9822 2.00567390 12618
+NAME=RADARSAT-1
+NICKNAME=RADARSAT-1
+TLE1=1 23710U 95059A 09357.70750475 .00000095 00000-0 53756-4 0 8779
+TLE2=2 23710 98.5797 1.8109 0001048 91.5798 357.2881 14.29985749737897
-[25260]
+[25770]
VERSION=1.1
-NAME=SPOT 4
-NICKNAME=SPOT 4
-TLE1=1 25260U 98017A 09337.16065727 -.00000010 00000-0 15927-4 0 7152
-TLE2=2 25260 98.6826 46.9957 0001559 103.8511 338.8995 14.20045370606312
+NAME=GLOBALSTAR M025
+NICKNAME=GLOBALSTAR M025
+TLE1=1 25770U 99031A 09356.96675206 -.00000086 00000-0 10000-3 0 830
+TLE2=2 25770 51.9934 165.3128 0002478 107.3491 252.7649 12.62268152486004
-[27941]
+[28463]
VERSION=1.1
-NAME=NIGERIASAT 1
-NICKNAME=NIGERIASAT 1
-TLE1=1 27941U 03042C 09337.14310696 .00000034 00000-0 15495-4 0 327
-TLE2=2 27941 97.9180 205.3832 0010936 330.0071 30.0507 14.63045323330243
+NAME=EXPRESS-AM 1
+NICKNAME=EXPRESS-AM 1
+TLE1=1 28463U 04043A 09356.80346448 .00000170 00000-0 10000-3 0 6195
+TLE2=2 28463 0.0390 110.4644 0001248 219.2184 91.0593 1.00273813 18853
-[22117]
+[24906]
VERSION=1.1
-NAME=SATCOM C3
-NICKNAME=SATCOM C3
-TLE1=1 22117U 92060B 09336.45068103 -.00000219 00000-0 10000-3 0 2459
-TLE2=2 22117 4.7936 70.3732 0001993 182.0934 262.1813 1.00271613 63064
+NAME=IRIDIUM 23 [+]
+NICKNAME=IRIDIUM 23 [+]
+TLE1=1 24906U 97043D 09356.94656366 .00000075 00000-0 19696-4 0 8954
+TLE2=2 24906 86.3952 317.7624 0002321 81.4902 278.6551 14.34214939646075
-[25977]
+[27651]
VERSION=1.1
-NAME=HELIOS 1B
-NICKNAME=HELIOS 1B
-TLE1=1 25977U 99064A 09337.10453476 .00000594 00000-0 90622-4 0 8495
-TLE2=2 25977 98.3443 343.8449 0002189 118.7376 241.4054 14.77744675536872
+NAME=SORCE
+NICKNAME=SORCE
+TLE1=1 27651U 03004A 09357.06708440 .00000088 00000-0 26570-4 0 824
+TLE2=2 27651 39.9982 351.6469 0026134 219.8964 139.9908 14.82239703374329
-[27845]
+[27431]
VERSION=1.1
-NAME=QUAKESAT
-NICKNAME=QUAKESAT
-TLE1=1 27845U 03031F 09336.52342053 .00000095 00000-0 65023-4 0 7002
-TLE2=2 27845 98.7195 342.7596 0009525 40.0963 320.0907 14.20309160333068
+NAME=FENGYUN 1D
+NICKNAME=FENGYUN 1D
+TLE1=1 27431U 02024B 09356.57371858 .00000116 00000-0 90925-4 0 7627
+TLE2=2 27431 98.6466 338.6077 0014639 239.0138 120.9584 14.09290043391342
-[33322]
+[25169]
VERSION=1.1
-NAME=CZ-2C R/B
-NICKNAME=CZ-2C R/B
-TLE1=1 33322U 08041C 09336.88749360 .00132405 26495-5 21554-3 0 4588
-TLE2=2 33322 97.9842 108.9057 0114678 333.9170 25.6338 15.92019674 70364
+NAME=IRIDIUM 52 [+]
+NICKNAME=IRIDIUM 52 [+]
+TLE1=1 25169U 98010A 09357.15983549 .00000104 00000-0 30082-4 0 5874
+TLE2=2 25169 86.3936 52.5822 0002338 87.6690 272.4777 14.34218118620058
-[23227]
+[25634]
VERSION=1.1
-NAME=OPTUS B3
-NICKNAME=OPTUS B3
-TLE1=1 23227U 94055A 09336.31508641 -.00000056 00000-0 10000-3 0 4483
-TLE2=2 23227 1.8632 77.4723 0004186 175.7645 95.4885 1.00272350 55887
+NAME=ARGOS
+NICKNAME=ARGOS
+TLE1=1 25634U 99008A 09356.66802449 .00000138 00000-0 88102-4 0 8936
+TLE2=2 25634 98.9876 36.6323 0010654 126.6859 233.5316 14.18918267560770
-[28372]
+[15677]
VERSION=1.1
-NAME=APRIZESAT 1
-NICKNAME=APRIZESAT 1
-TLE1=1 28372U 04025G 09336.12940669 .00000139 00000-0 48205-4 0 5331
-TLE2=2 28372 98.0030 357.9655 0046297 272.4688 87.1214 14.48183908286802
+NAME=GSTAR 1
+NICKNAME=GSTAR 1
+TLE1=1 15677U 85035A 09357.17183842 -.00000083 00000-0 10000-3 0 2174
+TLE2=2 15677 11.0923 48.6719 0008402 259.9371 99.9543 1.00272204 64871
-[25847]
+[35931]
VERSION=1.1
-NAME=MOLNIYA 3-50
-NICKNAME=MOLNIYA 3-50
-TLE1=1 25847U 99036A 09336.80967586 .00000102 00000-0 10000-3 0 7426
-TLE2=2 25847 63.6756 250.6778 6956119 265.7166 19.1035 2.00647860 76236
+NAME=OCEANSAT 2
+NICKNAME=OCEANSAT 2
+TLE1=1 35931U 09051A 09357.68957160 .00000042 00000-0 10769-4 0 1717
+TLE2=2 35931 98.3327 91.5474 0001835 331.9404 28.2181 14.50859244 13251
-[25771]
+[35756]
VERSION=1.1
-NAME=GLOBALSTAR M049
-NICKNAME=GLOBALSTAR M049
-TLE1=1 25771U 99031B 09336.20000299 -.00000086 00000-0 10000-3 0 2719
-TLE2=2 25771 51.9952 228.1273 0002027 56.5014 303.6047 12.62376207483387
+NAME=OPTUS D3
+NICKNAME=OPTUS D3
+TLE1=1 35756U 09044B 09357.31251016 -.00000127 00000-0 10000-3 0 891
+TLE2=2 35756 0.0415 19.0554 0003314 271.5661 69.8791 1.00271353 1284
-[21576]
+[32266]
VERSION=1.1
-NAME=ORBCOMM-X [-]
-NICKNAME=ORBCOMM-X [-]
-TLE1=1 21576U 91050C 09337.04198561 .00000035 00000-0 25093-4 0 1816
-TLE2=2 21576 98.4896 287.6204 0002863 248.1759 111.9119 14.39976164964845
+NAME=GLOBALSTAR M068
+NICKNAME=GLOBALSTAR M068
+TLE1=1 32266U 07048D 09357.20918866 -.00000086 00000-0 10000-3 0 7595
+TLE2=2 32266 51.9847 254.9258 0001066 76.5685 283.5308 12.62255033103484
-[24905]
+[26113]
VERSION=1.1
-NAME=IRIDIUM 46 [+]
-NICKNAME=IRIDIUM 46 [+]
-TLE1=1 24905U 97043C 09336.52971084 .00000032 00000-0 44108-5 0 8648
-TLE2=2 24905 86.3948 326.6670 0002439 79.6532 280.4935 14.34215591643144
+NAME=IMAGE
+NICKNAME=IMAGE
+TLE1=1 26113U 00017A 09356.48900121 .00000359 00000-0 10000-3 0 9080
+TLE2=2 26113 91.2891 214.3589 7309548 263.1429 16.9376 1.68637711 59994
-[27775]
+[21118]
VERSION=1.1
-NAME=COSMOS 2397
-NICKNAME=COSMOS 2397
-TLE1=1 27775U 03015A 09337.16452293 -.00000273 00000-0 10000-3 0 1451
-TLE2=2 27775 3.8062 70.0867 0046470 204.3520 155.0616 1.00475522 24257
+NAME=MOLNIYA 1-80
+NICKNAME=MOLNIYA 1-80
+TLE1=1 21118U 91012A 09355.88397332 .00001557 00000-0 10000-3 0 7328
+TLE2=2 21118 61.8684 240.8197 7236627 255.2566 21.0769 2.00787097138101
-[32393]
+[25884]
VERSION=1.1
-NAME=COSMOS 2434 (721)
-NICKNAME=COSMOS 2434 (721)
-TLE1=1 32393U 07065A 09336.49645809 -.00000025 00000-0 00000+0 0 4143
-TLE2=2 32393 65.1030 37.7075 0004582 149.3848 10.3829 2.13103286 15074
+NAME=GLOBALSTAR M027
+NICKNAME=GLOBALSTAR M027
+TLE1=1 25884U 99043B 09357.18216119 -.00000086 00000-0 10000-3 0 692
+TLE2=2 25884 52.0100 302.1609 0000043 87.8046 272.2816 12.62267121477509
-[28376]
+[28899]
VERSION=1.1
-NAME=AURA
-NICKNAME=AURA
-TLE1=1 28376U 04026A 09336.51466867 .00000034 00000-0 17523-4 0 6640
-TLE2=2 28376 98.1952 278.0536 0000974 61.1623 298.9664 14.57118048286326
+NAME=INMARSAT 4-F2
+NICKNAME=INMARSAT 4-F2
+TLE1=1 28899U 05044A 09356.77444714 .00000157 00000-0 10000-3 0 9942
+TLE2=2 28899 2.2326 318.9600 0002044 294.7910 141.6020 1.00273961 15157
-[25740]
+[24948]
VERSION=1.1
-NAME=NIMIQ 1
-NICKNAME=NIMIQ 1
-TLE1=1 25740U 99027A 09334.67085225 -.00000151 00000-0 10000-3 0 7124
-TLE2=2 25740 0.0540 64.0624 0004285 205.8938 310.1540 1.00270716 38611
+NAME=IRIDIUM 28 [-]
+NICKNAME=IRIDIUM 28 [-]
+TLE1=1 24948U 97051E 09357.00161200 .00000027 00000-0 25607-5 0 7096
+TLE2=2 24948 86.3952 349.5788 0002224 93.7722 266.3726 14.34284666642644
-[12585]
+[4327]
VERSION=1.1
-NAME=METEOR PRIRODA
-NICKNAME=METEOR PRIRODA
-TLE1=1 12585U 81065A 09336.64314953 .00000764 00000-0 54344-4 0 5253
-TLE2=2 12585 97.3869 16.3561 0018708 218.9574 141.0291 15.07339666545937
+NAME=SERT 2
+NICKNAME=SERT 2
+TLE1=1 04327U 70009A 09357.16651084 .00000032 00000-0 10000-3 0 1000
+TLE2=2 04327 99.1835 218.5328 0004652 189.1099 170.9953 13.58232102976458
-[28163]
+[33460]
VERSION=1.1
-NAME=MOLNIYA 1-93
-NICKNAME=MOLNIYA 1-93
-TLE1=1 28163U 04005A 09336.30122090 -.00000221 00000-0 10000-3 0 741
-TLE2=2 28163 64.8894 267.1669 7121621 273.7316 345.3806 2.00597497 42409
+NAME=EUTELSAT W2M
+NICKNAME=EUTELSAT W2M
+TLE1=1 33460U 08065B 09355.94269653 .00000036 00000-0 10000-3 0 1761
+TLE2=2 33460 0.0709 353.4697 0003286 282.0294 157.5629 1.00271981 3734
-[28230]
+[25531]
VERSION=1.1
-NAME=GP-B
-NICKNAME=GP-B
-TLE1=1 28230U 04014A 09336.50944430 .00000113 00000-0 14110-4 0 6593
-TLE2=2 28230 89.9339 156.8280 0001778 78.1756 281.9641 14.76001822302608
+NAME=IRIDIUM 83 [+]
+NICKNAME=IRIDIUM 83 [+]
+TLE1=1 25531U 98066E 09357.20424334 .00000165 00000-0 51962-4 0 7640
+TLE2=2 25531 86.3932 52.4006 0002363 84.2543 275.8935 14.34217656582638
-[28485]
+[10953]
VERSION=1.1
-NAME=SWIFT
-NICKNAME=SWIFT
-TLE1=1 28485U 04047A 09336.79538701 .00000684 00000-0 26376-4 0 4501
-TLE2=2 28485 20.5573 122.3179 0014467 346.2278 13.7862 14.92616470274897
+NAME=GOES 3 [P]
+NICKNAME=GOES 3 [P]
+TLE1=1 10953U 78062A 09355.04690575 -.00000085 00000-0 10000-3 0 7467
+TLE2=2 10953 14.4202 358.5533 0003569 331.2799 28.7142 1.00267620 68543
-[25492]
+[27373]
VERSION=1.1
-NAME=SIRIUS 3
-NICKNAME=SIRIUS 3
-TLE1=1 25492U 98056B 09335.28452940 .00000055 00000-0 10000-3 0 5837
-TLE2=2 25492 0.8792 79.4365 0002127 175.7654 282.4629 1.00274008 40954
+NAME=IRIDIUM 90 [S]
+NICKNAME=IRIDIUM 90 [S]
+TLE1=1 27373U 02005B 09357.17310388 .00000102 00000-0 24366-4 0 3200
+TLE2=2 27373 86.4442 52.2522 0007321 84.9783 275.2261 14.42952180417241
-[28089]
+[27561]
VERSION=1.1
-NAME=YAMAL 202
-NICKNAME=YAMAL 202
-TLE1=1 28089U 03053A 09336.83453963 .00000136 00000-0 10000-3 0 7969
-TLE2=2 28089 0.0069 286.0885 0002897 311.6193 183.5335 1.00274607 22134
+NAME=RUBIN-3 & SL-8 R/B
+NICKNAME=RUBIN-3 & SL-8 R/B
+TLE1=1 27561U 02054C 09356.58364004 .00000035 00000-0 18450-4 0 8589
+TLE2=2 27561 97.9322 182.2892 0048157 17.0452 343.2350 14.53784554374887
-[25778]
+[7530]
VERSION=1.1
-NAME=IRIDIUM 21 [+]
-NICKNAME=IRIDIUM 21 [+]
-TLE1=1 25778U 99032B 09336.42487025 .00000079 00000-0 21029-4 0 7289
-TLE2=2 25778 86.3926 294.8869 0004456 86.8819 273.2886 14.34215958553416
+NAME=OSCAR 7 (AO-7)
+NICKNAME=AO-7
+TLE1=1 07530U 74089B 09357.62882473 -.00000027 00000-0 10000-3 0 6617
+TLE2=2 07530 101.4125 15.2439 0011848 258.7270 101.2470 12.53577335606455
-[25954]
+[25721]
VERSION=1.1
-NAME=AMC-4 (GE-4)
-NICKNAME=AMC-4 (GE-4)
-TLE1=1 25954U 99060A 09334.52080616 -.00000091 00000-0 00000+0 0 7679
-TLE2=2 25954 0.0461 104.1274 0002317 148.8389 263.0776 1.00272597 36891
+NAME=ABRIXAS
+NICKNAME=ABRIXAS
+TLE1=1 25721U 99022A 09357.55854472 -.00000221 00000-0 45645-5 0 7334
+TLE2=2 25721 48.4354 81.2256 0020419 339.4341 20.5821 15.20381242589271
-[28393]
+[16908]
VERSION=1.1
-NAME=AMAZONAS
-NICKNAME=AMAZONAS
-TLE1=1 28393U 04031A 09336.38446334 -.00000264 00000-0 10000-3 0 6959
-TLE2=2 28393 0.0669 59.8584 0001681 212.4316 236.4895 1.00269838 19556
+NAME=EGP
+NICKNAME=EGP
+TLE1=1 16908U 86061A 09357.17431027 -.00000083 00000-0 10000-3 0 924
+TLE2=2 16908 50.0111 297.9276 0011109 338.7890 21.2478 12.44463087731134
-[25853]
+[25395]
VERSION=1.1
-NAME=GLOBALSTAR M051
-NICKNAME=GLOBALSTAR M051
-TLE1=1 25853U 99037C 09337.34161350 -.00000086 00000-0 10000-3 0 570
-TLE2=2 25853 52.0018 270.3312 0000389 347.0907 12.9945 12.62258988479763
+NAME=FASAT B
+NICKNAME=FASAT B
+TLE1=1 25395U 98043B 09357.08795641 -.00000005 00000-0 15612-4 0 6242
+TLE2=2 25395 98.3161 18.3694 0003339 28.3110 331.8240 14.24372203595332
-[24944]
+[33154]
VERSION=1.1
-NAME=IRIDIUM 29 [+]
-NICKNAME=IRIDIUM 29 [+]
-TLE1=1 24944U 97051A 09336.50783101 .00000037 00000-0 60934-5 0 8133
-TLE2=2 24944 86.3963 357.9954 0002443 83.8482 276.3003 14.34222221639718
+NAME=BADR-6
+NICKNAME=BADR-6
+TLE1=1 33154U 08034B 09355.96516615 .00000161 00000-0 10000-3 0 2560
+TLE2=2 33154 0.0507 328.9032 0005106 313.9512 181.2511 1.00273698 5395
-[33060]
+[25624]
VERSION=1.1
-NAME=ORBCOMM FM38 [S]
-NICKNAME=ORBCOMM FM38 [S]
-TLE1=1 33060U 08031A 09336.56526278 -.00000184 00000-0 18586-5 0 4729
-TLE2=2 33060 48.4481 7.1424 0006226 42.4966 317.6426 14.68758220 78083
+NAME=GLOBALSTAR M038
+NICKNAME=GLOBALSTAR M038
+TLE1=1 25624U 99004D 09357.87304861 -.00000086 00000-0 10000-3 0 1331
+TLE2=2 25624 51.9998 299.2722 0001142 297.5059 62.4683 12.62398420502485
-[26463]
+[26900]
VERSION=1.1
-NAME=CLUSTER II-FM5
-NICKNAME=CLUSTER II-FM5
-TLE1=1 26463U 00045A 09334.91666667 .00001339 00000-0 00000-0 0 4122
-TLE2=2 26463 121.6494 203.2558 8581731 37.3329 357.7639 0.42732082 5884
+NAME=INTELSAT 902 (IS-902)
+NICKNAME=INTELSAT 902 (IS-902)
+TLE1=1 26900U 01039A 09356.87705171 .00000052 00000-0 10000-3 0 4973
+TLE2=2 26900 0.0194 77.1218 0002897 214.4426 177.7059 1.00271864 30488
-[15945]
+[21111]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 15945U 85069B 09337.08692016 .00000070 00000-0 57226-5 0 2320
-TLE2=2 15945 82.5262 188.0884 0020696 2.1447 357.9864 14.82444634312962
+NAME=COSMOS 2133
+NICKNAME=COSMOS 2133
+TLE1=1 21111U 91010A 09355.63827548 -.00000132 00000-0 10000-3 0 2176
+TLE2=2 21111 11.6265 39.9988 0003395 339.0959 20.8842 1.00266259 69069
-[24834]
+[23027]
VERSION=1.1
-NAME=FENGYUN 2A
-NICKNAME=FENGYUN 2A
-TLE1=1 24834U 97029A 09335.72587691 -.00000044 00000-0 10000-3 0 4384
-TLE2=2 24834 8.8016 60.7305 0095183 77.3008 283.6131 0.96050638 45378
+NAME=GPS BIIA-24 (PRN 06)
+NICKNAME=GPS BIIA-24 (PRN 06)
+TLE1=1 23027U 94016A 09356.82380611 .00000082 00000-0 10000-3 0 81
+TLE2=2 23027 53.5227 147.7153 0059982 290.7558 68.5850 2.00564127115711
-[25311]
+[27436]
VERSION=1.1
-NAME=NILESAT 101
-NICKNAME=NILESAT 101
-TLE1=1 25311U 98024A 09334.76422028 -.00000034 00000-0 10000-3 0 7962
-TLE2=2 25311 0.0843 96.5752 0003339 163.9596 77.4105 1.00273221 42738
+NAME=COSMOS 2389
+NICKNAME=COSMOS 2389
+TLE1=1 27436U 02026A 09357.78735802 .00000039 00000-0 24286-4 0 9466
+TLE2=2 27436 82.9501 302.3860 0047355 130.8893 229.6387 13.74737146380020
-[27374]
+[27844]
VERSION=1.1
-NAME=IRIDIUM 94 [S]
-NICKNAME=IRIDIUM 94 [S]
-TLE1=1 27374U 02005C 09336.55530839 .00000072 00000-0 88178-5 0 3876
-TLE2=2 27374 86.5782 357.7925 0002510 82.3478 277.8015 14.66246580417834
+NAME=CUTE-1 (CO-55)
+NICKNAME=CO-55
+TLE1=1 27844U 03031E 09356.74365020 .00000040 00000-0 39111-4 0 7409
+TLE2=2 27844 98.7111 3.2417 0009588 324.3326 35.7192 14.20674092336031
-[12389]
+[25112]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 12389U 81033B 09336.14460121 .00003324 00000-0 10680-3 0 5174
-TLE2=2 12389 82.9149 174.5521 0406439 357.3515 2.5528 14.78057138461803
+NAME=ORBCOMM FM08 [+]
+NICKNAME=ORBCOMM FM08 [+]
+TLE1=1 25112U 97084A 09357.63543200 .00000114 00000-0 89933-4 0 4027
+TLE2=2 25112 45.0167 184.8989 0007674 328.2690 31.7707 14.34443923627453
-[24901]
+[23880]
VERSION=1.1
-NAME=AGILA 2
-NICKNAME=AGILA 2
-TLE1=1 24901U 97042A 09333.60090418 -.00000211 00000-0 10000-3 0 9320
-TLE2=2 24901 0.0520 110.7823 0004810 139.8081 180.3113 1.00270731 44972
+NAME=GORIZONT 32
+NICKNAME=GORIZONT 32
+TLE1=1 23880U 96034A 09356.09383688 -.00000109 00000-0 10000-3 0 3664
+TLE2=2 23880 9.8541 54.2552 0002988 233.9505 181.7757 1.00269428 49727
-[26095]
+[36122]
VERSION=1.1
-NAME=SUPERBIRD-B2
-NICKNAME=SUPERBIRD-B2
-TLE1=1 26095U 00012A 09335.26996266 -.00000070 00000-0 10000-3 0 7968
-TLE2=2 26095 0.0107 256.1243 0002666 341.3061 92.0458 1.00271803 35898
+NAME=XIWANG-1 (HOPE-1)
+NICKNAME=HO-68
+TLE1=1 36122U 09072B 09357.66931912 -.00000045 00000-0 00000+0 0 285
+TLE2=2 36122 100.4976 54.6942 0007405 20.5021 339.6386 13.16280131 1127
-[20558]
+[32395]
VERSION=1.1
-NAME=ASIASAT 1
-NICKNAME=ASIASAT 1
-TLE1=1 20558U 90030A 09336.15523593 -.00000144 00000-0 10000-3 0 7639
-TLE2=2 20558 9.4457 58.2520 0006023 214.1609 145.6800 0.99242558 71744
+NAME=COSMOS 2436 (723)
+NICKNAME=COSMOS 2436 (723)
+TLE1=1 32395U 07065C 09356.34790860 -.00000041 00000-0 10000-3 0 3523
+TLE2=2 32395 65.1264 37.0324 0016992 347.7569 12.2687 2.13103366 15439
-[28371]
+[26083]
VERSION=1.1
-NAME=SAUDISAT 2
-NICKNAME=SAUDISAT 2
-TLE1=1 28371U 04025F 09337.06995030 .00000004 00000-0 11408-4 0 1361
-TLE2=2 28371 98.0008 14.8467 0025129 243.0525 116.8113 14.52944598287894
+NAME=GLOBALSTAR M060
+NICKNAME=GLOBALSTAR M060
+TLE1=1 26083U 00008C 09357.64760330 .00000000 00000-0 10000-3 0 1255
+TLE2=2 26083 52.0023 75.2823 0001305 186.1583 173.9797 12.62187332463114
-[25160]
+[12458]
VERSION=1.1
-NAME=CELESTIS-02
-NICKNAME=CELESTIS-02
-TLE1=1 25160U 98007D 09337.15135874 -.00000071 00000-0 26307-4 0 2077
-TLE2=2 25160 107.9754 63.0953 0061362 37.0868 323.4477 14.20853635612449
+NAME=NOVA I
+NICKNAME=NOVA I
+TLE1=1 12458U 81044A 09356.78333422 .00000050 00000-0 10000-3 0 9148
+TLE2=2 12458 90.0823 117.4436 0014053 349.8004 10.2846 13.22710186380778
-[25104]
+[25106]
VERSION=1.1
-NAME=IRIDIUM 45 [+]
-NICKNAME=IRIDIUM 45 [+]
-TLE1=1 25104U 97082A 09336.52337170 .00000006 00000-0 -50509-5 0 7671
-TLE2=2 25104 86.3937 326.3912 0002404 81.0352 279.1113 14.34215196625682
+NAME=IRIDIUM 47 [+]
+NICKNAME=IRIDIUM 47 [+]
+TLE1=1 25106U 97082C 09357.11781249 .00000042 00000-0 80948-5 0 7850
+TLE2=2 25106 86.3959 317.7191 0002353 77.3638 282.7814 14.34214880628634
-[33331]
+[35868]
VERSION=1.1
-NAME=GEOEYE 1
-NICKNAME=GEOEYE 1
-TLE1=1 33331U 08042A 09337.27681359 .00000010 00000-0 10872-4 0 3818
-TLE2=2 33331 98.0917 49.2692 0009499 266.7795 93.2335 14.64456169 66221
+NAME=TATIANA 2
+NICKNAME=TATIANA 2
+TLE1=1 35868U 09049D 09357.32804221 .00000177 00000-0 10000-3 0 897
+TLE2=2 35868 98.7849 47.2024 0004845 133.5070 226.6469 14.22092699 13739
-[23027]
+[23461]
VERSION=1.1
-NAME=GPS BIIA-24 (PRN 06)
-NICKNAME=GPS BIIA-24 (PRN 06)
-TLE1=1 23027U 94016A 09335.88378704 .00000094 00000-0 10000-3 0 9851
-TLE2=2 23027 53.5196 148.5762 0060214 290.5664 68.8197 2.00563227115297
+NAME=INTELSAT 704 (IS-704)
+NICKNAME=INTELSAT 704 (IS-704)
+TLE1=1 23461U 95001A 09356.87069770 -.00000214 00000-0 10000-3 0 407
+TLE2=2 23461 0.5961 76.5726 0005085 135.3407 148.0673 0.99182419 54778
-[23915]
+[28378]
VERSION=1.1
-NAME=INTELSAT 709 (IS-709)
-NICKNAME=INTELSAT 709 (IS-709)
-TLE1=1 23915U 96035A 09336.91743329 -.00000169 00000-0 10000-3 0 332
-TLE2=2 23915 0.0106 354.2096 0003126 256.4723 236.6388 1.00271433 49357
+NAME=ANIK F2
+NICKNAME=ANIK F2
+TLE1=1 28378U 04027A 09355.28286900 -.00000035 00000-0 10000-3 0 8855
+TLE2=2 28378 0.0143 48.7025 0002016 178.6406 213.3788 1.00272167 19979
-[26388]
+[22117]
VERSION=1.1
-NAME=TDRS 8
-NICKNAME=TDRS 8
-TLE1=1 26388U 00034A 09336.80603303 -.00000202 00000-0 10000-3 0 729
-TLE2=2 26388 1.7831 100.1720 0004662 138.4818 212.4156 1.00267155 34613
+NAME=SATCOM C3
+NICKNAME=SATCOM C3
+TLE1=1 22117U 92060B 09356.43922391 -.00000218 00000-0 10000-3 0 2557
+TLE2=2 22117 4.8433 70.1127 0001608 213.1936 246.8823 1.00270244 63265
-[28946]
+[27528]
VERSION=1.1
-NAME=EUROBIRD 9A
-NICKNAME=EUROBIRD 9A
-TLE1=1 28946U 06007B 09334.89688644 .00000085 00000-0 10000-3 0 4064
-TLE2=2 28946 0.0365 16.0358 0004378 234.0994 151.6589 1.00274446 13727
+NAME=HISPASAT 1D
+NICKNAME=HISPASAT 1D
+TLE1=1 27528U 02044A 09357.76320002 .00000000 00000-0 10000-3 0 1185
+TLE2=2 27528 0.0163 307.1885 0001007 29.1587 0.8300 1.00265545 26623
-[20453]
+[23227]
VERSION=1.1
-NAME=DELTA 2 R/B(1)
-NICKNAME=DELTA 2 R/B(1)
-TLE1=1 20453U 90008B 09336.27746423 .00001130 00000-0 89585-4 0 6471
-TLE2=2 20453 35.6322 260.0074 0375950 23.4792 338.2583 14.59609549 42608
+NAME=OPTUS B3
+NICKNAME=OPTUS B3
+TLE1=1 23227U 94055A 09356.69322258 -.00000056 00000-0 10000-3 0 4608
+TLE2=2 23227 1.9151 77.2422 0004391 201.3656 226.3134 1.00272158 56096
-[31127]
+[22827]
VERSION=1.1
-NAME=SAUDICOMSAT 4
-NICKNAME=SAUDICOMSAT 4
-TLE1=1 31127U 07012L 09336.21719619 .00000381 00000-0 89803-4 0 8073
-TLE2=2 31127 97.9723 30.0247 0071521 98.0741 262.8578 14.57988804139863
+NAME=HEALTHSAT 1
+NICKNAME=HEALTHSAT 1
+TLE1=1 22827U 93061E 09357.84800166 .00000021 00000-0 24493-4 0 4227
+TLE2=2 22827 98.4546 307.4901 0009475 40.9792 319.2083 14.30182108847338
-[25416]
+[28892]
VERSION=1.1
-NAME=ORBCOMM FM20 [+]
-NICKNAME=ORBCOMM FM20 [+]
-TLE1=1 25416U 98046D 09336.84677943 .00000132 00000-0 10909-3 0 5954
-TLE2=2 25416 44.9970 195.9377 0002461 77.0412 283.0683 14.27670924590756
+NAME=UWE-1
+NICKNAME=UWE-1
+TLE1=1 28892U 05043C 09357.21999863 .00000150 00000-0 40817-4 0 5112
+TLE2=2 28892 98.0337 241.6434 0018282 114.7896 245.5203 14.59800817221427
-[22314]
+[27807]
VERSION=1.1
-NAME=TDRS 6
-NICKNAME=TDRS 6
-TLE1=1 22314U 93003B 09336.41278221 .00000104 00000-0 10000-3 0 5787
-TLE2=2 22314 9.5947 56.6262 0005339 337.4499 14.6118 1.00268054 61862
+NAME=GSAT-2
+NICKNAME=GSAT-2
+TLE1=1 27807U 03018A 09354.91832833 .00000138 00000-0 10000-3 0 1149
+TLE2=2 27807 0.0547 264.2370 0002832 2.5430 201.4462 1.00272760 24296
-[8459]
+[33105]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 08459U 75112B 09336.93008753 .00000012 00000-0 13297-4 0 8176
-TLE2=2 08459 74.0588 120.8226 0016898 260.8899 99.0345 14.35891898778913
+NAME=JASON 2 (OSTM)
+NICKNAME=JASON 2 (OSTM)
+TLE1=1 33105U 08032A 09357.19571773 -.00000061 00000-0 00000+0 0 5093
+TLE2=2 33105 66.0417 38.3066 0007702 267.4217 92.5921 12.80929125 70553
-[12139]
+[29671]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 12139U 81003B 09336.94165953 .00000938 00000-0 53655-4 0 9247
-TLE2=2 12139 82.9560 285.0192 0594457 82.9846 283.8525 14.24495564451216
+NAME=COSMOS 2426 (717)
+NICKNAME=COSMOS 2426 (717)
+TLE1=1 29671U 06062B 09357.71756054 -.00000036 00000-0 10000-3 0 8474
+TLE2=2 29671 65.5105 36.5739 0019100 175.9180 200.7105 2.13103472 23311
-[28497]
+[28874]
VERSION=1.1
-NAME=ESSAIM-4
-NICKNAME=ESSAIM-4
-TLE1=1 28497U 04049F 09337.10584665 .00000164 00000-0 35885-4 0 6287
-TLE2=2 28497 98.2925 303.0687 0013161 70.1974 290.0652 14.70160785266089
+NAME=GPS IIR-14M (DASS)
+NICKNAME=GPS IIR-14M (DASS)
+TLE1=1 28874U 05038A 09356.51910125 .00000085 00000-0 10000-3 0 3544
+TLE2=2 28874 55.0056 151.6833 0049888 210.9111 148.7787 2.00553025 31098
-[27389]
+[27663]
VERSION=1.1
-NAME=TDRS 9
-NICKNAME=TDRS 9
-TLE1=1 27389U 02011A 09336.42984735 -.00000257 00000-0 10000-3 0 4675
-TLE2=2 27389 2.0086 223.3412 0008446 131.4158 169.1481 1.00277762 29866
+NAME=GPS BIIR-08 (DASS)
+NICKNAME=GPS BIIR-08 (DASS)
+TLE1=1 27663U 03005A 09357.23340519 -.00000004 00000-0 10000-3 0 9240
+TLE2=2 27663 55.6043 91.9080 0054036 342.8150 17.0162 2.00563672 50572
-[28369]
+[27600]
VERSION=1.1
-NAME=SAUDICOMSAT 1
-NICKNAME=SAUDICOMSAT 1
-TLE1=1 28369U 04025D 09336.64030905 -.00000023 00000-0 49717-5 0 5486
-TLE2=2 28369 98.0008 6.8740 0032823 251.4829 108.2773 14.50659595287373
+NAME=MICRO LABSAT
+NICKNAME=MICRO LABSAT
+TLE1=1 27600U 02056D 09357.12057420 -.00000030 00000-0 47444-5 0 9366
+TLE2=2 27600 98.3659 46.6075 0011700 54.6421 305.5862 14.28873974366429
-[24307]
+[20442]
VERSION=1.1
-NAME=INMARSAT 3-F2
-NICKNAME=INMARSAT 3-F2
-TLE1=1 24307U 96053A 09332.76265698 -.00000098 00000-0 10000-3 0 66
-TLE2=2 24307 0.1088 290.1289 0005102 320.8203 75.9349 1.00272059 48434
+NAME=LUSAT (LO-19)
+NICKNAME=LO-19
+TLE1=1 20442U 90005G 09357.32756103 .00000054 00000-0 35422-4 0 6881
+TLE2=2 20442 98.2690 323.9122 0011381 328.5700 31.4809 14.32076874 40381
-[29079]
+[26997]
VERSION=1.1
-NAME=EROS B
-NICKNAME=EROS B
-TLE1=1 29079U 06014A 09337.09122845 .00001158 00000-0 59934-4 0 788
-TLE2=2 29079 97.4142 94.5933 0010179 177.0330 299.0917 15.18146341200146
+NAME=JASON 1
+NICKNAME=JASON 1
+TLE1=1 26997U 01055A 09356.53486162 -.00000038 00000-0 10000-3 0 1215
+TLE2=2 26997 66.0425 39.2786 0007168 270.0797 89.9391 12.80929907376166
-[28187]
+[21426]
VERSION=1.1
-NAME=EUTELSAT W3A
-NICKNAME=EUTELSAT W3A
-TLE1=1 28187U 04008A 09332.76823265 .00000073 00000-0 10000-3 0 8683
-TLE2=2 28187 0.0741 328.9024 0003302 273.8840 108.6164 1.00275304 20963
+NAME=MOLNIYA 1-81
+NICKNAME=MOLNIYA 1-81
+TLE1=1 21426U 91043A 09357.65132877 .00000000 00000-0 10000-3 0 2015
+TLE2=2 21426 61.9332 212.9267 7191942 267.6886 16.2365 2.00615853135705
-[24903]
+[27421]
VERSION=1.1
-NAME=IRIDIUM 26 [+]
-NICKNAME=IRIDIUM 26 [+]
-TLE1=1 24903U 97043A 09336.48531767 .00000016 00000-0 -11756-5 0 9569
-TLE2=2 24903 86.3940 326.4423 0002459 79.5856 280.5613 14.34214975643169
+NAME=SPOT 5
+NICKNAME=SPOT 5
+TLE1=1 27421U 02021A 09357.70444020 .00000049 00000-0 43786-4 0 6897
+TLE2=2 27421 98.7548 68.8496 0000878 109.1981 250.9286 14.20009505396064
-[35873]
+[24846]
VERSION=1.1
-NAME=NIMIQ 5
-NICKNAME=NIMIQ 5
-TLE1=1 35873U 09050A 09334.31805229 -.00000233 00000-0 00000+0 0 527
-TLE2=2 35873 0.0152 343.0880 0001746 256.0926 231.9600 1.00270915 770
+NAME=INTELSAT 802 (IS-802)
+NICKNAME=INTELSAT 802 (IS-802)
+TLE1=1 24846U 97031A 09356.83916550 .00000175 00000-0 10000-3 0 9306
+TLE2=2 24846 0.0216 331.0847 0005109 13.9674 81.4267 1.00274174 45818
-[30777]
+[33063]
VERSION=1.1
-NAME=CFESAT
-NICKNAME=CFESAT
-TLE1=1 30777U 07006F 09335.92408176 .00000405 00000-0 32636-4 0 7265
-TLE2=2 30777 35.4318 166.2424 0003941 268.0563 91.9702 15.02879026150309
+NAME=ORBCOMM FM39 [S]
+NICKNAME=ORBCOMM FM39 [S]
+TLE1=1 33063U 08031D 09357.28303152 -.00000030 00000-0 28301-4 0 4925
+TLE2=2 33063 48.4452 272.1516 0009472 117.6012 242.5868 14.68200301 81119
-[26605]
+[25944]
VERSION=1.1
-NAME=GPS BIIR-06 (PRN 14)
-NICKNAME=GPS BIIR-06 (PRN 14)
-TLE1=1 26605U 00071A 09335.57518383 -.00000052 00000-0 10000-3 0 6446
-TLE2=2 26605 56.5782 333.8134 0052821 240.2318 119.2624 2.00564370 66371
+NAME=GLOBALSTAR M059
+NICKNAME=GLOBALSTAR M059
+TLE1=1 25944U 99058B 09357.73407548 -.00000086 00000-0 10000-3 0 571
+TLE2=2 25944 52.0055 73.9196 0002158 163.9222 196.1705 12.62264926469793
-[22269]
+[28446]
VERSION=1.1
-NAME=COSMOS 2224
-NICKNAME=COSMOS 2224
-TLE1=1 22269U 92088A 09335.95465940 -.00000069 00000-0 10000-3 0 5918
-TLE2=2 22269 10.7695 45.7940 0003091 160.6257 199.3694 1.00274297 61594
+NAME=AMC-15
+NICKNAME=AMC-15
+TLE1=1 28446U 04041A 09357.52221175 -.00000068 00000-0 10000-3 0 9586
+TLE2=2 28446 0.0408 238.9537 0001966 17.4684 278.7208 1.00272721 19047
-[25078]
+[25777]
VERSION=1.1
-NAME=IRIDIUM 44 [-]
-NICKNAME=IRIDIUM 44 [-]
-TLE1=1 25078U 97077B 09336.35298739 .00000172 00000-0 51700-4 0 3204
-TLE2=2 25078 86.3941 88.1621 0001394 24.7531 335.3729 14.36579983628070
+NAME=IRIDIUM 14 [S]
+NICKNAME=IRIDIUM 14 [S]
+TLE1=1 25777U 99032A 09357.16386130 .00000164 00000-0 33115-4 0 8619
+TLE2=2 25777 86.5137 286.2056 0002358 78.0025 282.1450 14.54932239559406
-[29640]
+[20776]
VERSION=1.1
-NAME=FENGYUN 2D
-NICKNAME=FENGYUN 2D
-TLE1=1 29640U 06053A 09336.60237112 -.00000181 00000-0 10000-3 0 7946
-TLE2=2 29640 0.2006 126.7844 0000550 220.9390 27.2337 1.00277128 10999
+NAME=SKYNET 4C
+NICKNAME=SKYNET 4C
+TLE1=1 20776U 90079A 09353.81679682 .00000038 00000-0 10000-3 0 170
+TLE2=2 20776 10.2358 45.4535 0002917 225.5215 117.6288 1.00274917 70540
-[32404]
+[22041]
VERSION=1.1
-NAME=THURAYA-3
-NICKNAME=THURAYA-3
-TLE1=1 32404U 08001A 09336.86551612 -.00000290 00000-0 10000-3 0 3470
-TLE2=2 32404 5.4839 332.0476 0005100 269.6195 240.4174 1.00271115 6964
+NAME=GORIZONT 26
+NICKNAME=GORIZONT 26
+TLE1=1 22041U 92043A 09355.53000316 -.00000245 00000-0 10000-3 0 9151
+TLE2=2 22041 11.7355 41.8384 0029399 110.7405 249.5707 0.99243321 63737
-[25460]
+[30798]
VERSION=1.1
-NAME=ST-1
-NICKNAME=ST-1
-TLE1=1 25460U 98049A 09336.60060779 -.00000194 00000-0 10000-3 0 7394
-TLE2=2 25460 0.0143 300.6033 0004462 309.5968 125.6177 1.00271777 41318
+NAME=THEMIS E
+NICKNAME=THEMIS E
+TLE1=1 30798U 07004E 09357.45833333 -.00000040 00000-0 00000+0 0 7660
+TLE2=2 30798 4.1614 233.4442 7504299 141.7694 126.4715 1.00279061 9781
-[25025]
+[26064]
VERSION=1.1
-NAME=TEAMSAT
-NICKNAME=TEAMSAT
-TLE1=1 25025U 97066C 09335.43073487 -.00000150 00000-0 -48487-3 0 7910
-TLE2=2 25025 7.6054 129.6845 6531977 317.9921 7.1082 3.07909461136033
+NAME=FALCONSAT
+NICKNAME=FALCONSAT
+TLE1=1 26064U 00004D 09357.57776370 -.00000089 00000-0 -10261-4 0 6471
+TLE2=2 26064 100.2253 176.8548 0038395 95.4352 265.1212 14.35431937518988
-[26624]
+[27516]
VERSION=1.1
-NAME=ANIK F1
-NICKNAME=ANIK F1
-TLE1=1 26624U 00076A 09335.28676407 -.00000053 00000-0 00000+0 0 5515
-TLE2=2 26624 0.0089 354.4009 0002089 253.9815 177.8483 1.00271976 33159
+NAME=KODAMA (DRTS)
+NICKNAME=KODAMA (DRTS)
+TLE1=1 27516U 02042B 09355.87237574 -.00000218 00000-0 10000-3 0 2993
+TLE2=2 27516 0.0511 270.3139 0002845 339.1521 245.8945 1.00270029 26723
-[16182]
+[25116]
VERSION=1.1
-NAME=SL-16 R/B
-NICKNAME=SL-16 R/B
-TLE1=1 16182U 85097B 09337.19174327 .00000215 00000-0 13308-3 0 169
-TLE2=2 16182 71.0032 38.8950 0009150 298.9299 61.0897 14.15965211246490
+NAME=ORBCOMM FM09 [+]
+NICKNAME=ORBCOMM FM09 [+]
+TLE1=1 25116U 97084E 09357.02699955 -.00000148 00000-0 -24796-5 0 2263
+TLE2=2 25116 45.0178 188.3539 0004691 278.0505 81.9810 14.34415614627360
-[32765]
+[25467]
VERSION=1.1
-NAME=C/NOFS
-NICKNAME=C/NOFS
-TLE1=1 32765U 08017A 09337.23113358 .00002317 00000-0 70056-4 0 4324
-TLE2=2 32765 13.0136 344.0830 0312948 211.6939 146.4150 14.81876658 88426
+NAME=IRIDIUM 82 [+]
+NICKNAME=IRIDIUM 82 [+]
+TLE1=1 25467U 98051A 09357.20133978 -.00000600 00000-0 -22148-3 0 9318
+TLE2=2 25467 86.3953 84.2276 0001654 106.1082 254.0341 14.34211725594897
-[6212]
+[28129]
VERSION=1.1
-NAME=OPS 8180 (RADCAT)
-NICKNAME=OPS 8180 (RADCAT)
-TLE1=1 06212U 72076A 09336.40619843 .00002060 00000-0 75496-4 0 8902
-TLE2=2 06212 98.5847 10.4392 0004300 130.6523 229.5124 15.29466660148586
+NAME=GPS BIIR-10 (PRN 22)
+NICKNAME=GPS BIIR-10 (PRN 22)
+TLE1=1 28129U 03058A 09356.92778996 -.00000042 00000-0 10000-3 0 4332
+TLE2=2 28129 53.6934 272.2541 0054150 253.3262 106.1263 2.00564400 44069
-[33320]
+[31119]
VERSION=1.1
-NAME=HJ-1A
-NICKNAME=HJ-1A
-TLE1=1 33320U 08041A 09337.16012757 .00000118 00000-0 25050-4 0 3805
-TLE2=2 33320 97.9684 50.3274 0023703 258.2797 101.5757 14.75196376 66807
+NAME=SAUDICOMSAT 7
+NICKNAME=SAUDICOMSAT 7
+TLE1=1 31119U 07012C 09357.18239228 .00000386 00000-0 88724-4 0 8162
+TLE2=2 31119 97.9694 52.4074 0062857 26.4526 333.9833 14.59471969143067
-[29659]
+[24315]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 29659U 06060B 09336.87205564 .00001134 00000-0 42558-4 0 8672
-TLE2=2 29659 98.0859 90.3226 0038431 13.9658 346.2627 15.29057392164807
+NAME=AMC-1 (GE-1)
+NICKNAME=AMC-1 (GE-1)
+TLE1=1 24315U 96054A 09356.91856219 .00000000 00000-0 10000-3 0 2619
+TLE2=2 24315 0.0164 261.7586 0003273 356.5898 60.9190 1.00269025 48677
-[27378]
+[27601]
VERSION=1.1
-NAME=ECHOSTAR 7
-NICKNAME=ECHOSTAR 7
-TLE1=1 27378U 02006A 09334.27599390 .00000023 00000-0 10000-3 0 4521
-TLE2=2 27378 0.0165 349.4140 0001349 250.3508 169.9994 1.00273688 28479
+NAME=H-2A R/B
+NICKNAME=H-2A R/B
+TLE1=1 27601U 02056E 09357.34994263 .00000025 00000-0 25358-4 0 8042
+TLE2=2 27601 98.5664 84.3324 0073926 85.2859 275.6771 14.30728691366915
-[29398]
+[25468]
VERSION=1.1
-NAME=ZHONGXING-22A
-NICKNAME=ZHONGXING-22A
-TLE1=1 29398U 06038A 09336.70924969 -.00000306 00000-0 10000-3 0 9797
-TLE2=2 29398 0.0705 69.1885 0002883 202.9469 158.1897 1.00273966 11875
+NAME=IRIDIUM 81 [+]
+NICKNAME=IRIDIUM 81 [+]
+TLE1=1 25468U 98051B 09357.19499773 -.00000560 00000-0 -20716-3 0 7575
+TLE2=2 25468 86.3951 84.0555 0002351 86.3068 273.8409 14.34212467591112
-[28773]
+[33108]
VERSION=1.1
-NAME=SUZAKU (ASTRO-EII)
-NICKNAME=SUZAKU (ASTRO-EII)
-TLE1=1 28773U 05025A 09337.22712488 .00000308 00000-0 17988-4 0 1366
-TLE2=2 28773 31.4064 278.3280 0006075 79.0188 281.1138 15.00885847241623
+NAME=COSMOS 2440
+NICKNAME=COSMOS 2440
+TLE1=1 33108U 08033A 09356.81946198 -.00000120 00000-0 10000-3 0 4261
+TLE2=2 33108 1.0653 295.2386 0002231 34.1114 137.2316 1.00276936 5449
-[25315]
+[27858]
VERSION=1.1
-NAME=COSMOS 2350
-NICKNAME=COSMOS 2350
-TLE1=1 25315U 98025A 09334.76553005 -.00000074 00000-0 10000-3 0 4159
-TLE2=2 25315 7.7652 60.3464 0004191 334.4839 25.3430 1.00286368 42464
+NAME=SCISAT 1
+NICKNAME=SCISAT 1
+TLE1=1 27858U 03036A 09357.82644354 .00000008 00000-0 63328-5 0 9087
+TLE2=2 27858 73.9322 168.9313 0008555 187.2298 172.8755 14.74827142342676
-[21906]
+[34839]
VERSION=1.1
-NAME=GALAXY 5
-NICKNAME=GALAXY 5
-TLE1=1 21906U 92013A 09335.80352572 .00000092 00000-0 10000-3 0 9811
-TLE2=2 21906 4.6469 71.3778 0013203 278.8558 80.7027 0.99284730 56427
+NAME=YAOGAN 6
+NICKNAME=YAOGAN 6
+TLE1=1 34839U 09021A 09357.67581074 .00000936 00000-0 49329-4 0 7819
+TLE2=2 34839 97.6134 68.0022 0002831 119.9649 34.7354 15.18086078 37257
-[7004]
+[25163]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 07004U 73107B 09336.95867365 .00000995 00000-0 42156-4 0 1873
-TLE2=2 07004 73.9580 280.9813 0427338 104.9139 259.9755 14.68691490825072
+NAME=GLOBALSTAR M004
+NICKNAME=GLOBALSTAR M004
+TLE1=1 25163U 98008B 09357.55191522 -.00000086 00000-0 10000-3 0 4967
+TLE2=2 25163 52.0011 21.1618 0002670 12.4276 347.6649 12.63156453547117
-[19223]
+[17589]
VERSION=1.1
-NAME=NOVA 11
-NICKNAME=NOVA 11
-TLE1=1 19223U 88052A 09336.67663252 .00000050 00000-0 10000-3 0 5858
-TLE2=2 19223 90.0215 91.0058 0029267 303.1653 56.6672 13.22420002 35912
+NAME=COSMOS 1833
+NICKNAME=COSMOS 1833
+TLE1=1 17589U 87027A 09357.12186373 -.00000332 00000-0 -15265-3 0 4817
+TLE2=2 17589 70.9133 167.9082 0004171 172.3973 187.7207 14.12758567174294
-[15936]
+[25578]
VERSION=1.1
-NAME=OSCAR 24
-NICKNAME=OSCAR 24
-TLE1=1 15936U 85066B 09336.70089995 .00000064 00000-0 10000-3 0 8664
-TLE2=2 15936 90.0473 20.6213 0171438 34.0688 327.1319 13.35165565185310
+NAME=IRIDIUM 11 [S]
+NICKNAME=IRIDIUM 11 [S]
+TLE1=1 25578U 98074B 09356.96134130 .00000140 00000-0 27615-4 0 8916
+TLE2=2 25578 86.5141 318.0066 0002488 79.8976 280.2513 14.54934642584994
-[26382]
+[11849]
VERSION=1.1
-NAME=FENGYUN 2B
-NICKNAME=FENGYUN 2B
-TLE1=1 26382U 00032A 09333.93940640 .00000136 00000-0 10000-3 0 2244
-TLE2=2 26382 4...
[truncated message content] |
|
From: <cs...@us...> - 2009-12-24 10:33:21
|
Revision: 546
http://gpredict.svn.sourceforge.net/gpredict/?rev=546&view=rev
Author: csete
Date: 2009-12-24 10:33:12 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
Added nickname for XW-1 / HO-68.
Modified Paths:
--------------
trunk/data/satdata/scripts/convert.py
Modified: trunk/data/satdata/scripts/convert.py
===================================================================
--- trunk/data/satdata/scripts/convert.py 2009-12-21 14:02:46 UTC (rev 545)
+++ trunk/data/satdata/scripts/convert.py 2009-12-24 10:33:12 UTC (rev 546)
@@ -105,7 +105,8 @@
"28894" : "XO-53",
"28895" : "CO-58",
"28941" : "CO-56",
- "35870" : "SO-67"
+ "35870" : "SO-67",
+ "36122" : "HO-68"
}
urlprefix = "http://celestrak.com/NORAD/elements/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-21 14:02:55
|
Revision: 545
http://gpredict.svn.sourceforge.net/gpredict/?rev=545&view=rev
Author: csete
Date: 2009-12-21 14:02:46 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/AUTHORS
trunk/src/about.c
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2009-12-21 13:59:47 UTC (rev 544)
+++ trunk/AUTHORS 2009-12-21 14:02:46 UTC (rev 545)
@@ -11,6 +11,7 @@
see http://www.dachaplin.dsl.pipex.com/goocanvas/
- Maidenhead locator functions are based on work done by Stephane Fillod,
Nate Bargmann, Dave Hines, Mirko Caserta, and S. R. Sampson.
+- Paul Schulz, various patches.
Imagery:
Most of the maps originate from NASA Visible Earth, http://visibleearth.nasa.gov/
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2009-12-21 13:59:47 UTC (rev 544)
+++ trunk/src/about.c 2009-12-21 14:02:46 UTC (rev 545)
@@ -40,8 +40,8 @@
"",
"Contributors:",
"David VK5DG (Transponder data files)",
- "Charles Suprin, AA1VS (Various multithread fixes)",
- "Valentin Yakovenkov (Windows build)",
+ "Charles Suprin, AA1VS (Various multithread fixes)",
+ "Valentin Yakovenkov (Windows build)",
"Bruce Cowan (Gio port of TLE updater)",
"Damon Chaplin (GooCanvas)",
"Dr. T.S. Kelso (SGP4/SDP4 algorithms)",
@@ -53,6 +53,7 @@
"Dave Hines (locator.c)",
"Mirko Caserta (locator.c)",
"S. R. Sampson (locator.c)",
+ "Paul Schulz (various patches)",
"",
"Imagery:",
"Most of the maps originate from NASA Visible Earth",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-21 13:59:55
|
Revision: 544
http://gpredict.svn.sourceforge.net/gpredict/?rev=544&view=rev
Author: csete
Date: 2009-12-21 13:59:47 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Fixed bug 2918672: Trailing whitespace and newline in satellite names.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/tle-update.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-21 00:52:22 UTC (rev 543)
+++ trunk/ChangeLog 2009-12-21 13:59:47 UTC (rev 544)
@@ -5,7 +5,11 @@
* doc/notes/time_keeping.txt:
Applied patch 2916646 from Paul Schulz: Minor fixes to documentation.
+ * src/tle-update.c:
+ Fixed bug 2918672: Trailing whitespace and newline in satellite names.
+ Fixed indentation.
+
2009-12-02 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-event-list-popup.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-12-21 00:52:22 UTC (rev 543)
+++ trunk/NEWS 2009-12-21 13:59:47 UTC (rev 544)
@@ -9,12 +9,13 @@
* Feature request 2778735: Visual indicator for RX/TX/TRX.
* Feature request 2689352: Mutual Contact Window AOS/LOS.
- Fixed bug 2877974: Incorrect uplink Doppler.
-- Applied patch 2876485: Fix a memory leak in the rotator controller (Thanks to
- Charles Suprin AA1VS).
-- Applied patch 2877878: Change Flag to Lock in tle-update (thanks Charles Suprin AA1VS).
-- Applied patch 2877918: Fixes segfault in TLE updater (thanks Charles Suprin AA1VS).
-- Applied patch 2881367: Updated Flags to Locks (thanks Charles Suprin AA1VS).
-- Applied patch 2893617: Patches for fixing Windows build (thanks Valentin Yakovenkov).
+- Fixed bug 2918672: Trailing whitespace and newline in satellite names.
+- Applied patch 2876485: Fix a memory leak in the rotator controller (Thanks to Charles Suprin AA1VS).
+- Applied patch 2877878: Change Flag to Lock in tle-update (thanks to Charles Suprin AA1VS).
+- Applied patch 2877918: Fixes segfault in TLE updater (thanks to Charles Suprin AA1VS).
+- Applied patch 2881367: Updated Flags to Locks (thanks to Charles Suprin AA1VS).
+- Applied patch 2893617: Patches for fixing Windows build (thanks to Valentin Yakovenkov).
+- Applied patch 2916646: Minor fixes to documentation (thanks to Paul Schulz).
- Slightly improved UI for the single-satellite view.
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2009-12-21 00:52:22 UTC (rev 543)
+++ trunk/src/tle-update.c 2009-12-21 13:59:47 UTC (rev 544)
@@ -126,7 +126,7 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: A TLE update process is already running. Aborting."),
__FUNCTION__);
-
+
return;
}
@@ -136,7 +136,7 @@
/* open directory and read files one by one */
cache_dir = g_dir_open (dir, 0, &err);
-
+
if (err != NULL) {
/* send an error message */
@@ -524,9 +524,9 @@
/*if (tle_in_progress)*/
if (g_static_mutex_trylock(&tle_in_progress)==FALSE) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: A TLE update process is already running. Aborting."),
- __FUNCTION__);
-
+ _("%s: A TLE update process is already running. Aborting."),
+ __FUNCTION__);
+
return;
}
@@ -637,19 +637,19 @@
/* continue update if we have fetched at least one file */
if (success > 0) {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Fetched %d files from network; updating..."),
- __FUNCTION__, success);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Fetched %d files from network; updating..."),
+ __FUNCTION__, success);
/* call update_from_files */
cache = sat_file_name ("cache");
tle_update_from_files (cache, NULL, silent, progress, label1, label2);
g_free (cache);
-
+
}
else {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not fetch any new TLE files from network; aborting..."),
- __FUNCTION__);
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not fetch any new TLE files from network; aborting..."),
+ __FUNCTION__);
}
}
@@ -689,7 +689,7 @@
g_free (cache);
/* clear busy flag */
- /* tle_in_progress = FALSE; */
+ /* tle_in_progress = FALSE; */
g_static_mutex_unlock(&tle_in_progress);
}
@@ -754,99 +754,99 @@
/* read category name for catfile */
catfile = g_fopen (catpath, "r");
- if (catfile!=NULL) {
- b = fgets (category, 80, catfile);
- fclose (catfile);
- }
- else {
- /* FIXME not sure what goes here AA1VS */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to open %s"),
- __FILE__, __FUNCTION__, catpath);
- return (retcode);
- }
+ if (catfile!=NULL) {
+ b = fgets (category, 80, catfile);
+ fclose (catfile);
+ }
+ else {
+ /* FIXME not sure what goes here AA1VS */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to open %s"),
+ __FILE__, __FUNCTION__, catpath);
+ return (retcode);
+ }
/* reopen a new catfile and write category name */
catfile = g_fopen (catpath, "w");
- if (catfile!=NULL) {
+ if (catfile!=NULL) {
- fputs (category, catfile);
-
- /* .cat file now contains the category name;
+ fputs (category, catfile);
+
+ /* .cat file now contains the category name;
satellite catnums will be added during update in the while loop */
- /* read 3 lines at a time */
- while (fgets (tle_str[0], 80, fp)) {
- /* read second and third lines */
- b = fgets (tle_str[1], 80, fp);
- b = fgets (tle_str[2], 80, fp);
-
- tle_str[1][69] = '\0';
- tle_str[2][69] = '\0';
-
- /* copy catnum and convert to integer */
- for (i = 2; i < 7; i++) {
- catstr[i-2] = tle_str[1][i];
- }
- catstr[5] = '\0';
- catnr = (guint) g_ascii_strtod (catstr, NULL);
-
-
- if (Get_Next_Tle_Set (tle_str, &tle) != 1) {
- /* TLE data not good */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Invalid data for %d"),
- __FILE__, __FUNCTION__, catnr);
- }
- else {
- /* DATA OK, phew... */
- /* sat_log_log (SAT_LOG_LEVEL_DEBUG, */
- /* _("%s: Good data for %d"), */
- /* __FUNCTION__, */
- /* catnr); */
-
- /* store catalog number in catfile */
- buff = g_strdup_printf ("%d\n", catnr);
- fputs (buff, catfile);
- g_free (buff);
-
- /* add data to hash table */
- key = g_try_new0 (guint, 1);
- *key = catnr;
-
- /* check if satellite already in hash table */
- if (g_hash_table_lookup (data, key) == NULL) {
-
- /* create new_tle structure */
- ntle = g_try_new (new_tle_t, 1);
- ntle->catnum = catnr;
- ntle->epoch = tle.epoch;
- ntle->satname = g_strdup (tle_str[0]);
- ntle->line1 = g_strdup (tle_str[1]);
- ntle->line2 = g_strdup (tle_str[2]);
- ntle->srcfile = g_strdup (fnam);
- ntle->isnew = TRUE; /* flag will be reset when using data */
-
-
- g_hash_table_insert (data, key, ntle);
- retcode++;
- }
- else {
- g_free (key);
- }
- }
-
- }
-
- /* close category file */
- fclose (catfile);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to open %s"),
- __FILE__, __FUNCTION__, catpath);
- }
+ /* read 3 lines at a time */
+ while (fgets (tle_str[0], 80, fp)) {
+ /* read second and third lines */
+ b = fgets (tle_str[1], 80, fp);
+ b = fgets (tle_str[2], 80, fp);
+ tle_str[1][69] = '\0';
+ tle_str[2][69] = '\0';
+
+ /* copy catnum and convert to integer */
+ for (i = 2; i < 7; i++) {
+ catstr[i-2] = tle_str[1][i];
+ }
+ catstr[5] = '\0';
+ catnr = (guint) g_ascii_strtod (catstr, NULL);
+
+
+ if (Get_Next_Tle_Set (tle_str, &tle) != 1) {
+ /* TLE data not good */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Invalid data for %d"),
+ __FILE__, __FUNCTION__, catnr);
+ }
+ else {
+ /* DATA OK, phew... */
+ /* sat_log_log (SAT_LOG_LEVEL_DEBUG, */
+ /* _("%s: Good data for %d"), */
+ /* __FUNCTION__, */
+ /* catnr); */
+
+ /* store catalog number in catfile */
+ buff = g_strdup_printf ("%d\n", catnr);
+ fputs (buff, catfile);
+ g_free (buff);
+
+ /* add data to hash table */
+ key = g_try_new0 (guint, 1);
+ *key = catnr;
+
+ /* check if satellite already in hash table */
+ if (g_hash_table_lookup (data, key) == NULL) {
+
+ /* create new_tle structure */
+ ntle = g_try_new (new_tle_t, 1);
+ ntle->catnum = catnr;
+ ntle->epoch = tle.epoch;
+ ntle->satname = g_strdup (g_strchomp(tle_str[0]));
+ ntle->line1 = g_strdup (tle_str[1]);
+ ntle->line2 = g_strdup (tle_str[2]);
+ ntle->srcfile = g_strdup (fnam);
+ ntle->isnew = TRUE; /* flag will be reset when using data */
+
+
+ g_hash_table_insert (data, key, ntle);
+ retcode++;
+ }
+ else {
+ g_free (key);
+ }
+ }
+
+ }
+
+ /* close category file */
+ fclose (catfile);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to open %s"),
+ __FILE__, __FUNCTION__, catpath);
+ }
+
g_free (catpath);
/* close input TLE file */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-21 01:27:38
|
Revision: 542
http://gpredict.svn.sourceforge.net/gpredict/?rev=542&view=rev
Author: csete
Date: 2009-12-21 00:13:23 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Applied patch 2916646 from Paul Schulz: Minor fixes to documentation.
Modified Paths:
--------------
trunk/doc/man/gpredict.1.in
trunk/doc/notes/configuration.txt
trunk/doc/notes/time_keeping.txt
Modified: trunk/doc/man/gpredict.1.in
===================================================================
--- trunk/doc/man/gpredict.1.in 2009-12-06 13:05:21 UTC (rev 541)
+++ trunk/doc/man/gpredict.1.in 2009-12-21 00:13:23 UTC (rev 542)
@@ -11,7 +11,7 @@
.SH "DESCRIPTION"
.\" Add any additional description here
.PP
-Gpredict is a real-time satellite tracking and orbit prediction program. It can track an unlimitied number of satellites and display the satellite data in various visualisation modules like lists, maps and polar plots. Gpredict can also provide detailed information about upcoming satellite passes relative to one or more ground stations. Gpredict can perform Doppler tuning and antenna rotator tracking via hamlib. The complete user manual, as well as other documentation, is available from http://gpredict.oz9aec.net/documents.php
+Gpredict is a real-time satellite tracking and orbit prediction program. It can track an unlimited number of satellites and display the satellite data in various visualisation modules like lists, maps and polar plots. Gpredict can also provide detailed information about upcoming satellite passes relative to one or more ground stations. Gpredict can perform Doppler tuning and antenna rotator tracking via hamlib. The complete user manual, as well as other documentation, is available from http://gpredict.oz9aec.net/documents.php
.SH "AUTHOR"
Modified: trunk/doc/notes/configuration.txt
===================================================================
--- trunk/doc/notes/configuration.txt 2009-12-06 13:05:21 UTC (rev 541)
+++ trunk/doc/notes/configuration.txt 2009-12-21 00:13:23 UTC (rev 542)
@@ -3,11 +3,11 @@
1. A global configuration layer accessible via Edit->Preferences, which applies
to the whole program.
-2. A local configuration layer for modules accessible via the "Sittings" button
+2. A local configuration layer for modules accessible via the "Settings" button
in the module configuration dialog.
The global configuration layer is implemented in the sat-pref modules and is
-inteded to provide useful parameters that can be used as default values. The
+intended to provide useful parameters that can be used as default values. The
local layer is implemented in the mod-cfg module and is intended to allow users
to configure each module individually. If a module does not have its own
configuration the parameters will fall back to their corresponding default
@@ -16,7 +16,7 @@
When creating a new module, the module should first try to read the local
configuration parameter using the .mod file and the keys defined in config-keys.h
If a parameter does not exist the modules should read the value from sat-cfg,
-which always will return a useful value, i.e. sat-cfg has buil-in defaults.
+which always will return a useful value, i.e. sat-cfg has built-in defaults.
The mod-cfg-util module provides utility functions to warp all this code into
ine single function call for all kinds of used parameters (bool, int, char). The
required parameters for these functions are the local GKeyFile, the local section
Modified: trunk/doc/notes/time_keeping.txt
===================================================================
--- trunk/doc/notes/time_keeping.txt 2009-12-06 13:05:21 UTC (rev 541)
+++ trunk/doc/notes/time_keeping.txt 2009-12-21 00:13:23 UTC (rev 542)
@@ -35,11 +35,12 @@
The Time Manager
----------------
-Each module has its own built-in time manager, which keeps track of the module
-time. Besides real-time, gpredict also allows the user to use simulated real-time
-and manual time keeping individually for each module. Each of these are described
-in following.
+Each module has its own built-in time manager, which keeps track of
+the module time. Besides real-time, gpredict also allows the user to
+use simulated real-time and manual time keeping individually for each
+module. Each of these are described in following.
+
Real-time:
The clock of the module is synchronised to the system time in a 1:1 relation.
@@ -54,7 +55,7 @@
scroll forward and backward in time using various controls. The time
resolution here is 1 second.
-By default, each module will use real-time. In irder to enter another time
+By default, each module will use real-time. In order to enter another time
keeping state, the user has to open the Time Manager from the module pop-up
menu.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-12-21 00:52:29
|
Revision: 543
http://gpredict.svn.sourceforge.net/gpredict/?rev=543&view=rev
Author: csete
Date: 2009-12-21 00:52:22 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-21 00:13:23 UTC (rev 542)
+++ trunk/ChangeLog 2009-12-21 00:52:22 UTC (rev 543)
@@ -1,5 +1,13 @@
-2009-12-02 alexandru Csete <oz9aec at gmail.com>
+2009-12-21 Alexandru Csete <oz9aec at gmail.com>
+ * doc/man/gpredict.1.in:
+ * doc/notes/configuration.txt:
+ * doc/notes/time_keeping.txt:
+ Applied patch 2916646 from Paul Schulz: Minor fixes to documentation.
+
+
+2009-12-02 Alexandru Csete <oz9aec at gmail.com>
+
* src/gtk-event-list-popup.[ch]:
New files implementing popup menu for GtkEventList widget.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
