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

[Viewer] Clean-up: Harmonize syntax across all the files

Browse source
This commit is contained in:
Candice Bentéjac 2023-10-17 12:46:57 +02:00
parent 9d2974d282
commit 13b8266d14
15 changed files with 488 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

60
meshroom/ui/qml/Viewer/ImageMetadataView.qml
View file

@ -9,7 +9,7 @@ import Controls 1.0
import Utils 1.0
/**
* ImageMetadataView displays a JSON model representing an image"s metadata as a ListView.
* ImageMetadataView displays a JSON model representing an image's metadata as a ListView.
*/
FloatingPane {
id: root
@ -27,12 +27,10 @@ FloatingPane {
* GPS coordinates in metadata can be store in 3 forms:
* (degrees), (degrees, minutes), (degrees, minutes, seconds)
*/
function gpsMetadataToCoordinates(value, ref)
{
function gpsMetadataToCoordinates(value, ref) {
var values = value.split(",")
var result = 0
for(var i=0; i < values.length; ++i)
{
for (var i = 0; i < values.length; ++i) {
// divide each component by the corresponding power of 60
// 1 for degree, 60 for minutes, 3600 for seconds
result += Number(values[i]) / Math.pow(60, i)
@ -42,19 +40,14 @@ FloatingPane {
}
/// Try to get GPS coordinates from metadata
function getGPSCoordinates(metadata)
{
function getGPSCoordinates(metadata) {
// GPS data available
if(metadata && metadata["GPS:Longitude"] !== undefined && metadata["GPS:Latitude"] !== undefined)
{
if (metadata && metadata["GPS:Longitude"] !== undefined && metadata["GPS:Latitude"] !== undefined) {
var latitude = gpsMetadataToCoordinates(metadata["GPS:Latitude"], metadata["GPS:LatitudeRef"])
var longitude = gpsMetadataToCoordinates(metadata["GPS:Longitude"], metadata["GPS:LongitudeRef"])
var altitude = metadata["GPS:Altitude"] || 0
return QtPositioning.coordinate(latitude, longitude, altitude)
}
// GPS data unavailable: reset coordinates to default value
else
{
} else { // GPS data unavailable: reset coordinates to default value
return QtPositioning.coordinate()
}
}
@ -74,22 +67,18 @@ FloatingPane {
metadataModel.clear()
var entries = []
// prepare data to populate the model from the input metadata object
for(var key in metadata)
{
for (var key in metadata) {
var entry = {}
// split on ":" to get group and key
var i = key.lastIndexOf(":")
if(i === -1)
{
if (i === -1) {
i = key.lastIndexOf("/")
}
if(i !== -1)
{
if (i !== -1) {
entry["group"] = key.substr(0, i)
entry["key"] = key.substr(i+1)
}
else
{
} else {
// set default group to something convenient for sorting
entry["group"] = "-"
entry["key"] = key
@ -110,15 +99,6 @@ FloatingPane {
}
}
// Button {
// onClicked: {
// if(sortedMetadataModel.sortOrder == Qt.DescendingOrder)
// sortedMetadataModel.sortOrder = Qt.AscendingOrder
// else
// sortedMetadataModel.sortOrder = Qt.DescendingOrder
// }
// }
// Background WheelEvent grabber
MouseArea {
anchors.fill: parent
@ -126,7 +106,6 @@ FloatingPane {
onWheel: wheel.accepted = true
}
// Main Layout
ColumnLayout {
anchors.fill: parent
@ -144,16 +123,15 @@ FloatingPane {
Label {
id: exposureLabel
text: {
if(metadata["ExposureTime"] === undefined)
return "";
var expStr = metadata["ExposureTime"];
var exp = parseFloat(expStr);
if(exp < 1.0)
{
var invExp = 1.0 / exp;
return "1/" + invExp.toFixed(0);
if (metadata["ExposureTime"] === undefined)
return ""
var expStr = metadata["ExposureTime"]
var exp = parseFloat(expStr)
if (exp < 1.0) {
var invExp = 1.0 / exp
return "1/" + invExp.toFixed(0)
}
return expStr;
return expStr
}
elide: Text.ElideRight
horizontalAlignment: Text.AlignHLeft