Changeset 17369

Timestamp:

11/23/13 19:35:00 (11 years ago)

Author:

tbretz

Message:

Fixed aproblem with the new temperature hist and the displayed GPS time.

File:

• trunk/FACT++/src/smartfact.cc (modified) (2 diffs)

trunk/FACT++/src/smartfact.cc

@@ -1814 +1814 @@
 
         out << HTML::kWhite << '\t' << nema.count << '\n';
-        out << HTML::kWhite << '\t' << Time(nema.time).GetAsStr("%H:%M:%S") << '\n';
+        out << HTML::kWhite << '\t' << Time(floor(Time().Mjd())+nema.time).GetAsStr("%H:%M:%S") << '\n';
         out << HTML::kWhite << '\t' << setprecision(4) << nema.lat    << '\n';
         out << HTML::kWhite << '\t' << setprecision(4) << nema.lng    << '\n';
@@ -1855 +1855 @@
         ofstream(fPath+"/temperature.data") << out.str();
 
-        if (!fTemperatureControlHist.empty())
-        {
-            fTemperatureControlHist.push_back(temp[0]);
-            if (fTemperatureControlHist.size()>60) // 1h
-                fTemperatureControlHist.pop_front();
-        }
+        fTemperatureControlHist.push_back(temp[0]);
+        if (fTemperatureControlHist.size()>60) // 1h
+            fTemperatureControlHist.pop_front();
 
         WriteHist(d, "hist-temperaturecontrol",