Move away from braindead ratio storage

Change-Id: Ide0263ba793316ed15e883c7d05c5b260befd154

qml/common/ArtImage.qml

@@ -12,7 +12,7 @@ Item {
 
     //color: Qt.rgba(Math.random(255), Math.random(255), Math.random(255), 1.0)
 
-    height: width/imageModel.data(modelIndex, PictureModel.RatioRole)
+    height: width*imageModel.data(modelIndex, PictureModel.SizeRole).height/imageModel.data(modelIndex, PictureModel.SizeRole).width
     width: parent ? parent.width : 0
 
     Image {
@@ -20,7 +20,7 @@ Item {
         cache: false
         opacity: globalSettings.fadeInImages ? 0 : 1.0
 
-        height: globalVars.imageWidthOverride > 0 ? Math.ceil(globalVars.imageWidthOverride/imageModel.data(modelIndex, PictureModel.RatioRole)) : imageModel.data(modelIndex, PictureModel.SizeRole).height
+        height: globalVars.imageWidthOverride > 0 ? Math.ceil(globalVars.imageWidthOverride*imageModel.data(modelIndex, PictureModel.SizeRole).height/imageModel.data(modelIndex, PictureModel.SizeRole).width) : imageModel.data(modelIndex, PictureModel.SizeRole).height
         width: globalVars.imageWidthOverride > 0 ? globalVars.imageWidthOverride : imageModel.data(modelIndex, PictureModel.SizeRole).width
 
         transformOrigin: Item.TopLeft

qml/conveyor/Conveyor.qml

@@ -117,7 +117,7 @@ Item {
 
             density: 1
             height: root.height/conveyorSettings.rowCount
-            width: height*imageModel.data(modelIndex, PictureModel.RatioRole)
+            width: height/imageModel.data(modelIndex, PictureModel.SizeRole).height*imageModel.data(modelIndex, PictureModel.SizeRole).width
             bodyType: Body.Dynamic
             fixedRotation: true
 

src/picturemodel.cpp

@@ -39,7 +39,6 @@ struct FSNode {
 struct FSLeafNode : public FSNode {
     using FSNode::FSNode;
     QSize size;
-    qreal ratio;
 };
 
 FSNode::FSNode(const QString& rname, const FSNode *pparent)
@@ -124,7 +123,6 @@ void FSNodeTree::addModelNode(const FSNode* parentNode)
                 qDebug() << "Image" << fullPath << "has excessive ratio" << ratio << "excluded";
             } else {
                 rational = true;
-                file->ratio = ratio;
             }
         } else {
             qDebug() << "Discarding" << fullPath << "due to invalid size";
@@ -209,8 +207,6 @@ QVariant PictureModel::data(const QModelIndex &index, int role) const
         switch (role) {
         case SizeRole:
             return QSize(1222,900);
-        case RatioRole:
-            return 1222/900;
         case NameRole:
             return "Qt logo";
         case PathRole:
@@ -223,8 +219,6 @@ QVariant PictureModel::data(const QModelIndex &index, int role) const
     switch (role) {
     case SizeRole:
         return d->fsTree->files.at(index.row())->size;
-    case RatioRole:
-        return d->fsTree->files.at(index.row())->ratio;
     case NameRole:
         return d->fsTree->files.at(index.row())->name;
     case PathRole:
@@ -241,7 +235,6 @@ QHash<int, QByteArray> PictureModel::roleNames() const
     roles[NameRole] = "name";
     roles[PathRole] = "path";
     roles[SizeRole] = "size";
-    roles[RatioRole] = "ratio";
     return roles;
 }