diff options
author | Patrick Benavoli <patrickx.benavoli@intel.com> | 2011-08-31 11:23:24 +0200 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-02-10 17:13:21 +0100 |
commit | 6ba361d96bc2581667b3400f87ff89fae6449e1f (patch) | |
tree | e72e959d7d4c3b0f0b6dc20ec4f07d957eae1a50 /parameter/BooleanParameterType.cpp | |
parent | 68a912857707864bbaaff9808717813105072a6e (diff) | |
download | external_parameter-framework-6ba361d96bc2581667b3400f87ff89fae6449e1f.zip external_parameter-framework-6ba361d96bc2581667b3400f87ff89fae6449e1f.tar.gz external_parameter-framework-6ba361d96bc2581667b3400f87ff89fae6449e1f.tar.bz2 |
parameter-framework: improvements and corrections
BZ: 6721
- Bug correction concerning selection criteria display (inclusive type)
- Adapted XML format to allow for only on parameter to be associated to
a domain
- Removed unused files in parameter project
Change-Id: I9f42d08ff8cb60354714fe3d6b0f0b321ad0a7bf
Orig-Change-Id: I837e553070f5acf2d275082c986ba29433493e31
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/16878
Reviewed-by: Mahe, Erwan <erwan.mahe@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/BooleanParameterType.cpp')
-rw-r--r-- | parameter/BooleanParameterType.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/parameter/BooleanParameterType.cpp b/parameter/BooleanParameterType.cpp index d84d683..425596d 100644 --- a/parameter/BooleanParameterType.cpp +++ b/parameter/BooleanParameterType.cpp @@ -49,15 +49,26 @@ string CBooleanParameterType::getKind() const bool CBooleanParameterType::asInteger(const string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const { - if (strValue == "1") { + if (strValue == "1" || strValue == "0x1") { uiValue = true; - } else if (strValue == "0") { + } else if (strValue == "0" || strValue == "0x0") { uiValue = false; } else { + parameterAccessContext.setError(strValue + " value not part of numerical space {"); - parameterAccessContext.setError(strValue + " value not part of numerical space {0, 1} for " + getKind()); + // Hexa + bool bValueProvidedAsHexa = !strValue.compare(0, 2, "0x"); + + if (bValueProvidedAsHexa) { + + parameterAccessContext.appendToError("0x0, 0x1"); + } else { + + parameterAccessContext.appendToError("0, 1"); + } + parameterAccessContext.appendToError("} for " + getKind()); return false; } @@ -67,7 +78,10 @@ bool CBooleanParameterType::asInteger(const string& strValue, uint32_t& uiValue, void CBooleanParameterType::asString(const uint32_t& uiValue, string& strValue, CParameterAccessContext& parameterAccessContext) const { - (void)parameterAccessContext; + if (parameterAccessContext.valueSpaceIsRaw() && parameterAccessContext.outputRawFormatIsHex()) { + + strValue = "0x"; + } - strValue = uiValue ? "1" : "0"; + strValue += uiValue ? "1" : "0"; } |