From eabb94eb7a5c00d1e67fdfc2e299898d0b4d5a57 Mon Sep 17 00:00:00 2001
From: Laurent Knoll <laurent.knoll@orange.com>
Date: Mon, 26 Sep 2022 14:30:40 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20de=20la=20m=C3=A9trique=20"Round".?=
=?UTF-8?q?=20Closes=20#6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/data/dataExporter.ts | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/data/dataExporter.ts b/src/data/dataExporter.ts
index 3f7c1f4..482564d 100644
--- a/src/data/dataExporter.ts
+++ b/src/data/dataExporter.ts
@@ -129,11 +129,14 @@ export class DataExporter {
let line = 1;
let label = labData.filename;
let area = path.area / areaScale;
+ let convexArea = convexHull.toRemovedPath().area / areaScale;
let perimeter = path.length / linearScale;
+ let major = fittingEllipse.getMajorAxis() / linearScale;
+ let minor = fittingEllipse.getMinorAxis() / linearScale;
let circularity = 4 * Math.PI * area / Math.pow(perimeter, 2);
- let ar = fittingEllipse.getMajorAxis() / fittingEllipse.getMinorAxis();
- let round = 4 * area / (Math.PI * fittingEllipse.getMajorAxis());
- let solid = area / (convexHull.toRemovedPath().area / areaScale);
+ let ar = major / minor;
+ let round = (4 * area) / (Math.PI * major * major);
+ let solid = area / convexArea;
let headers : string[] = [ " ", "Label", "Area", "Perim.", "Circ.","AR","Round","Solidity"];
let data = [ line,
--
GitLab