Skip to content

Proper trailing zeroes on post-decimal numbers #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdrapha merged 2 commits into from
Dec 9, 2025
Merged

Proper trailing zeroes on post-decimal numbers #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19df757
update dockerhub refs
sdrapha Dec 9, 2025
b95613f
More fixes to keep the proper trailing zeroes on postdecimal numbers.
sdrapha Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
platforms: linux/amd64,linux/arm64
pull: true
push: true
cache-from: type=registry,ref=nohn/watermeter:latest
cache-from: type=registry,ref=riulopkat/watermeter:latest
cache-to: type=inline
tags: riulopkat/watermeter:latest
labels: ${{ steps.meta.outputs.labels }}
Expand All @@ -70,7 +70,7 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
pull: true
push: true
cache-from: type=registry,ref=nohn/watermeter:develop
cache-from: type=registry,ref=riulopkat/watermeter:develop
cache-to: type=inline
tags: riulopkat/watermeter:develop
labels: ${{ steps.meta.outputs.labels }}
32 changes: 21 additions & 11 deletions classes/Reader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,30 +127,40 @@ private function readDigits($post_decimal = false)
// $numberDigital = '00815';
if ($this->debug) {
$numberDigitalImage->writeImage('tmp/' . $cachePrefix . '_digital.jpg');
echo "<em style='color:grey;font-size:85%;'>Debug output from Reader.php readDigits()</em>";
echo '<br><table border="1"><tr><td>';
if ($post_decimal == true) { echo '<b>Post decimal:</b><br>'; }
echo "Raw OCR: $numberOCR<br>";
echo "Clean OCR: $numberDigital";
echo "Clean OCR: $numberDigital<br>";
echo '<img alt="Digital Preview" src="tmp/' . $cachePrefix . '_digital.jpg" /><br>';
echo '</td></tr></table><br>';
}

if (is_numeric($numberDigital)) {
$numberRead = (int)$numberDigital;
$numberRead = (string)$numberDigital;
} else {
# FIXXME
$numberRead = (int)$this->lastValue;
$numberRead = (string)$this->lastValue;
if ($this->debug) {
echo 'Choosing last value ' . $numberRead . '<br>';
}
$this->errors['readDigits() : !is_numeric()'] = 'Could not interpret "' . $numberDigital . '". Using last known value ' . (int)$this->lastValue;
$this->hasErrors = true;
}
if ($this->debug) {
echo "Digital: $numberRead<br>";
echo '<table border="1"><tr>';
echo '<td>';
$digitalSourceImage->writeImage('tmp/input.jpg');
$numberDigitalImage->writeImage('tmp/' . $cachePrefix . '_digital.png');
echo '</td>';
}
// Redundant, comment out temporarily:
// if ($this->debug) {
// echo '<table border="1"><tr>';
// echo '<td>';
// echo "ReadDigits method:<br>";
// echo "Digital: $numberRead<br>";
// echo 'digital source image<br>';
// $digitalSourceImage->writeImage('tmp/input.jpg');
// echo '<img src="tmp/input.jpg" />';
// echo '<br>number digital image<br>';
// $numberDigitalImage->writeImage('tmp/' . $cachePrefix . '_digital.png');
// echo '<img src="tmp/' . $cachePrefix . '_digital.png" />';
// echo '</td></tr></table>';
// }
return $numberRead;
}

Expand Down
25 changes: 21 additions & 4 deletions public/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

if (isset($_GET['debug'])) {
$debug = true;
echo '<style> table, th, td { border: 1px solid black; border-collapse: collapse; padding: 10px;}</style>';
} else {
$debug = false;
}
Expand All @@ -51,7 +52,6 @@
$readout = $watermeterReader->getReadout();
$offset = $watermeterReader->getOffset();
$value = $readout+$offset;

$returnData = array();
if ($watermeterReader->hasErrors()) {
$returnData['readout'] = $lastValue;
Expand All @@ -72,17 +72,34 @@
file_put_contents(__DIR__ . '/../src/config/lastValue.txt', $readout);
}
if ($debug) {
echo '<td>';
echo "<br><br>";
echo "<br> ------ Begin Debug output from index.php------ <br>";
echo "<br>Status: ";
echo $returnData['status'] . "<br>";
echo "<br>Input image:<br>";
echo '<table><tr><td>';
$watermeterReader->writeDebugImage(__DIR__ . '/../public/tmp/input_debug.jpg');
echo '<img src="tmp/input_debug.jpg" />';
echo '</td>';
echo '</tr></table>';
echo '</td></tr></table>';

echo "<br>";
echo "hasErrors: " . $watermeterReader->hasErrors() . "\n<br>";
echo "<br>";
echo "getErrors result:";
echo "<br>";
echo "-----------------------------<br>";
echo '<table><tr><td>';
echo "<pre>";
var_dump($watermeterReader->getErrors());
echo "</pre>";
echo "</td></tr></table>";
echo "-----------------------------<br>";
echo "<br>";
echo "lastValueChanged: $lastValueTimestamp\n<br>";
echo "lastValue: $lastValue\n<br>";
echo "readout: $readout\n<br>";
echo "value: $value\n<br>";
echo "<br>-----end of debug output-----<br><br>";
}
if (isset($_GET['json'])) {
header("Content-Type: application/json");
Expand Down