Skip to content

Commit

Permalink
[wip] Change intrinsic key getter in table view
Browse files Browse the repository at this point in the history
  • Loading branch information
@N0Ls
N0Ls committed Aug 23, 2021
1 parent 83a404a commit a3877b8
Showing 1 changed file with 38 additions and 19 deletions.
57 changes: 38 additions & 19 deletions meshroom/ui/qml/ImageGallery/ImageGallery.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Panel {
}

property variant parsedIntrinsic
property variant parsedIntrinsicKeys
property int numberOfIntrinsics : m.intrinsics ? m.intrinsics.count : 0

onNumberOfIntrinsicsChanged: {
Expand All @@ -65,6 +66,7 @@ Panel {

function parseIntr(){
parsedIntrinsic = {}
parsedIntrinsicKeys = []

var currentCameraInitIntrinsics = m.intrinsics

Expand All @@ -75,20 +77,23 @@ Panel {
//Loop through all attributes
for(var j=0; j < currentCameraInitIntrinsics.at(i).value.count; j++){
var currentAttribute = currentCameraInitIntrinsics.at(i).value.at(j)
//parsedIntrinsic[i][currentAttribute.label] = {}
//parsedIntrinsic[i][currentAttribute.name] = {}
if(currentAttribute.type === "GroupAttribute"){
//parsedIntrinsic[i][currentAttribute.label] = currentAttribute
//parsedIntrinsic[i][currentAttribute.name] = currentAttribute
for(var k=0; k < currentAttribute.value.count; k++){
parsedIntrinsic[i][currentAttribute.label + " " + currentAttribute.value.at(k).label] = currentAttribute.value.at(k)
//console.warn(currentAttribute.label + " " + currentAttribute.value.at(k).label)
parsedIntrinsic[i][currentAttribute.name + " " + currentAttribute.value.at(k).name] = currentAttribute.value.at(k)
if(i == 0) parsedIntrinsicKeys.push(currentAttribute.name + " " + currentAttribute.value.at(k).name)
}
}
else if(currentAttribute.type === "ListAttribute"){

}
else{
parsedIntrinsic[i][currentAttribute.label] = currentAttribute
parsedIntrinsic[i][currentAttribute.name] = currentAttribute
if(i == 0) parsedIntrinsicKeys.push(currentAttribute.name)

}
console.warn(parsedIntrinsicKeys[j])
}
}
populate_model()
Expand Down Expand Up @@ -349,7 +354,7 @@ Panel {

//Provide width for column
//Note no size provided for the last column (bool comp) so it uses its automated size
property var columnWidths: [90, 75, 75, 75, 125, 60, 60, 45, 45, 200, 60, 60]
property var columnWidths: [105, 75, 75, 75, 125, 60, 60, 45, 45, 200, 60, 60]
columnWidthProvider: function (column) { return columnWidths[column] }

model: intrinsicModel
Expand All @@ -363,19 +368,33 @@ Panel {
TableModel{
id : intrinsicModel

TableModelColumn { display: "Id" }
TableModelColumn { display: "Initial Focal Length" }
TableModelColumn { display: "Focal Length x" }
TableModelColumn { display: "Focal Length y" }
TableModelColumn { display: "Camera Type" }
TableModelColumn { display: "Width" }
TableModelColumn { display: "Height" }
TableModelColumn { display: "Sensor Width" }
TableModelColumn { display: "Sensor Height" }
TableModelColumn { display: "Serial Number" }
TableModelColumn { display: "Principal Point x" }
TableModelColumn { display: "Principal Point y" }
TableModelColumn { display: "Locked" }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[0]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[1]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[2]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[3]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[4]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[5]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[6]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[7]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[8]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[9]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[10]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[11]]} }
TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][parsedIntrinsicKeys[12]]} }
//https://doc.qt.io/qt-5/qml-qt-labs-qmlmodels-tablemodel.html#appendRow-method

// TableModelColumn { display: function(){return parsedIntrinsicKeys[1]} }
// TableModelColumn { display: "Focal Length x" }
// TableModelColumn { display: "Focal Length y" }
// TableModelColumn { display: "Camera Type" }
// TableModelColumn { display: "Width" }
// TableModelColumn { display: "Height" }
// TableModelColumn { display: "Sensor Width" }
// TableModelColumn { display: "Sensor Height" }
// TableModelColumn { display: "Serial Number" }
// TableModelColumn { display: "Principal Point x" }
// TableModelColumn { display: "Principal Point y" }
// TableModelColumn { display: "Locked" }
}

//CODE FOR HEADERS
Expand Down

0 comments on commit a3877b8

Please sign in to comment.