ilabs-flir 2.4.4 → 2.4.6

package/android/Flir/src/main/java/flir/android/FlirManager.kt

@@ -250,11 +250,23 @@ object FlirManager {
         return if (temp != null && !temp.isNaN()) temp else null
     }
     
-    fun getTemperatureAtNormalized(nx: Double, ny: Double): Double? {
+    fun getTemperatureAtNormalized(nx: Double, ny: Double, rotation: Int = -90): Double? {
         val bitmap = latestBitmap ?: return null
-        val px = (nx * bitmap.width).toInt().coerceIn(0, bitmap.width - 1)
-        val py = (ny * bitmap.height).toInt().coerceIn(0, bitmap.height - 1)
-        return getTemperatureAt(px, py)
+        
+        // Map UI normalized (0..1) to Raw sensor normalized (0..1) based on display rotation
+        // Using generic trigonometric rotation formula for total precision
+        val angle = -rotation.toDouble() // Inverse the display rotation
+        val rad = Math.toRadians(angle)
+        val cosA = Math.cos(rad)
+        val sinA = Math.sin(rad)
+        
+        // Rotate around center (0.5, 0.5)
+        val dx = nx - 0.5
+        val dy = ny - 0.5
+        val rawX = dx * cosA - dy * sinA + 0.5
+        val rawY = dx * sinA + dy * cosA + 0.5
+        
+        return FlirSdkManager.getInstance(reactContext).getTemperatureAtNormalized(rawX, rawY)
     }
     
     fun getTemperatureAtPoint(x: Int, y: Int): Double? = getTemperatureAt(x, y)

package/android/Flir/src/main/java/flir/android/FlirModule.kt

@@ -69,9 +69,9 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     }
 
     @ReactMethod
-    fun getTemperatureAtNormalized(nx: Double, ny: Double, promise: Promise?) {
+    fun getTemperatureAtNormalized(nx: Double, ny: Double, rotation: Int, promise: Promise?) {
         try {
-            val temp = FlirManager.getTemperatureAtNormalized(nx, ny)
+            val temp = FlirManager.getTemperatureAtNormalized(nx, ny, rotation)
             if (temp != null) promise?.resolve(temp) else promise?.resolve(null)
         } catch (e: Exception) {
             promise?.reject("ERR_FLIR_TEMP_NORM", e)

package/android/Flir/src/main/java/flir/android/FlirSdkManager.java

@@ -579,6 +579,37 @@ public class FlirSdkManager {
         return result[0];
     }
 
+    /**
+     * Samples temperature using normalized coordinates (0.0 to 1.0)
+     * This avoids clamping bugs when UI dimensions differ from sensor dimensions.
+     */
+    public double getTemperatureAtNormalized(double nx, double ny) {
+        final double[] result = { Double.NaN };
+        synchronized (this) {
+            if (streamer == null) return Double.NaN;
+            try {
+                streamer.withThermalImage(thermalImage -> {
+                    try {
+                        int w = thermalImage.getWidth();
+                        int h = thermalImage.getHeight();
+                        // Map normalized 0..1 to sensor pixels 0..w-1
+                        int cx = (int) Math.max(0, Math.min(w - 1, nx * w));
+                        int cy = (int) Math.max(0, Math.min(h - 1, ny * h));
+                        ThermalValue value = thermalImage.getValueAt(new Point(cx, cy));
+                        if (value != null) {
+                            result[0] = value.asCelsius().value;
+                        }
+                    } catch (Exception e) {
+                        Log.w(TAG, "Normalized temp query error", e);
+                    }
+                });
+            } catch (Exception e) {
+                Log.w(TAG, "Normalized temp query failed", e);
+            }
+        }
+        return result[0];
+    }
+
     // ==================== LISTENERS ====================
     
     public void setPalette(String paletteName) {

package/ios/Flir/src/FlirManager.swift

@@ -468,7 +468,7 @@ import ThermalSDK
 #endif
     }
     
-    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
+    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double, rotation: Int) -> Double {
 #if FLIR_ENABLED
         guard let streamer = streamer, _isStreaming else { return Double.nan }
         
@@ -477,9 +477,22 @@ import ThermalSDK
             let w = Double(thermalImage.getWidth())
             let h = Double(thermalImage.getHeight())
             
+            // Map UI normalized (0..1) to Raw sensor normalized (0..1) based on display rotation
+            // Using generic trigonometric rotation formula for total precision
+            let angle = -Double(rotation) // Inverse the display rotation
+            let rad = angle * .pi / 180.0
+            let cosA = cos(rad)
+            let sinA = sin(rad)
+            
+            // Rotate around center (0.5, 0.5)
+            let dx = nx - 0.5
+            let dy = y - 0.5
+            let rawX = dx * cosA - dy * sinA + 0.5
+            let rawY = dx * sinA + dy * cosA + 0.5
+            
             // Map normalized (0.0 - 1.0) to actual sensor pixels
-            let cx = max(0, min(Int(w) - 1, Int(nx * w)))
-            let cy_fixed = max(0, min(Int(h) - 1, Int(y * h)))
+            let cx = max(0, min(Int(w) - 1, Int(rawX * w)))
+            let cy_fixed = max(0, min(Int(h) - 1, Int(rawY * h)))
             
             if let measurements = thermalImage.measurements,
                let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy_fixed)) {

package/ios/Flir/src/FlirModule.m

@@ -332,7 +332,8 @@ RCT_EXPORT_METHOD(getTemperatureAt : (nonnull NSNumber *)x y : (
 }
 
 RCT_EXPORT_METHOD(getTemperatureAtNormalized : (nonnull NSNumber *)nx y : (
-    nonnull NSNumber *)ny resolver : (RCTPromiseResolveBlock)
+    nonnull NSNumber *)ny rotation : (nonnull NSNumber *)rotation
+    resolver : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
@@ -340,11 +341,11 @@ RCT_EXPORT_METHOD(getTemperatureAtNormalized : (nonnull NSNumber *)nx y : (
     if (manager &&
         [manager
             respondsToSelector:sel_registerName(
-                "getTemperatureAtNormalized:y:")]) {
-      temp = ((double (*)(id, SEL, double, double))objc_msgSend)(
+                "getTemperatureAtNormalized:y:rotation:")]) {
+      temp = ((double (*)(id, SEL, double, double, NSInteger))objc_msgSend)(
           manager,
-          sel_registerName("getTemperatureAtNormalized:y:"),
-          [nx doubleValue], [ny doubleValue]);
+          sel_registerName("getTemperatureAtNormalized:y:rotation:"),
+          [nx doubleValue], [ny doubleValue], [rotation integerValue]);
     }
     if (isnan(temp)) {
       if (resolve) resolve([NSNull null]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",