dev

iOSClient/Imagemeter/IMImagemeter.swift

@@ -190,12 +190,14 @@ class IMImagemeterCodable: NSObject {
     }
     
     func convertCoordinate(x: Double, y: Double, width: Double, height: Double, button: Double) -> (x: Double, y: Double) {
-        
+    
         let normalizeX: Double = floor(512 + x)
         let normalizeY: Double = floor(384 + y)
+    
+        let factor = sqrt(width * height / (1024*768))
         
-        let factorX: Double = width * normalizeX / 1024
-        let factorY: Double = height * normalizeY / 768
+        let factorX: Double = factor * normalizeX
+        let factorY: Double = factor * normalizeY
         
         return(factorX, factorY)
     }

iOSClient/Viewer/NCViewerImagemeter.swift

@@ -114,8 +114,8 @@ class NCViewerImagemeter: NSObject {
         for element in annotation.elements {
             
             let coordinateNormalize =  IMImagemeterCodable.sharedInstance.convertCoordinate(x: element.center.x, y: element.center.y, width: Double(imagemeterView.bounds.width), height: Double(imagemeterView.imageHeightConstraint.constant), button: 30)
-            let x = coordinateNormalize.x
-            let y = coordinateNormalize.y + 15
+            let x = coordinateNormalize.x - 30
+            let y = coordinateNormalize.y + 30
             
             let button = UIButton()
             button.frame = CGRect(x: x, y: y, width: 30, height: 30)