Skip to content

[ui] Viewer2D: Add the pixel (x,y) values in the toolbar (editable) #2723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbentejac merged 7 commits into from
May 20, 2025
Merged

[ui] Viewer2D: Add the pixel (x,y) values in the toolbar (editable) #2723

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e14b86
[ui] Viewer2D: Add the pixel (x,y) values in the toolbar (editable)
nicolas-lambert-tc May 14, 2025
b2e2315
[ui] Viewer2D: Refacto using javascript expression
nicolas-lambert-tc May 16, 2025
a57dd6b
[ui] Viewer2D: When mouse is outside of the image, no values are set …
nicolas-lambert-tc May 16, 2025
c8720af
[ui] Viewer2d: Add a placeholder '--' to the pixel(x,y) coordinates
nicolas-lambert-tc May 19, 2025
d64a66e
[ui] Viewer2D: The pixel coordinates set by user are now reset when m…
nicolas-lambert-tc May 19, 2025
031f318
[Viewer] HdrImageToolbar: Force positive values to pixel coordinates
cbentejac May 20, 2025
663aeb8
[Viewer] HdrImageToolbar: Change pixelCoordiantes textFields width to…
cbentejac May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions meshroom/ui/qml/Viewer/HdrImageToolbar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ FloatingPane {
property real gammaValue: Math.pow(gammaCtrl.value, slidersPowerValue)
property alias channelModeValue: channelsCtrl.value
property variant colorRGBA: null
property variant mousePosition: ({x:0, y:0})

property bool colorPickerVisible: true

property variant pixelX: null
property variant pixelY: null

background: Rectangle { color: root.palette.window }

DoubleValidator {
Expand Down Expand Up @@ -136,6 +140,37 @@ FloatingPane {
}
}

RowLayout {

Label {
text: "x"
}
TextField {
id: xPixel
text: root.mousePosition ? root.mousePosition.x : null
Layout.preferredWidth: 50
Comment thread
nicolas-lambert-tc marked this conversation as resolved.
Outdated
validator: IntValidator {}
Comment thread
nicolas-lambert-tc marked this conversation as resolved.
Outdated
onTextEdited: {
const xPixelValue = parseInt(xPixel.text)
pixelX = Number.isNaN(xPixelValue) ? null : xPixelValue
}
}
Label {
text: "y"
}
TextField {
id: yPixel
text: root.mousePosition ? root.mousePosition.y : null
Layout.preferredWidth: 50
Comment thread
nicolas-lambert-tc marked this conversation as resolved.
Outdated
validator: IntValidator {}
Comment thread
nicolas-lambert-tc marked this conversation as resolved.
Outdated
onTextEdited: {
const yPixelValue = parseInt(yPixel.text)
pixelY = Number.isNaN(yPixelValue) ? null : yPixelValue
}
}

}

Rectangle {
visible: colorPickerVisible
Layout.preferredWidth: 20
Expand All @@ -148,6 +183,7 @@ FloatingPane {
RowLayout {
spacing: 1
visible: colorPickerVisible

TextField {
id: red
property real value: root.colorRGBA ? root.colorRGBA.x : 0.0
Expand Down
21 changes: 17 additions & 4 deletions meshroom/ui/qml/Viewer/Viewer2D.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,17 +427,30 @@ FocusScope {
}

colorRGBA: {

if (!floatImageViewerLoader.item ||
floatImageViewerLoader.item.imageStatus !== Image.Ready) {
return null
}
if (floatImageViewerLoader.item.containsMouse === false) {

/// Get the pixel color value at mouse position (when mouse hover the image)
if (mousePosition && floatImageViewerLoader.item.containsMouse === true) {
return floatImageViewerLoader.item.pixelValueAt( mousePosition.x, mousePosition.y )
}

if ( !Number.isInteger(pixelX) || !Number.isInteger(pixelY) ) {
return null
}
var pix = floatImageViewerLoader.item.pixelValueAt(Math.floor(floatImageViewerLoader.item.mouseX),
Math.floor(floatImageViewerLoader.item.mouseY))
return pix

// 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) )

}

mousePosition: (floatImageViewerLoader.item.containsMouse ? {
x: Math.floor(floatImageViewerLoader.item.mouseX),
y: Math.floor(floatImageViewerLoader.item.mouseY)
} : null)
}

LensDistortionToolbar {
Expand Down