-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat:Unify ObdMetrics formatting interface
- Loading branch information
1 parent
0cf95de
commit ffa6cc5
Showing
13 changed files
with
137 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
datalogger/src/main/java/org/obd/graphs/bl/query/Formatter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package org.obd.graphs.bl.query | ||
|
|
||
| import org.obd.graphs.round | ||
| import org.obd.metrics.api.model.ObdMetric | ||
| import org.obd.metrics.pid.PidDefinition | ||
| import org.obd.metrics.pid.ValueType | ||
|
|
||
| private const val NO_DATA = "No data" | ||
|
|
||
| fun ObdMetric.format(castToInt: Boolean = false, precision: Int = 2): String = format( | ||
| input = this.value, | ||
| pid = null, precision = precision, castToInt = castToInt | ||
| ) | ||
|
|
||
| fun ObdMetric.valueToFloat(): Float = | ||
| if (this.value == null) { | ||
| if (this.command.pid.min == null) 0f else this.command.pid.min.toFloat() | ||
| } else { | ||
| if (this.value is Number) { | ||
| this.valueToDouble().toFloat() | ||
| } else { | ||
| 0f | ||
| } | ||
| } | ||
|
|
||
| fun ObdMetric.valueToNumber(): Number? = | ||
| if (this.value == null) { | ||
| null | ||
| } else { | ||
| if (value is Number) { | ||
| value as Number | ||
| } else { | ||
| null | ||
| } | ||
| } | ||
|
|
||
|
|
||
| fun Number.format(pid: PidDefinition, precision: Int = 2, castToInt: Boolean = false): String = format( | ||
| input = this, | ||
| pid = pid, precision = precision, castToInt = castToInt | ||
| ) | ||
|
|
||
|
|
||
| private fun format(input: Any?, pid: PidDefinition? = null, precision: Int = 2, castToInt: Boolean = false): String = | ||
|
|
||
| if (input == null) { | ||
| NO_DATA | ||
| } else { | ||
| if (input is Number) { | ||
| val value = input.toDouble() | ||
|
|
||
| if (value.isNaN()) { | ||
| NO_DATA | ||
| } | ||
|
|
||
| val number = if (pid == null || pid.type == null) { | ||
| if (value is Number) { | ||
| if (castToInt) (value as Number).toInt().toString() | ||
| else if (value is Double) (value as Number).toDouble().round(precision).toString() | ||
| else value.toString() | ||
| } else { | ||
| value.toString() | ||
| } | ||
| } else { | ||
| pid.type.let { | ||
| when (pid.type) { | ||
| ValueType.DOUBLE -> value.round(precision) | ||
| ValueType.INT -> value.toInt() | ||
| ValueType.SHORT -> value.toInt() | ||
| else -> value.round(1) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| number.toString() | ||
| } else { | ||
| input.toString() | ||
| } | ||
| } |
27 changes: 0 additions & 27 deletions
27
...a/org/obd/graphs/bl/query/ObdMetricExt.kt → .../obd/graphs/bl/query/PIDsNamesRegistry.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.