Replaced tick labels with Repeater. Reorganized and adjusted spacing.

qml/BrewPlot/BrewingControlChart.qml

@@ -4,6 +4,13 @@ import QtQuick 1.0
 Item {
 	id: chartOuter
 
+    property real xmin: 0.14
+    property real xmax: 0.26
+    property real ymin: 0.008
+    property real ymax: 0.016
+    property real xrange: xmax - xmin
+    property real yrange: ymax - ymin
+
 	function plotPoint(px, py, pcolor) {
 		chart.plotPoint(px, py, pcolor);
 	}
@@ -22,6 +29,7 @@ Item {
 
 	Item {
 		id: chart
+
 		height: parent.height
 		width: parent.width
 
@@ -40,6 +48,7 @@ Item {
 			fitline.y1 = mapToY(y1);
 			fitline.y2 = mapToY(y2);
 		}
+
 		Line {
 			id: fitline
 
@@ -59,6 +68,12 @@ Item {
 		ListModel {
 			id: points
 		}
+        ListModel {
+            id: yLabels
+        }
+        ListModel {
+            id: xLabels
+        }
 
 		Repeater {
 			model: xGridLines
@@ -99,149 +114,66 @@ Item {
 			}
 		}
 	}
-	
-	property real xmin: 0.14
-	property real xmax: 0.26
-	property real ymin: 0.008
-	property real ymax: 0.016
-	property real xrange: xmax - xmin
-	property real yrange: ymax - ymin
-	
-	Item {
-		id: yLabels
+    Repeater {
+        id: yTickLabels
 
+        model: yLabels
         anchors.right: chart.left
         anchors.rightMargin: 10
         y: chart.y
-        Text {
-            text: "0.8%"
-            y: chart.mapToY(0.008) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "0.9%"
-            y: chart.mapToY(0.009) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "1.0%"
-            y: chart.mapToY(0.01) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "1.1%"
-            y: chart.mapToY(0.011) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "1.2%"
-            y: chart.mapToY(0.012) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "1.3%"
-            y: chart.mapToY(0.013) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "1.4%"
-            y: chart.mapToY(0.014) - (height/2)
-            x: -width
-        }
-        Text {
-            text: "1.5%"
-            y: chart.mapToY(0.015) - (height/2)
-            x: -width
+
+        Item {
+            Text {
+                text: (value * 100).toFixed(1) + "%"
+                y: chart.mapToY(value) - (height/2)
+                x: -width
+            }
         }
+    }
+    Item {
+        anchors.right: yTickLabels.left
+        anchors.rightMargin: 40
+        y: chart.y + (chart.height/2) - (strengthLabel.height/2)
+
         Text {
-            text: "1.6%"
-            y: chart.mapToY(0.016) - (height/2)
-            x: -width
+            id: strengthLabel
+
+            text: "STRENGTH - Solubles Concentration (%TDS)"
+            rotation: -90
+            x: -(width/2)
         }
     }
-    Item {
-        id: xLabels
+    Repeater {
+        id: xTickLabels
 
-        x: chart.x
         anchors.top: chart.bottom
         anchors.topMargin: 10
-        Text {
-            text: "14%"
-            x: chart.mapToX(0.14) - (width/2)
-        }
-        Text {
-            text: "15%"
-            x: chart.mapToX(0.15) - (width/2)
-        }
-        Text {
-            text: "16%"
-            x: chart.mapToX(0.16) - (width/2)
-        }
-        Text {
-            text: "17%"
-            x: chart.mapToX(0.17) - (width/2)
-        }
-        Text {
-            text: "18%"
-            x: chart.mapToX(0.18) - (width/2)
-        }
-        Text {
-            text: "19%"
-            x: chart.mapToX(0.19) - (width/2)
-        }
-        Text {
-            text: "20%"
-            x: chart.mapToX(0.2) - (width/2)
-        }
-        Text {
-            text: "21%"
-            x: chart.mapToX(0.21) - (width/2)
-        }
-        Text {
-            text: "22%"
-            x: chart.mapToX(0.22) - (width/2)
-        }
-        Text {
-            text: "23%"
-            x: chart.mapToX(0.23) - (width/2)
-        }
-        Text {
-            text: "24%"
-            x: chart.mapToX(0.24) - (width/2)
-        }
-        Text {
-            text: "25%"
-            x: chart.mapToX(0.25) - (width/2)
-        }
-        Text {
-            text: "26%"
-            x: chart.mapToX(0.26) - (width/2)
+        model: xLabels
+        x: chart.x
+
+        Item {
+            Text {
+                text: (value * 100).toFixed(0) + "%"
+                x: chart.mapToX(value) - (width/2)
+                y: xTickLabels.y
+            }
         }
     }
     Text {
         text: "EXTRACTION - Solubles Yield"
         x: chart.x + (chart.width/2) - (width/2)
-        anchors.top: xLabels.bottom
+        anchors.top: xTickLabels.bottom
         anchors.topMargin: 20
     }
-    Item {
-        anchors.right: yLabels.left
-        anchors.rightMargin: 40
-        y: chart.y + (chart.height/2) - (strengthLabel.height/2)
-        Text {
-            id: strengthLabel
 
-            text: "STRENGTH - Solubles Concentration (%TDS)"
-            rotation: -90
-            x: -(width/2)
-        }
-    }
 	Component.onCompleted: {
         for(var i = 0.14; i < 0.261; i += 0.01) {
             xGridLines.append({"value": i, "pwidth": i.toFixed(2) == 0.18 || i.toFixed(2) == 0.22 ? 2 : 1});
+            xLabels.append({"value": i});
         }
         for(var i = 0.008; i < 0.0161; i += 0.0005) {
             yGridLines.append({"value": i, "pwidth": i.toFixed(4) == 0.0115 || i.toFixed(4) == 0.0135 ? 2 : 1});
+            yLabels.append({"value": i});
         }
 	}
 }