mikeleib'd

diff --git a/.kdev4/_custom.kdev4 b/.kdev4/_custom.kdev4
deleted file mode 100644 (file)
index 0f33ef8..0000000
--- a/.kdev4/_custom.kdev4
+++ /dev/null
@@ -1,25 +0,0 @@
-[Containments][1]
-ActionPluginsSource=Global
-activity=nobdy2
-activityId=
-desktop=-1
-formfactor=0
-immutability=1
-lastDesktop=-1
-lastScreen=0
-location=0
-orientation=2
-plugin=newspaper
-screen=0
-wallpaperplugin=color
-wallpaperpluginmode=
-
-[Containments][1][Wallpaper][color]
-backgroundMode=0
-color1=255,255,255
-color2=0,0,0
-
-[Project]
-Manager=KDevCMakeManager
-Name=nobdy2
-VersionControl=kdevgit

diff --git a/.kdev4/nobdy2.kdev4 b/.kdev4/nobdy2.kdev4
deleted file mode 100644 (file)
index d21efb0..0000000
--- a/.kdev4/nobdy2.kdev4
+++ /dev/null
@@ -1,18 +0,0 @@
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)
-
-[CMake]
-BuildDirs[$e]=$HOME/src/automotive-message-broker/build
-CMakeDir=/usr/share/cmake-2.8/Modules
-Current CMake Binary=file:///usr/bin/cmake
-CurrentBuildDir=file:///home/tripzero/src/automotive-message-broker/build
-CurrentBuildType=Release
-CurrentInstallDir=file:///usr/local
-Extra Arguments=
-ProjectRootRelative=./
-
-[MakeBuilder]
-Number Of Jobs=1
-
-[Project]
-VersionControlSupport=kdevgit

diff --git a/nobdy2.kdev4 b/nobdy2.kdev4
deleted file mode 100644 (file)
index c4f2149..0000000
--- a/nobdy2.kdev4
+++ /dev/null
@@ -1,4 +0,0 @@
-[Project]
-Manager=KDevCMakeManager
-Name=automotive-message-broker
-VersionControl=kdevgit

diff --git a/plugins/dbus/accelerationproperty.cpp b/plugins/dbus/accelerationproperty.cpp
index d1efae8..9d49e3f 100644 (file)
--- a/plugins/dbus/accelerationproperty.cpp
+++ b/plugins/dbus/accelerationproperty.cpp
@@ -35,6 +35,7 @@ void AccelerationPropertyInterface::supportedChanged(PropertyList supportedPrope
                {
                        routingEngine->subscribeToProperty(VehicleProperty::AccelerationX, this);
                        accelerationX = new BasicProperty<int>("X", "i", AbstractProperty::Read, this);
+                       propertyDBusMap[VehicleProperty::AccelerationX] = accelerationX;
                        supported = true;
                }
        }
@@ -45,6 +46,7 @@ void AccelerationPropertyInterface::supportedChanged(PropertyList supportedPrope
                {
                        routingEngine->subscribeToProperty(VehicleProperty::AccelerationY, this);
                        accelerationY = new BasicProperty<int>("Y", "i", AbstractProperty::Read, this);
+                       propertyDBusMap[VehicleProperty::AccelerationY] = accelerationY;
                        supported = true;
                }
        }
@@ -55,6 +57,7 @@ void AccelerationPropertyInterface::supportedChanged(PropertyList supportedPrope
                {
                        routingEngine->subscribeToProperty(VehicleProperty::AccelerationZ, this);
                        accelerationZ = new BasicProperty<int>("Z", "i", AbstractProperty::Read, this);
+                       propertyDBusMap[VehicleProperty::AccelerationZ] = accelerationZ;
                        supported = true;
                }
        }
@@ -65,7 +68,7 @@ void AccelerationPropertyInterface::supportedChanged(PropertyList supportedPrope
        }
 }
 
-void AccelerationPropertyInterface::propertyChanged(VehicleProperty::Property property, boost::any value, string)
+/*void AccelerationPropertyInterface::propertyChanged(VehicleProperty::Property property, boost::any value, string)
 {
 
        if(property == VehicleProperty::AccelerationX)
@@ -91,7 +94,7 @@ void AccelerationPropertyInterface::propertyChanged(VehicleProperty::Property pr
                        accelerationZ->setValue(boost::any_cast<int>(value));
                }
        }
-}
+}*/
 
 
 

diff --git a/plugins/dbus/accelerationproperty.h b/plugins/dbus/accelerationproperty.h
index 61d2052..371cdb3 100644 (file)
--- a/plugins/dbus/accelerationproperty.h
+++ b/plugins/dbus/accelerationproperty.h
@@ -29,7 +29,7 @@ public:
        AccelerationPropertyInterface(AbstractRoutingEngine* re, GDBusConnection* connection);
 
        virtual void supportedChanged(PropertyList supportedProperties);
-       virtual void propertyChanged(VehicleProperty::Property property, boost::any value, std::string uuid);
+       //virtual void propertyChanged(VehicleProperty::Property property, boost::any value, std::string uuid);
 
 private:
 

diff --git a/plugins/dbus/dbusplugin.cpp b/plugins/dbus/dbusplugin.cpp
index f39b76e..36120c5 100644 (file)
--- a/plugins/dbus/dbusplugin.cpp
+++ b/plugins/dbus/dbusplugin.cpp
@@ -35,8 +35,10 @@ DBusSink::DBusSink(AbstractRoutingEngine* engine)
 
 void DBusSink::propertyChanged(VehicleProperty::Property property, boost::any value, string uuid)
 {
-       AbstractProperty* prop = propertyDBusMap[property];
+       if(!propertyDBusMap.count(property))
+               return;
 
+       AbstractProperty* prop = propertyDBusMap[property];
        prop->setValue(value);
 }