Changed Geographic to Geodetic

Added Observer class
feature/19
Daniel Warner 2011-03-30 16:18:19 +01:00
parent 3c9845e34f
commit f52c1200cb
6 changed files with 66 additions and 38 deletions

View File

@ -1,18 +1,18 @@
#ifndef COORD_H_ #ifndef COORD_H_
#define COORD_H_ #define COORD_H_
class CoordGeographic { class CoordGeodetic {
public: public:
CoordGeographic() CoordGeodetic()
: lat_(0.0), lon_(0.0), alt_(0.0) { : lat_(0.0), lon_(0.0), alt_(0.0) {
} }
CoordGeographic(double latitude, double longitude, double altitude) CoordGeodetic(double latitude, double longitude, double altitude)
: lat_(latitude), lon_(longitude), alt_(altitude) { : lat_(latitude), lon_(longitude), alt_(altitude) {
} }
virtual ~CoordGeographic() { virtual ~CoordGeodetic() {
}; };
void SetLatitude(const double& latitude) { void SetLatitude(const double& latitude) {

7
Observer.cpp Normal file
View File

@ -0,0 +1,7 @@
#include "Observer.h"
Observer::Observer(void) {
}
Observer::~Observer(void) {
}

13
Observer.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef OBSERVER_H_
#define OBSERVER_H_
#include "Coord.h"
class Observer {
public:
Observer(void);
virtual ~Observer(void);
};
#endif

View File

@ -78,6 +78,7 @@
<ClCompile Include="Globals.cpp" /> <ClCompile Include="Globals.cpp" />
<ClCompile Include="Julian.cpp" /> <ClCompile Include="Julian.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="Observer.cpp" />
<ClCompile Include="SGDP4.cpp" /> <ClCompile Include="SGDP4.cpp" />
<ClCompile Include="Tle.cpp" /> <ClCompile Include="Tle.cpp" />
<ClCompile Include="Vector.cpp" /> <ClCompile Include="Vector.cpp" />
@ -86,6 +87,7 @@
<ClInclude Include="Coord.h" /> <ClInclude Include="Coord.h" />
<ClInclude Include="Globals.h" /> <ClInclude Include="Globals.h" />
<ClInclude Include="Julian.h" /> <ClInclude Include="Julian.h" />
<ClInclude Include="Observer.h" />
<ClInclude Include="SatelliteException.h" /> <ClInclude Include="SatelliteException.h" />
<ClInclude Include="SGDP4.h" /> <ClInclude Include="SGDP4.h" />
<ClInclude Include="Tle.h" /> <ClInclude Include="Tle.h" />

View File

@ -36,6 +36,9 @@
<ClCompile Include="SGDP4.cpp"> <ClCompile Include="SGDP4.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Observer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Coord.h"> <ClInclude Include="Coord.h">
@ -59,5 +62,8 @@
<ClInclude Include="SatelliteException.h"> <ClInclude Include="SatelliteException.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Observer.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -13,41 +13,41 @@ int main() {
std::list<Tle> tles; std::list<Tle> tles;
#if 0 #if 0
tles.push_back(Tle("ALSAT 1 ",
"1 27559U 02054A 11083.20474426 .00000231 00000-0 46807-4 0 3956",
"2 27559 97.8504 306.7237 0024736 97.8736 262.5269 14.69492531444449"));
tles.push_back(Tle("NIGERIASAT 1 ",
"1 27941U 03042C 11083.20062099 .00000034 00000-0 15255-4 0 4571",
"2 27941 97.8567 300.6588 0010245 259.2618 100.7415 14.63156215399858"));
tles.push_back(Tle("UK-DMC ",
"1 27942U 03042D 11083.04316290 .00000204 00000-0 36461-4 0 4772",
"2 27942 97.8673 303.9260 0065042 261.4265 97.9577 14.75702181400051"));
tles.push_back(Tle("BILSAT 1 ",
"1 27943U 03042E 11083.20386998 -.00000002 00000-0 82329-5 0 3134",
"2 27943 97.8533 299.8242 0010407 257.0777 102.9254 14.63001134399833"));
tles.push_back(Tle("BEIJING 1 ",
"1 28890U 05043A 11083.22028522 .00000028 00000-0 15067-4 0 1934",
"2 28890 97.9686 322.2607 0016579 121.4143 238.8674 14.60143088288034"));
tles.push_back(Tle("HJ-1A ",
"1 33320U 08041A 11083.21627564 .00000217 00000-0 39265-4 0 8123",
"22 33320 97.9130 157.6832 0025261 164.3664 195.8335 14.75427668136992"));
tles.push_back(Tle("HJ-1B ",
"1 33321U 08041B 11083.18241190 .00000035 00000-0 12683-4 0 8489",
"2 33321 97.9157 157.7757 0043106 177.6044 182.5404 14.75420918136975"));
tles.push_back(Tle("YAOGAN 4 ",
"1 33446U 08061A 11083.17563858 -.00000429 00000-0 -57253-4 0 5642",
"2 33446 97.8399 157.1424 0018816 112.5537 247.7690 14.74344039124291"));
tles.push_back(Tle("YAOGAN 5 ",
"1 33456U 08064A 11083.21782255 .00003643 00000-0 13418-3 0 5581",
"2 33456 97.3041 157.1374 0010196 267.5526 176.9312 15.28421737126430"));
tles.push_back(Tle("DEIMOS-1 ",
"1 35681U 09041A 11083.21989648 .00000042 00000-0 15391-4 0 8355",
"2 35681 98.0756 343.3041 0001640 85.6884 274.4515 14.69436598 88502"));
tles.push_back(Tle("UK-DMC 2 ",
"1 35683U 09041C 11083.19129526 .00000128 00000-0 29890-4 0 8539",
"2 35683 98.0774 342.2478 0001262 104.0560 256.0776 14.69410764 88426"));
#endif
tles.push_back(Tle("ALSAT 1 ",
"1 27559U 02054A 11089.12872679 .00000243 00000-0 48843-4 0 4131",
"2 27559 97.8507 312.4200 0024709 79.8694 280.5316 14.69495914445317"));
tles.push_back(Tle("NIGERIASAT 1 ",
"1 27941U 03042C 11089.42378502 .00000216 00000-0 50713-4 0 4761",
"2 27941 97.8561 306.5880 0010368 237.5473 122.4725 14.63159222400765"));
tles.push_back(Tle("UK-DMC ",
"1 27942U 03042D 11089.21347025 .00000290 00000-0 48646-4 0 4961",
"2 27942 97.8664 309.9311 0065103 241.0875 118.3788 14.75706603400968"));
tles.push_back(Tle("BILSAT 1 ",
"1 27943U 03042E 11089.08572765 .00000047 00000-0 17816-4 0 3300",
"2 27943 97.8538 305.4240 0010467 236.5131 123.5076 14.63002695400693"));
tles.push_back(Tle("BEIJING 1 ",
"1 28890U 05043A 11089.11363757 .00000109 00000-0 31969-4 0 2110",
"2 28890 97.9674 327.9265 0016808 104.1515 256.1558 14.60145019288893"));
tles.push_back(Tle("HJ-1A ",
"1 33320U 08041A 11089.11645018 .00000558 00000-0 89157-4 0 8293",
"2 33320 97.9120 163.4564 0025524 145.5493 214.7394 14.75434524137863"));
tles.push_back(Tle("HJ-1B ",
"1 33321U 08041B 11089.08261697 .00000036 00000-0 12683-4 0 8669",
"2 33321 97.9143 163.5499 0043578 158.5982 201.7100 14.75426284137846"));
tles.push_back(Tle("YAOGAN 4 ",
"1 33446U 08061A 11089.08015953 -.00000298 00000-0 -37502-4 0 5825",
"2 33446 97.8391 162.8578 0018973 95.0341 265.3034 14.74341232125165"));
tles.push_back(Tle("YAOGAN 5 ",
"1 33456U 08064A 11089.23155758 .00004620 00000-0 16914-3 0 5761",
"2 33456 97.3037 163.0372 0010288 244.1979 149.0647 15.28479448127350"));
tles.push_back(Tle("DEIMOS-1 ",
"1 35681U 09041A 11089.07598815 .00000232 00000-0 47449-4 0 8526",
"2 35681 98.0731 349.0935 0001647 77.8673 282.2722 14.69439966 89360"));
tles.push_back(Tle("UK-DMC 2 ",
"1 35683U 09041C 11089.11558659 .00000272 00000-0 54146-4 0 8712",
"2 35683 98.0762 348.1067 0001434 99.8921 260.2456 14.69414094 89293"));
#endif
//tles.push_back(Tle("SGP4 Test", //tles.push_back(Tle("SGP4 Test",
// "1 88888U 80275.98708465 .00073094 13844-3 66816-4 0 8", // "1 88888U 80275.98708465 .00073094 13844-3 66816-4 0 8",
// "2 88888 72.8435 115.9689 0086731 52.6988 110.5714 16.05824518 105")); // "2 88888 72.8435 115.9689 0086731 52.6988 110.5714 16.05824518 105"));