3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-04 01:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Panorama Viewer] Adjust comments and increments

Browse source
This commit is contained in:
Nils Landrodie 2021-08-27 19:58:25 +02:00 • committed by Fabien Castan
parent ba42c5e8f8
commit 38cd58f03f
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meshroom/ui/qml/Viewer/FloatImage.qml
View file

@ -32,11 +32,6 @@ AliceVision.FloatImageViewer {
onStatusChanged: {
if (viewerTypeString === "panorama") {
var activeNode = _reconstruction.activeNodes.get('SfMTransform').node;
// surface.setEulerAngles(
// activeNode.attribute("manualTransform.manualRotation.y").value,
// activeNode.attribute("manualTransform.manualRotation.x").value,
// activeNode.attribute("manualTransform.manualRotation.z").value
// )
}
root.surface.setIdView(idView);
}

12
meshroom/ui/qml/Viewer/PanoramaViewer.qml
View file

@ -45,7 +45,7 @@ AliceVision.PanoramaViewer {
property var idSelected : -1
onIsHighlightableChanged:{
for (var i = 0; i < repeater.model; i++) {
for (var i = 0; i < repeater.model; ++i) {
repeater.itemAt(i).item.onChangedHighlightState(isHighlightable);
}
}
@ -70,6 +70,7 @@ AliceVision.PanoramaViewer {
property int pitchNode: activeNode.attribute("manualTransform.manualRotation.x").value;
property int rollNode: activeNode.attribute("manualTransform.manualRotation.z").value;
//Convert angle functions
function toDegrees(radians){
return radians * (180/Math.PI)
}
@ -121,7 +122,7 @@ AliceVision.PanoramaViewer {
onPositionChanged: {
// Send Mouse Coordinates to Float Images Viewers
idSelected = -1;
for (var i = 0; i < repeater.model && isHighlightable; i++) {
for (var i = 0; i < repeater.model && isHighlightable; ++i) {
var highlight = repeater.itemAt(i).item.getMouseCoordinates(mouse.x, mouse.y);
repeater.itemAt(i).z = highlight ? 2 : 0
if(highlight){
@ -145,7 +146,6 @@ AliceVision.PanoramaViewer {
root.pitch = limitPitch(root.pitch + toDegrees(-(yoffset / height) * mouseMultiplier))
}
// Update SfmTransform Node attribute TODO Undo Group Python
_reconstruction.setAttribute(activeNode.attribute("manualTransform.manualRotation.x"), Math.round(root.pitch));
_reconstruction.setAttribute(activeNode.attribute("manualTransform.manualRotation.y"), Math.round(root.yaw));
_reconstruction.setAttribute(activeNode.attribute("manualTransform.manualRotation.z"), Math.round(root.roll));
@ -168,7 +168,7 @@ AliceVision.PanoramaViewer {
lastX = 0
lastY = 0
//Select the image if clicked
//Select the image in the image gallery if clicked
if(xStart == mouse.x && yStart == mouse.y && idSelected != -1){
_reconstruction.selectedViewId = idSelected
}
@ -189,13 +189,13 @@ AliceVision.PanoramaViewer {
ctx.shadowBlur = 0
ctx.strokeStyle = "grey"
var nrows = height/wgrid;
for(var i=0; i < nrows+1; i++){
for(var i=0; i < nrows+1; ++i){
ctx.moveTo(0, wgrid*i);
ctx.lineTo(width, wgrid*i);
}
var ncols = width/wgrid
for(var j=0; j < ncols+1; j++){
for(var j=0; j < ncols+1; ++j){
ctx.moveTo(wgrid*j, 0);
ctx.lineTo(wgrid*j, height);
}

4
meshroom/ui/qml/Viewer/Viewer2D.qml
View file

@ -151,8 +151,6 @@ FocusScope {
imgContainer.scale = Math.min(imgLayout.width / imgContainer.image.width, root.height / imgContainer.image.height)
imgContainer.x = Math.max((imgLayout.width - imgContainer.image.width * imgContainer.scale)*0.5, 0)
imgContainer.y = Math.max((imgLayout.height - imgContainer.image.height * imgContainer.scale)*0.5, 0)
// console.warn("fit: imgLayout.width: " + imgContainer.scale + ", imgContainer.image.width: " + imgContainer.image.width)
// console.warn("fit: imgContainer.scale: " + imgContainer.scale + ", x: " + imgContainer.x + ", y: " + imgContainer.y)
}
function getImageFile(type) {
@ -206,11 +204,9 @@ FocusScope {
}
if(floatImageViewerLoader.item.containsMouse == false)
{
// console.warn("floatImageViewerLoader: does not contain mouse");
return null;
}
var pix = floatImageViewerLoader.item.pixelValueAt(Math.floor(floatImageViewerLoader.item.mouseX), Math.floor(floatImageViewerLoader.item.mouseY));
// console.warn("floatImageViewerLoader: pixel value at (" << floatImageViewerLoader.item.mouseX << "," << floatImageViewerLoader.item.mouseY << "): ", pix);
return pix;
}