Merge branch 'master' of https://github.com/vranki/ExtPlane

extplane-plugin/xplaneplugin.cpp

@@ -105,7 +105,6 @@ DataRef* XPlanePlugin::subscribeRef(QString &name) {
         if(ref->name() == name) {
             DEBUG << "Already subscribed to " << name;
             ref->setSubscriberCount(ref->subscriberCount() + 1);
-            emit ref->changed(ref); // Force update to all clients
             return ref;
         }
     }
@@ -162,7 +161,7 @@ void XPlanePlugin::updateDataRef(DataRef *ref)
     switch (ref->type()) {
     case extplaneRefTypeFloat:
     {
-        float newValue = XPLMGetDataf(ref);
+        float newValue = XPLMGetDataf(ref->ref());
         qobject_cast<FloatDataRef*>(ref)->updateValue(newValue);
         break;
     };

extplane-server/datarefs/datadataref.cpp

@@ -23,6 +23,7 @@ void DataDataRef::updateValue() {
         // TODO: do we really want to make this comparison for large data datarefs? Probably as it's still cheaper than sending over the wire the new data
         if (_newValue != _value) {
             _value = _newValue;
+            if(!_valueValid) setValueValid();
             emit changed(this);
         }
     }

extplane-server/datarefs/dataref.cpp

@@ -1,12 +1,14 @@
 #include "dataref.h"
 
 DataRef::DataRef(QObject *parent, QString name, void *ref) : QObject(parent)
+  , _typeString("?")
+  , _type(extplaneRefTypeUnknown)
   , _ref(ref)
+  , _accuracy(0)
+  , _valueValid(false)
   , _name(name)
   , _subscriberCount(0)
-  , _type(extplaneRefTypeUnknown)
   , _writable(false)
-  , _typeString("?")
   , _unsubscribeAfterChange(false)
 { }
 
@@ -64,3 +66,15 @@ void DataRef::setUnsubscribeAfterChange() {
 bool DataRef::shouldUnsubscribeAfterChange() const {
     return _unsubscribeAfterChange;
 }
+
+bool DataRef::isValid() const
+{
+    return _valueValid;
+}
+
+void DataRef::setValueValid()
+{
+    if(!_valueValid) {
+        _valueValid = true;
+    }
+}

extplane-server/datarefs/dataref.h

@@ -24,7 +24,6 @@ enum {
   */
 class DataRef : public QObject {
     Q_OBJECT
-
 public:
     DataRef(QObject *parent, QString name, void* ref);
     const QString &name() const;
@@ -43,14 +42,19 @@ class DataRef : public QObject {
     double accuracy() { return _accuracy; }
     void setUnsubscribeAfterChange();
     bool shouldUnsubscribeAfterChange() const;
+    bool isValid() const; // True if the value has been set initially. False if not.
+
 signals:
-    void changed(DataRef *ref);
+    void changed(DataRef *ref); // Should not be emitted if value is not valid.
 
 protected:
+    void setValueValid(); // Call this to mark the value valid.
+
     QString _typeString;
     extplaneRefID _type;
     void* _ref;
     double _accuracy;
+    bool _valueValid;
 
 private:
     QString _name;

extplane-server/datarefs/doubledataref.cpp

@@ -13,6 +13,7 @@ double DoubleDataRef::value() {
 void DoubleDataRef::updateValue(double newValue) {
     if(_value != newValue) {
         _value = newValue;
+        if(!_valueValid) setValueValid();
         emit changed(this);
     }
 }

extplane-server/datarefs/floatarraydataref.cpp

@@ -34,7 +34,10 @@ void FloatArrayDataRef::updateValue() {
             notequal = true;
         }
     }
-    if (notequal) emit changed(this);
+    if (notequal) {
+        if(!_valueValid) setValueValid();
+        emit changed(this);
+    }
 }
 
 QString FloatArrayDataRef::valueString() {

extplane-server/datarefs/floatdataref.cpp

@@ -15,6 +15,7 @@ float FloatDataRef::value() {
 void FloatDataRef::updateValue(float newValue) {
     if(_value != newValue) {
         _value = newValue;
+        if(!_valueValid) setValueValid();
         emit changed(this);
     }
 }

extplane-server/datarefs/intarraydataref.cpp

@@ -26,7 +26,10 @@ void IntArrayDataRef::updateValue() {
             notequal = true;
         }
     }
-    if (notequal) emit changed(this);
+    if (notequal) {
+        if(!_valueValid) setValueValid();
+        emit changed(this);
+    }
 }
 
 QString IntArrayDataRef::valueString() {

extplane-server/datarefs/intdataref.cpp

@@ -14,6 +14,7 @@ int IntDataRef::value() {
 void IntDataRef::updateValue(int newValue) {
     if(_value != newValue) {
         _value = newValue;
+        if(!_valueValid) setValueValid();
         emit changed(this);
     }
 }

extplane-server/tcpclient.cpp

@@ -89,6 +89,9 @@ void TcpClient::readClient() {
                             _refValueB[ref] = qobject_cast<DataDataRef*>(ref)->value();
                         }
                         INFO << "Subscribed to " << ref->name() << ", accuracy " << accuracy << ", type " << ref->typeString();
+                        if(ref->isValid()) {
+                            emit ref->changed(ref); // Force update to all clients
+                        }
                         if(command == "get") ref->setUnsubscribeAfterChange();
                     } else {
                         INFO << "Ref not found" << refName;
@@ -193,6 +196,8 @@ void TcpClient::readClient() {
 
 void TcpClient::refChanged(DataRef *ref) {
     Q_ASSERT(_subscribedRefs.contains(ref));
+    Q_ASSERT(ref->isValid()); // Never send invalid values.
+
     if(ref->type()== extplaneRefTypeFloat) {
         FloatDataRef *refF = qobject_cast<FloatDataRef*>(ref);
         if(qAbs(refF->value() - _refValueF[ref]) < ref->accuracy())
@@ -279,6 +284,7 @@ QSet<QString> TcpClient::listRefs() {
 
     return refNames;
 }
+
 DataRef *TcpClient::getSubscribedRef(const QString &name) {
     for(DataRef* r : _subscribedRefs.values()) {
         if(r->name() == name)
@@ -296,6 +302,7 @@ void TcpClient::unsubscribeRef(const QString &name)
         _subscribedRefs.remove(ref);
         _refValueF.remove(ref);
         _refValueFA.remove(ref);
+        _refValueD.remove(ref);
         _refValueB.remove(ref);
         _refValueI.remove(ref);
         _refValueIA.remove(ref);