Skip to content
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

[Viewer] Viewer: Fix various issues with the 2D Viewer #2278

Closed
wants to merge 8 commits into from
Closed

[Viewer] Viewer: Fix various issues with the 2D Viewer #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea8fbf8
[Viewer] Viewer2D: Fix check on the image status for the color picker
cbentejac Dec 20, 2023
2d60ce4
[Viewer] PanoramaViewer: Fix check on the image status for the pano v…
cbentejac Dec 20, 2023
181a68c
[Viewer] Viewer2D: Use newest MaterialIcon for the PanoramaViewer
cbentejac Dec 20, 2023
5600c58
[Viewer] Viewer2D: Fix QML warnings related to FloatImageViewer's status
cbentejac Dec 20, 2023
9c99efb
[Viewer] SequencePlayer: Fix check on the image status for SequencePl…
cbentejac Dec 20, 2023
d4addec
[Viewer] Viewer2D: Fix check on image status for the resolution display
cbentejac Dec 20, 2023
c87e279
[Viewer] Viewer2D: Fix check on image status for the Color Checker Vi…
cbentejac Dec 20, 2023
6c723df
[Viewer] Viewer2D: Fix check on image status to display the loading icon
cbentejac Dec 21, 2023
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
2 changes: 1 addition & 1 deletion meshroom/ui/qml/Viewer/PanoramaViewer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ AliceVision.PanoramaViewer {
'canBeHovered': true,
'useSequence': false
})
imageLoaded = Qt.binding(function() { return repeater.itemAt(index).item.status === Image.Ready ? true : false })
imageLoaded = Qt.binding(function() { return repeater.itemAt(index).item.imageStatus === Image.Ready ? true : false })
}

}
Expand Down
2 changes: 1 addition & 1 deletion meshroom/ui/qml/Viewer/SequencePlayer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ FloatingPane {
interval: 1000 / m.fps

onTriggered: {
if (viewer.status !== Image.Ready) {
if (viewer.imageStatus !== Image.Ready) {
// Wait for current image to be displayed before switching to next image
return;
}
Expand Down
35 changes: 19 additions & 16 deletions meshroom/ui/qml/Viewer/Viewer2D.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ FocusScope {
if (!imgContainer.image)
return ""
var res = ""
if (imgContainer.image.status === Image.Loading) {
if (imgContainer.image.imageStatus === Image.Loading) {
res += " Image"
}
if (mfeaturesLoader.status === Loader.Ready) {
Expand Down Expand Up @@ -372,7 +372,7 @@ FocusScope {

colorRGBA: {
if (!floatImageViewerLoader.item ||
floatImageViewerLoader.item.status !== Image.Ready) {
floatImageViewerLoader.item.imageStatus !== Image.Ready) {
return null
}
if (floatImageViewerLoader.item.containsMouse === false) {
Expand Down Expand Up @@ -681,7 +681,7 @@ FocusScope {
width: imgContainer.width
height: imgContainer.height

visible: activeNode.isComputed && json !== undefined && imgContainer.image.status === Image.Ready
visible: activeNode.isComputed && json !== undefined && imgContainer.image.imageStatus === Image.Ready
source: Filepath.stringToUrl(activeNode.attribute("outputData").value)
viewpoint: _reconstruction.selectedViewpoint
zoom: imgContainer.scale
Expand Down Expand Up @@ -750,7 +750,7 @@ FocusScope {
Layout.fillWidth: true
Layout.fillHeight: false
Layout.preferredHeight: childrenRect.height
visible: floatImageViewerLoader.item.imageStatus === Image.Error
visible: floatImageViewerLoader.item !== null && floatImageViewerLoader.item.imageStatus === Image.Error
Layout.alignment: Qt.AlignHCenter

RowLayout {
Expand All @@ -759,16 +759,19 @@ FocusScope {
Label {
font.pointSize: 8
text: {
switch (floatImageViewerLoader.item.status) {
case 2: // AliceVision.FloatImageViewer.EStatus.OUTDATED_LOADING
return "Outdated Loading"
case 3: // AliceVision.FloatImageViewer.EStatus.MISSING_FILE
return "Missing File"
case 4: // AliceVision.FloatImageViewer.EStatus.ERROR
return "Error"
default:
return ""
if (floatImageViewerLoader.item !== null) {
switch (floatImageViewerLoader.item.status) {
case 2: // AliceVision.FloatImageViewer.EStatus.OUTDATED_LOADING
return "Outdated Loading"
case 3: // AliceVision.FloatImageViewer.EStatus.MISSING_FILE
return "Missing File"
case 4: // AliceVision.FloatImageViewer.EStatus.ERROR
return "Error"
default:
return ""
}
}
return ""
}
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
Expand Down Expand Up @@ -1041,7 +1044,7 @@ FocusScope {

// zoom label
MLabel {
text: ((imgContainer.image && (imgContainer.image.status === Image.Ready)) ? imgContainer.scale.toFixed(2) : "1.00") + "x"
text: ((imgContainer.image && (imgContainer.image.imageStatus === Image.Ready)) ? imgContainer.scale.toFixed(2) : "1.00") + "x"
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton | Qt.RightButton
Expand Down Expand Up @@ -1140,7 +1143,7 @@ FocusScope {
}

ToolTip.text: activeNode ? "Panorama Viewer " + activeNode.label : "Panorama Viewer"
text: MaterialIcons.panorama_sphere
text: MaterialIcons.panorama_photosphere
font.pointSize: 16
padding: 0
Layout.minimumWidth: 0
Expand Down Expand Up @@ -1386,7 +1389,7 @@ FocusScope {
Component.onCompleted: {
running = Qt.binding(function() {
return (root.usePanoramaViewer === true && imgContainer.image && imgContainer.image.allImagesLoaded === false)
|| (imgContainer.image && imgContainer.image.status === Image.Loading)
|| (imgContainer.image && imgContainer.image.imageStatus === Image.Loading)
})
}
// disable the visibility when unused to avoid stealing the mouseEvent to the image color picker
Expand Down