Changeset 13921

Timestamp:

05/26/12 15:30:42 (12 years ago)

Author:

tbretz

Message:

Moved state definitions to header file and namespace.

Location:

trunk/FACT++/src

Files:

• HeadersTNGWeather.h (added)
• tngweather.cc (modified) (4 diffs)

trunk/FACT++/src/tngweather.cc

@@ -19 +19 @@
 #include "tools.h"
 
+#include "HeadersTNGWeather.h"
+
 #include <Soprano/Soprano>
 
@@ -26 +28 @@
 
 using namespace std;
-
-// ------------------------------------------------------------------------
-
-struct DimWeather
-{
-    DimWeather() { memset(this, 0, sizeof(DimWeather)); }
-
-    float fTemp10M;
-    float fTemp5M;
-    float fTemp2M;
-    float fTempGround;
-    float fDewPoint;
-    float fHumidity;
-    float fAirPressure;
-    float fWindSpeed;
-    float fWindDirection;
-    float fDeltaM1;
-    float fDustTotal;
-    float fSeeing;
-
-} __attribute__((__packed__));
-
-
-// ------------------------------------------------------------------------
+using namespace TNGWeather;
+
 
 class ConnectionWeather : public Connection
@@ -420 +400 @@
     S fWeather;
 
-    enum states_t
-    {
-        kStateDisconnected = 1,
-        kStateConnected,
-        kStateReceiving,
-    };
-
     bool CheckEventSize(size_t has, const char *name, size_t size)
     {
@@ -500 +473 @@
 
         // State names
-        AddStateName(kStateDisconnected, "NoConnection",
+        T::AddStateName(State::kDisconnected, "NoConnection",
                      "No connection to web-server could be established recently");
 
-        AddStateName(kStateConnected, "Invalid",
+        T::AddStateName(State::kConnected, "Invalid",
                      "Connection to webserver can be established, but received data is not recent or invalid");
 
-        AddStateName(kStateReceiving, "Valid",
+        T::AddStateName(State::kReceiving, "Valid",
                      "Connection to webserver can be established, receint data received");