Changeset 13887 for trunk

Timestamp:

05/24/12 21:51:38 (13 years ago)

Author:

tbretz

Message:

Improved screen output.

File:

• trunk/FACT++/src/tngweather.cc (modified) (7 diffs)

trunk/FACT++/src/tngweather.cc

@@ -63 +63 @@
     }
 
+    virtual void UpdateDust(const Time &, const float &)
+    {
+    }
+
     string fRdfData;
-    uint32_t missing;
+    float  fDust;
 
 protected:
@@ -136 +140 @@
         PostClose(false);
 
+        if (fIsVerbose)
+        {
+            Out() << "------------------------------------------------------" << endl;
+            Out() << data << endl;
+            Out() << "------------------------------------------------------" << endl;
+        }
 
         const Soprano::Parser* p = Soprano::PluginManager::instance()->discoverParserForSerialization( Soprano::SerializationRdfXml );
@@ -197 +207 @@
                 throw runtime_error("time invalid");
 
-            if (time!=fLastReport)
+            if (time!=fLastReport && fIsVerbose)
             {
                 Out() << endl;
@@ -220 +230 @@
             UpdateWeather(time, w);
 
-        }
+            if (fDust==w.fDustTotal)
+                return;
+
+            UpdateDust(time, w.fDustTotal);
+            fDust = w.fDustTotal;
+
+            ostringstream out;
+            out << setprecision(3) << "Dust: " << fDust << "ug/m^3 [" << time << "]";
+            Message(out);
+        }
+
         catch (const exception &e)
         {
@@ -311 +331 @@
 public:
     ConnectionWeather(ba::io_service& ioservice, MessageImp &imp) : Connection(ioservice, imp()),
-        fIsVerbose(true), fLastReport(Time::none), fLastReception(Time::none), fKeepAlive(ioservice)
+        fIsVerbose(true), fDust(-1),
+        fLastReport(Time::none), fLastReception(Time::none),
+        fKeepAlive(ioservice)
     {
         SetLogStream(&imp);
@@ -356 +378 @@
     DimDescribedService fDimAtmosphere;
 
-    double dust;
-
     virtual void UpdateWeather(const Time &t, const DimWeather &data)
     {
         fDimWeather.setData(&data, sizeof(DimWeather));
         fDimWeather.Update(t);
-
-        if (dust==data.fDustTotal)
-            return;
-
-        fDimAtmosphere.setData(&data.fDustTotal, sizeof(float));
+    }
+
+    virtual void UpdateDust(const Time &t, const float &dust)
+    {
+        fDimAtmosphere.setData(&dust, sizeof(float));
         fDimAtmosphere.Update(t);
-
-        dust = data.fDustTotal;
     }
 
@@ -389 +407 @@
                      "|Seeing[W/m^2]:Seeing"),
         fDimAtmosphere("TNG_WEATHER/DUST", "F:1",
-                       "|Dust[ug/m^3]:Dust (total)"),
-        dust(-1)
+                       "|Dust[ug/m^3]:Dust (total)")
     {
     }