[ui] Viewer2D: The pixel coordinates set by user are now reset when mouse hovered the image, to avoid ghost values

Author: nicolas-lambert-tc

meshroom/ui/qml/Viewer/HdrImageToolbar.qml

@@ -14,10 +14,6 @@ FloatingPane {
     property real gammaDefaultValue: 1.0
     property string pixelCoordinatesPlaceholder: "--"
 
-    function resetDefaultValues() {
-        gainCtrl.value = root.gainDefaultValue
-        gammaCtrl.value = root.gammaDefaultValue
-    }
 
     property real slidersPowerValue: 4.0
     property real gainValue: Math.pow(gainCtrl.value, slidersPowerValue)
@@ -28,11 +24,25 @@ FloatingPane {
 
     property bool colorPickerVisible: true
 
-    property variant pixelX: null
-    property variant pixelY: null
+    property variant userDefinedXPixel: null
+    property variant userDefinedYPixel: null
 
     background: Rectangle { color: root.palette.window }
 
+    function resetDefaultValues() {
+        gainCtrl.value = root.gainDefaultValue
+        gammaCtrl.value = root.gammaDefaultValue
+    }
+
+    function resetPixelCoordinates() {
+        if(userDefinedXPixel !== null) { userDefinedXPixel = null }
+        if(userDefinedYPixel !== null) { userDefinedYPixel = null }        
+    }
+
+    onMousePositionChanged: {
+        resetPixelCoordinates()
+    }
+
     DoubleValidator {
         id: doubleValidator
         locale: 'C'  // Use '.' decimal separator disregarding of the system locale
@@ -154,7 +164,7 @@ FloatingPane {
                 validator: IntValidator {}
                 onTextEdited: {
                     const xPixelValue = parseInt(xPixel.text)
-                    pixelX = Number.isNaN(xPixelValue) ? null : xPixelValue
+                    userDefinedXPixel = Number.isNaN(xPixelValue) ? null : xPixelValue
                 }
             }
             Label {
@@ -168,7 +178,7 @@ FloatingPane {
                 validator: IntValidator {}
                 onTextEdited: {
                     const yPixelValue = parseInt(yPixel.text)
-                    pixelY = Number.isNaN(yPixelValue) ? null : yPixelValue
+                    userDefinedYPixel = Number.isNaN(yPixelValue) ? null : yPixelValue
                 }
             }
 

meshroom/ui/qml/Viewer/Viewer2D.qml

@@ -438,12 +438,12 @@ FocusScope {
                     return floatImageViewerLoader.item.pixelValueAt( mousePosition.x, mousePosition.y )
                 } 
 
-                if ( !Number.isInteger(pixelX) || !Number.isInteger(pixelY) ) {
+                if ( !Number.isInteger(userDefinedXPixel) || !Number.isInteger(userDefinedYPixel) ) {
                     return null
                 }
 
                 // Get the pixel color value from text field value (let the possibility to user to set the x,y from ui)
-                return floatImageViewerLoader.item.pixelValueAt( parseInt(pixelX) , parseInt(pixelY) )
+                return floatImageViewerLoader.item.pixelValueAt( parseInt(userDefinedXPixel) , parseInt(userDefinedYPixel) )
 
             }