suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0001085: TimeInfo: diffTimeF(): added default arg/0001084: TimeInfo: diffTimeF(): non-zero result for ident. time stamps

Browse Source
This commit is contained in:
wmayer 2013-04-07 14:34:47 +02:00
parent d98d013b71
commit d4b6727704
2 changed files with 258 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Base/TimeInfo.cpp
View File

@ -89,10 +89,10 @@ std::string TimeInfo::diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd
float TimeInfo::diffTimeF(const TimeInfo &timeStart,const TimeInfo &timeEnd )
{
if(timeStart.getSeconds()==timeEnd.getSeconds())
return float(timeEnd.getMiliseconds())/1000.0 - float(timeStart.getMiliseconds())/1000.0;
else
return float(timeEnd.getSeconds()-timeStart.getSeconds()-1)+float((1000-timeStart.getMiliseconds())/1000.0)+float(timeEnd.getMiliseconds())/1000.0;
int64_t ds = int64_t(timeEnd.getSeconds() - timeStart.getSeconds());
int dms = int(timeEnd.getMiliseconds()) - int(timeStart.getMiliseconds());
return float(ds) + float(dms) * 0.001;
}
TimeInfo TimeInfo::null()

2
src/Base/TimeInfo.h
View File

@ -65,7 +65,7 @@ public:
static const char* currentDateTimeString();
static std::string diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd = TimeInfo());
static float diffTimeF(const TimeInfo &timeStart,const TimeInfo &timeEnd );
static float diffTimeF(const TimeInfo &timeStart,const TimeInfo &timeEnd = TimeInfo());
bool isNull() const;
static TimeInfo null();