diff -r 61516c5786af -r 00076e39386f sensorservices/sensorserver/src/util/sensrvproperty.cpp --- a/sensorservices/sensorserver/src/util/sensrvproperty.cpp Wed Jun 23 22:58:50 2010 +0100 +++ b/sensorservices/sensorserver/src/util/sensrvproperty.cpp Thu Jul 22 16:45:41 2010 +0100 @@ -356,9 +356,12 @@ { API_TRACE( ( _L( "Sensor Util - TSensrvProperty::GetValue return %e" ), iRealValue ) ); - __ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 )); + //__ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 )); - aValue = iRealValue; + if( ESensrvRealProperty == iPropertyType ) + aValue = iRealValue; + else if( ESensrvIntProperty == iPropertyType ) + aValue = iIntValue; } // --------------------------------------------------------------------------- @@ -467,9 +470,13 @@ { API_TRACE( ( _L( "Sensor Util - TSensrvProperty::GetMaxValue return %e" ), iRealValueMax ) ); - __ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 )); + //__ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 )); - aMaxValue = iRealValueMax; + if( ESensrvRealProperty == iPropertyType ) + aMaxValue = iRealValueMax; + else if ( ESensrvIntProperty == iPropertyType ) + aMaxValue = iIntValueMax; + } // --------------------------------------------------------------------------- @@ -480,9 +487,11 @@ { API_TRACE( ( _L( "Sensor Util - TSensrvProperty::GetMinValue return %e" ), iRealValueMin ) ); - __ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 )); - - aMinValue = iRealValueMin; + //__ASSERT_ALWAYS( ESensrvRealProperty == iPropertyType, User::Panic( KSensrvPropertyPanic, 0 )); + if( ESensrvRealProperty == iPropertyType ) + aMinValue = iRealValueMin; + else if( ESensrvIntProperty == iPropertyType ) + aMinValue = iIntValueMin; } // ---------------------------------------------------------------------------