added overload for subscribe that includes a zone filter. it is unimplemented in...

diff --git a/ambd/core.cpp b/ambd/core.cpp
index 83622ea..8e96bb5 100644 (file)
--- a/ambd/core.cpp
+++ b/ambd/core.cpp
@@ -319,6 +319,11 @@ void Core::subscribeToProperty(VehicleProperty::Property property, string source
        subscribeToProperty(property,sink);
 }
 
+void Core::subscribeToProperty(VehicleProperty::Property, string sourceUuidFilter, Zone::Type zoneFilter, AbstractSink *self)
+{
+
+}
+
 void Core::unsubscribeToProperty(VehicleProperty::Property property, AbstractSink* self)
 {
        if(propertySinkMap.find(property) == propertySinkMap.end())

diff --git a/ambd/core.h b/ambd/core.h
index b8aa5be..8d3ff65 100644 (file)
--- a/ambd/core.h
+++ b/ambd/core.h
@@ -49,6 +49,7 @@ public:
        AsyncPropertyReply * setProperty(AsyncSetPropertyRequest request);
        void subscribeToProperty(VehicleProperty::Property, AbstractSink* self);
        void subscribeToProperty(VehicleProperty::Property, std::string sourceUuidFilter, AbstractSink *self);
+       void subscribeToProperty(VehicleProperty::Property, std::string sourceUuidFilter, Zone::Type zoneFilter, AbstractSink *self);
        void unsubscribeToProperty(VehicleProperty::Property, AbstractSink* self);
        PropertyList supported() { return mMasterPropertyList; }
 

diff --git a/lib/abstractroutingengine.h b/lib/abstractroutingengine.h
index 47eeec4..e3439ed 100644 (file)
--- a/lib/abstractroutingengine.h
+++ b/lib/abstractroutingengine.h
@@ -236,6 +236,7 @@ public:
        virtual AsyncPropertyReply * setProperty(AsyncSetPropertyRequest request) = 0;
        virtual void subscribeToProperty(VehicleProperty::Property, AbstractSink* self) = 0;
        virtual void subscribeToProperty(VehicleProperty::Property, std::string sourceUuidFilter, AbstractSink *self) = 0;
+       virtual void subscribeToProperty(VehicleProperty::Property, std::string sourceUuidFilter, Zone::Type zoneFilter, AbstractSink *self) = 0;
        virtual void unsubscribeToProperty(VehicleProperty::Property, AbstractSink* self) = 0;
 
        virtual PropertyInfo getPropertyInfo(VehicleProperty::Property, std::string sourceUuid) = 0;

diff --git a/plugins/bluemonkey/bluemonkey.cpp b/plugins/bluemonkey/bluemonkey.cpp
index e04c4f5..4ab6af8 100644 (file)
--- a/plugins/bluemonkey/bluemonkey.cpp
+++ b/plugins/bluemonkey/bluemonkey.cpp
@@ -152,9 +152,27 @@ std::string BluemonkeySink::uuid()
 
 QObject *BluemonkeySink::subscribeTo(QString str)
 {
-       return new Property(str.toStdString(), routingEngine, this);
+       return new Property(str.toStdString(), "", routingEngine, this);
 }
 
+QObject *BluemonkeySink::subscribeTo(QString str, QString srcFilter)
+{
+       return new Property(str.toStdString(), srcFilter, routingEngine, this);
+}
+
+QStringList BluemonkeySink::sourcesForProperty(QString property)
+{
+       std::list<std::string> list = routingEngine->sourcesForProperty(property.toStdString());
+       QStringList strList;
+       for(auto itr = list.begin(); itr != list.end(); itr++)
+       {
+               strList<<(*itr).c_str();
+       }
+
+       return strList;
+}
+
+
 bool BluemonkeySink::authenticate(QString pass)
 {
 
@@ -269,7 +287,7 @@ void Property::setValue(QVariant v)
        routingEngine->setProperty(request);
 }
 
-Property::Property(VehicleProperty::Property prop, AbstractRoutingEngine* re, QObject *parent)
+Property::Property(VehicleProperty::Property prop, QString srcFilter, AbstractRoutingEngine* re, QObject *parent)
        :QObject(parent), AbstractSink(re, std::map<std::string,std::string>()),mValue(nullptr)
 {
        setType(prop.c_str());
@@ -304,6 +322,10 @@ void Property::setType(QString t)
 
 void Property::propertyChanged(VehicleProperty::Property property, AbstractPropertyType *value, string uuid)
 {
+       if(mValue)
+       {
+               delete mValue;
+       }
        mValue = value->copy();
 
        changed(gvariantToQVariant(mValue->toVariant()));

diff --git a/plugins/bluemonkey/bluemonkey.h b/plugins/bluemonkey/bluemonkey.h
index e82ac73..4f63c20 100644 (file)
--- a/plugins/bluemonkey/bluemonkey.h
+++ b/plugins/bluemonkey/bluemonkey.h
@@ -38,12 +38,12 @@ class Property: public QObject, public AbstractSink
        Q_PROPERTY(QVariant value READ value WRITE setValue)
 
 public:
-       Property(VehicleProperty::Property, AbstractRoutingEngine* re, QObject *parent = 0);
+       Property(VehicleProperty::Property, QString srcFilter, AbstractRoutingEngine* re, QObject *parent = 0);
 
        QString type();
        void setType(QString t);
 
-       virtual PropertyList subscriptions() { PropertyList list; list.push_back(type().toStdString()); return list; }
+       virtual PropertyList subscriptions() { return PropertyList(); }
        virtual void supportedChanged(PropertyList ){   }
 
        virtual void propertyChanged(VehicleProperty::Property property, AbstractPropertyType* value, std::string uuid);
@@ -75,6 +75,9 @@ public:
 public Q_SLOTS:
 
        QObject* subscribeTo(QString str);
+       QObject* subscribeTo(QString str, QString srcFilter);
+
+       QStringList sourcesForProperty(QString property);
 
        bool authenticate(QString pass);
 

diff --git a/plugins/obd2plugin/obd2source.cpp b/plugins/obd2plugin/obd2source.cpp
index ba24f26..b27e0ca 100644 (file)
--- a/plugins/obd2plugin/obd2source.cpp
+++ b/plugins/obd2plugin/obd2source.cpp
@@ -488,7 +488,13 @@ void OBD2Source::updateProperty(VehicleProperty::Property property,AbstractPrope
        {
                propertyReplyMap[property]->value = value;
                propertyReplyMap[property]->success = true;
-               propertyReplyMap[property]->completed(propertyReplyMap[property]);
+               try {
+                       propertyReplyMap[property]->completed(propertyReplyMap[property]);
+               }catch(...)
+               {
+                       DebugOut(DebugOut::Error)<<"failed to call reply completed callback"<<endl;
+               }
+
                propertyReplyMap.erase(property);
        }
        else