Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
This commit is contained in:
commit
84d807930e
@ -350,6 +350,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
|||||||
// durationInSecs += duration.pun_duration * 60;
|
// durationInSecs += duration.pun_duration * 60;
|
||||||
//} else {
|
//} else {
|
||||||
durationInSecs = duration.pun_duration * 60;
|
durationInSecs = duration.pun_duration * 60;
|
||||||
|
|
||||||
|
// durationInSecs -= 720 * 60;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if ((double)price == cost) {
|
if ((double)price == cost) {
|
||||||
@ -416,7 +418,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
|||||||
|
|
||||||
qCritical() << DBG_HEADER << "LOWER" << lower.toString(Qt::ISODate);
|
qCritical() << DBG_HEADER << "LOWER" << lower.toString(Qt::ISODate);
|
||||||
|
|
||||||
inputDate = inputDate.addSecs(lower.secsTo(upper));
|
// inputDate = inputDate.addSecs(lower.secsTo(upper));
|
||||||
|
|
||||||
qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);
|
qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user