atria-soft/echrono
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct time in ad out and display

Browse Source
This commit is contained in:
Edouard DUPIN 2016-12-12 21:04:52 +01:00
parent 4927212da3
commit 7b6245023b
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
echrono/Clock.hpp
View File

@ -52,3 +52,5 @@ namespace echrono {
std::ostream& operator <<(std::ostream& _os, const echrono::Clock& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Clock& _obj);
} }
#include <echrono/Duration.hpp>

4
echrono/Duration.cpp
View File

@ -74,8 +74,8 @@ bool echrono::Duration::operator>= (const echrono::Duration& _obj) const {
return m_data >= _obj.m_data; return m_data >= _obj.m_data;
} }
float echrono::Duration::toSeconds() const { double echrono::Duration::toSeconds() const {
return float(double(m_data.count()) * 0.000000001); return double(m_data.count()) * 0.000000001;
} }
const echrono::Duration& echrono::Duration::operator/= (float _value) { const echrono::Duration& echrono::Duration::operator/= (float _value) {

2
echrono/Duration.hpp
View File

@ -51,7 +51,7 @@ namespace echrono {
Duration operator++(int _unused); Duration operator++(int _unused);
Duration& operator--(); Duration& operator--();
Duration operator--(int _unused); Duration operator--(int _unused);
float toSeconds() const; double toSeconds() const;
void reset(); void reset();
}; };
std::ostream& operator <<(std::ostream& _os, const echrono::Duration& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Duration& _obj);

3
echrono/Steady.hpp
View File

@ -50,3 +50,6 @@ namespace echrono {
std::ostream& operator <<(std::ostream& _os, const echrono::Steady& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Steady& _obj);
} }
#include <echrono/Duration.hpp>

6
echrono/Time.cpp
View File

@ -125,6 +125,7 @@ int64_t echrono::Time::count() {
} }
std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj) { std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj) {
/*
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch()); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
int64_t totalSecond = ns.count()/1000000000; int64_t totalSecond = ns.count()/1000000000;
int64_t millisecond = (ns.count()%1000000000)/1000000; int64_t millisecond = (ns.count()%1000000000)/1000000;
@ -135,7 +136,7 @@ std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj)
int32_t minute = (totalSecond/60)%60; int32_t minute = (totalSecond/60)%60;
int32_t hour = (totalSecond/3600)%24; int32_t hour = (totalSecond/3600)%24;
int32_t day = (totalSecond/(24*3600))%365; int32_t day = (totalSecond/(24*3600))%365;
int32_t year = totalSecond/(24*3600*365); int32_t year = totalSecond/(24*3600*365) + 1970;
bool start = false; bool start = false;
if (year != 0) { if (year != 0) {
start = true; start = true;
@ -166,6 +167,9 @@ std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj)
_os << microsecond << "us "; _os << microsecond << "us ";
} }
_os << nanosecond << "ns "; _os << nanosecond << "ns ";
*/
std::time_t now_c = std::chrono::system_clock::to_time_t(_obj.get());
_os << std::put_time(std::localtime(&now_c), "%F %T");
return _os; return _os;
} }

1
echrono/Time.hpp
View File

@ -53,3 +53,4 @@ namespace echrono {
std::ostream& operator <<(std::ostream& _os, const echrono::Time& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Time& _obj);
} }
#include <echrono/Duration.hpp>