Fixed Incorrect Area Measurement

Fixed issue with incorrect area calculation. Issue was caused by incorrect conversion from pixel area to Square Meters. Issue must have caused from major refactor.
ZappyMan · Oct 10, 2023 · 8fa069a · 8fa069a
1 parent 01f754f
commit 8fa069a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -843,3 +843,5 @@ morphometrix/MorphoMetriX.app/Contents/Resources/icon.png
 morphometrix/MorphoMetriX.app/Contents/Resources/logo.icns
 morphometrix/__pycache__/graphicsview.cpython-310.pyc
 morphometrix/__pycache__/graphicsview.cpython-310.pyc
+morphometrix/__pycache__/graphicsview.cpython-310.pyc
+*.pyc
diff --git a/morphometrix/__main__.py b/morphometrix/__main__.py
@@ -329,7 +329,7 @@ def export_measurements(self):
         pixeldim = float(self.subWin.pixeldim.text())
         altitude = float(self.subWin.altitude.text())
         focal = float(self.subWin.focal.text())
-        # Convert in mm https://www.imaging-resource.com/PRODS/sony-a5100/sony-a5100DAT.HTM
+
         if name:
             meta_data = [["Object","Value","Value_unit"],
                         ['Image ID',self.subWin.id.text(),"Metadata"],
@@ -347,7 +347,7 @@ def export_measurements(self):
                 writer.writerows(meta_data)     # Writes flight data and metadata
 
                 self.iw.calculate_widths(self.subWin.side_bias.currentText())      # Calculate widths of MovingEllipses at export
-                m = pixeldim * altitude / focal
+                m = pixeldim * (altitude / focal)
                 pixel_measurements, unit_measurements = self.iw.get_measurement_names_and_values(m)
 
                 writer.writerows(unit_measurements)

diff --git a/morphometrix/__pycache__/graphicsview.cpython-310.pyc b/morphometrix/__pycache__/graphicsview.cpython-310.pyc
diff --git a/morphometrix/graphicsview.py b/morphometrix/graphicsview.py
@@ -388,7 +388,7 @@ def get_measurement_names_and_values(self, m):
                     unit_measurement.append([measurement.get_name(), "{0:.2f}".format(measurement.measurement_value), "Degrees"])
                 case consts.AREA:
                     pixel_measurement.append([measurement.get_name(), "{0:.2f}".format(measurement.measurement_value), "Pixels"])
-                    unit_measurement.append([measurement.get_name(), "{0:.2f}".format(measurement.measurement_value*m), "Square Meters"])
+                    unit_measurement.append([measurement.get_name(), "{0:.2f}".format(measurement.measurement_value*(m**2)), "Square Meters"])
         return pixel_measurement, unit_measurement
 
     # Measure widths of aquatic animal (Called when GUI button is pressed)