Subtracting Julians returns a Timespan. Added GetTotalSeconds to Timespan
parent
e58928e887
commit
ed47037ad4
12
Julian.cpp
12
Julian.cpp
|
@ -15,7 +15,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Julian::Julian() {
|
Julian::Julian() {
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
SYSTEMTIME st;
|
SYSTEMTIME st;
|
||||||
GetSystemTime(&st);
|
GetSystemTime(&st);
|
||||||
|
@ -154,8 +154,14 @@ Julian Julian::operator-(const Timespan& b) const {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Timespan Julian::operator-(const Julian& b) const {
|
||||||
|
|
||||||
|
Timespan result(date_ - b.date_);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
std::ostream & operator<<(std::ostream& stream, const Julian& julian) {
|
std::ostream & operator<<(std::ostream& stream, const Julian& julian) {
|
||||||
|
|
||||||
std::stringstream out;
|
std::stringstream out;
|
||||||
struct Julian::DateTimeComponents datetime;
|
struct Julian::DateTimeComponents datetime;
|
||||||
julian.ToGregorian(&datetime);
|
julian.ToGregorian(&datetime);
|
||||||
|
@ -229,7 +235,7 @@ time_t Julian::ToTime() const {
|
||||||
* Greenwich Mean Sidereal Time
|
* Greenwich Mean Sidereal Time
|
||||||
*/
|
*/
|
||||||
double Julian::ToGreenwichSiderealTime() const {
|
double Julian::ToGreenwichSiderealTime() const {
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
double theta;
|
double theta;
|
||||||
double tut1;
|
double tut1;
|
||||||
|
|
2
Julian.h
2
Julian.h
|
@ -33,6 +33,8 @@ public:
|
||||||
Julian operator+(const Timespan& b) const;
|
Julian operator+(const Timespan& b) const;
|
||||||
Julian operator-(const Timespan& b) const;
|
Julian operator-(const Timespan& b) const;
|
||||||
|
|
||||||
|
Timespan operator-(const Julian& b) const;
|
||||||
|
|
||||||
friend std::ostream & operator<<(std::ostream& stream, const Julian& julian);
|
friend std::ostream & operator<<(std::ostream& stream, const Julian& julian);
|
||||||
|
|
||||||
struct DateTimeComponents {
|
struct DateTimeComponents {
|
||||||
|
|
|
@ -32,6 +32,10 @@ double Timespan::GetTotalMinutes() const {
|
||||||
return time_span_ * kMINUTES_PER_DAY;
|
return time_span_ * kMINUTES_PER_DAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double Timespan::GetTotalSeconds() const {
|
||||||
|
return time_span_ * kSECONDS_PER_DAY;
|
||||||
|
}
|
||||||
|
|
||||||
Timespan& Timespan::operator =(const Timespan& b) {
|
Timespan& Timespan::operator =(const Timespan& b) {
|
||||||
|
|
||||||
if (this != &b) {
|
if (this != &b) {
|
||||||
|
|
|
@ -11,6 +11,7 @@ public:
|
||||||
double GetTotalDays() const;
|
double GetTotalDays() const;
|
||||||
double GetTotalHours() const;
|
double GetTotalHours() const;
|
||||||
double GetTotalMinutes() const;
|
double GetTotalMinutes() const;
|
||||||
|
double GetTotalSeconds() const;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* overloaded operators
|
* overloaded operators
|
||||||
|
|
Loading…
Reference in New Issue