Merge lp:~stefan-schwarzburg/qreator/touch_qrcodesize into lp:qreator/touch

[Schwarzburg]

Hi David,
Since you did so much great work on releasing the python based version, we are now at a point were we can continue with the qml version, I guess.

So: this is the first change I would like to input.

It is an hopefully uncontroversionl change, it extends the possible qrcode size of the javascript library to version 40 (previously the max size was version 10). The only reason why we might not want this here is that it could also go into the upstream version. However, there will be other and deeper changes to the qrcode.js library in the future, which will simplify calculating the best size before creating the code... So I think qreator is the right place for this patch.

[David Planella (dpm)]

Thanks Stefan, indeed, time to start the fun with the qml version ;)

The change looks good to me. However, may I ask you to fix just one thing? The modification includes 2 changes:

1) Addition of the new lookup tables from 11 to 40
2) Whitespace change from tabs to spaces under RS_BLOCK_TABLE

The reason I'm asking, apart from nitpicking (sorry) is because this way the change is much more easy to read. I assume you haven't changed the arrays from 1 to 10, but that's not obvious from the diff, as it's quite a long list of values to check one by one. Also, although I prefer spaces than tabs myself, for consistency's sake we should stick to the whitespace used originally rather than mixing spaces and tabs.

It will also help if upstream wants to cherrypick this one change but not more intrusive ones.

Thanks!

review: Needs Fixing

[lp:~stefan-schwarzburg/qreator/touch_qrcodesize]

15. By Schwarzburg on 2013-05-22

replaced the whitespace changes to mach the upstream indentation.

16. By Schwarzburg on 2013-05-22

replaced the last remaining line with 4 spaces instead of a tab to match the upstream indentation.

[Schwarzburg (stefan-schwarzburg)]

OK, I think I got all the lines with 4 spaces instead of tabs :-)

Sorry for your extra work on my merge requests, I will try to pay more attention to details...

[David Planella (dpm)]

No worries, thank you for the work and the fixes!

Ok, this looks good to me now. I must admit I haven't checked the values in the arrays, but I trust you :)

Also, before you merge into trunk, just two things:

1) Can you add an empty line after this line:

18 + [6, 43, 15, 2, 44, 16],

This way the comment is separated from the previous array as in the rest of the file.

2) Can you add a brief note on the commit message about how you calculated the values in the arrays?

Thanks!

review: Approve

[lp:~stefan-schwarzburg/qreator/touch_qrcodesize]

17. By Schwarzburg on 2013-05-25

Changed more whitespace to fit the original style.

Note on the values in RS_BLOCK_TABLE table:

The table has 4 entries per 'version' (in the range 1 - 40, corresponding to
different sizes of the qr code).
Each entry correspsonds to a different error corection level (L, M, Q, H).
In each entry, there are sets of 3 numbers:
number-of-error-correction-blocks,total-number-of-codewords,number-of-data-codewords

While it is certainly possible to calculate these numbers, I have not done so, but instead
I have consulted the ISO standard: the values are noted in table 9 of the ISO/IEC 18004:2006
document in the last two columns.

18. By Schwarzburg on 2013-05-25

more whitespace changes... (I need to switch of some auto-indentation and auto-whitespace features in emacs... Sorry for the noise)

=== modified file 'js/qrcode.js'
--- js/qrcode.js	2013-02-08 03:16:44 +0000
+++ js/qrcode.js	2013-05-25 09:00:37 +0000
@@ -23,7 +23,7 @@
 
 	/**
 	 * qrcode
-	 * @param typeNumber 1 to 10
+	 * @param typeNumber 1 to 40
 	 * @param errorCorrectLevel 'L','M','Q','H'
 	 */
 	var qrcode = function(typeNumber, errorCorrectLevel) {
@@ -1048,7 +1048,187 @@
 			[2, 86, 68, 2, 87, 69],
 			[4, 69, 43, 1, 70, 44],
 			[6, 43, 19, 2, 44, 20],
-			[6, 43, 15, 2, 44, 16]
+			[6, 43, 15, 2, 44, 16],
+
+			// 11
+			[4, 101, 81],
+			[1, 80, 50, 4, 81, 51],
+			[4, 50, 22, 4, 51, 23],
+			[3, 36, 12, 8, 37, 13],
+
+			// 12
+			[2, 116, 92, 2, 117, 93],
+			[6, 58, 36, 2, 59, 37],
+			[4, 46, 20, 6, 47, 21],
+			[7, 42, 14, 4, 43, 15],
+
+			// 13
+			[4, 133, 107],
+			[8, 59, 37, 1, 60, 38],
+			[8, 44, 20, 4, 45, 21],
+			[12, 33, 11, 4, 34, 12],
+
+			// 14
+			[3, 145, 115, 1, 146, 116],
+			[4, 64, 40, 5, 65, 41],
+			[11, 36, 16, 5, 37, 17],
+			[11, 36, 12, 5, 37, 13],
+
+			// 15
+			[5, 109, 87, 1, 110, 88],
+			[5, 65, 41, 5, 66, 42],
+			[5, 54, 24, 7, 55, 25],
+			[11, 36, 12],
+
+			// 16
+			[5, 122, 98, 1, 123, 99],
+			[7, 73, 45, 3, 74, 46],
+			[15, 43, 19, 2, 44, 20],
+			[3, 45, 15, 13, 46, 16],
+
+			// 17
+			[1, 135, 107, 5, 136, 108],
+			[10, 74, 46, 1, 75, 47],
+			[1, 50, 22, 15, 51, 23],
+			[2, 42, 14, 17, 43, 15],
+
+			// 18
+			[5, 150, 120, 1, 151, 121],
+			[9, 69, 43, 4, 70, 44],
+			[17, 50, 22, 1, 51, 23],
+			[2, 42, 14, 19, 43, 15],
+
+			// 19
+			[3, 141, 113, 4, 142, 114],
+			[3, 70, 44, 11, 71, 45],
+			[17, 47, 21, 4, 48, 22],
+			[9, 39, 13, 16, 40, 14],
+
+			// 20
+			[3, 135, 107, 5, 136, 108],
+			[3, 67, 41, 13, 68, 42],
+			[15, 54, 24, 5, 55, 25],
+			[15, 43, 15, 10, 44, 16],
+
+			// 21
+			[4, 144, 116, 4, 145, 117],
+			[17, 68, 42],
+			[17, 50, 22, 6, 51, 23],
+			[19, 46, 16, 6, 47, 17],
+
+			// 22
+			[2, 139, 111, 7, 140, 112],
+			[17, 74, 46],
+			[7, 54, 24, 16, 55, 25],
+			[34, 37, 13],
+
+			// 23
+			[4, 151, 121, 5, 152, 122],
+			[4, 75, 47, 14, 76, 48],
+			[11, 54, 24, 14, 55, 25],
+			[16, 45, 15, 14, 46, 16],
+
+			// 24
+			[6, 147, 117, 4, 148, 118],
+			[6, 73, 45, 14, 74, 46],
+			[11, 54, 24, 16, 55, 25],
+			[30, 46, 16, 2, 47, 17],
+
+			// 25
+			[8, 132, 106, 4, 133, 107],
+			[8, 75, 47, 13, 76, 48],
+			[7, 54, 24, 22, 55, 25],
+			[22, 45, 15, 13, 46, 16],
+
+			// 26
+			[10, 142, 114, 2, 143, 115],
+			[19, 74, 46, 4, 75, 47],
+			[28, 50, 22, 6, 51, 23],
+			[33, 46, 16, 4, 47, 17],
+
+			// 27
+			[8, 152, 122, 4, 153, 123],
+			[22, 73, 45, 3, 74, 46],
+			[8, 53, 23, 26, 54, 24],
+			[12, 45, 15, 28, 46, 16],
+
+			// 28
+			[3, 147, 117, 10, 148, 118],
+			[3, 73, 45, 23, 74, 46],
+			[4, 54, 24, 31, 55, 25],
+			[11, 45, 15, 31, 46, 16],
+
+			// 29
+			[7, 146, 116, 7, 147, 117],
+			[21, 73, 45, 7, 74, 46],
+			[1, 53, 23, 37, 54, 24],
+			[19, 45, 15, 26, 46, 16],
+
+			// 30
+			[5, 145, 115, 10, 146, 116],
+			[19, 75, 47, 10, 76, 48],
+			[15, 54, 24, 25, 55, 25],
+			[23, 45, 15, 25, 46, 16],
+
+			// 31
+			[13, 145, 115, 3, 146, 116],
+			[2, 74, 46, 29, 75, 47],
+			[42, 54, 24, 1, 55, 25],
+			[23, 45, 15, 28, 46, 16],
+
+			// 32
+			[17, 145, 115],
+			[10, 74, 46, 23, 75, 47],
+			[10, 54, 24, 35, 55, 25],
+			[19, 45, 15, 35, 46, 16],
+
+			// 33
+			[17, 145, 115, 1, 146, 116],
+			[14, 74, 46, 21, 75, 47],
+			[29, 54, 24, 19, 55, 25],
+			[11, 45, 15, 46, 46, 16],
+
+			// 34
+			[13, 145, 115, 6, 146, 116],
+			[14, 74, 46, 23, 75, 47],
+			[44, 54, 24, 7, 55, 25],
+			[59, 46, 16, 1, 47, 17],
+
+			// 35
+			[12, 151, 121, 7, 152, 122],
+			[12, 75, 47, 26, 76, 48],
+			[39, 54, 24, 14, 55, 25],
+			[22, 45, 15, 41, 46, 16],
+
+			// 36
+			[6, 151, 121, 14, 152, 122],
+			[6, 75, 47, 34, 76, 48],
+			[46, 54, 24, 10, 55, 25],
+			[2, 45, 15, 64, 46, 16],
+
+			// 37
+			[17, 152, 122, 4, 153, 123],
+			[29, 74, 46, 14, 75, 47],
+			[49, 54, 24, 10, 55, 25],
+			[24, 45, 15, 46, 46, 16],
+
+			// 38
+			[4, 152, 122, 18, 153, 123],
+			[13, 74, 46, 32, 75, 47],
+			[48, 54, 24, 14, 55, 25],
+			[42, 45, 15, 32, 46, 16],
+
+			// 39
+			[20, 147, 117, 4, 148, 118],
+			[40, 75, 47, 7, 76, 48],
+			[43, 54, 24, 22, 55, 25],
+			[10, 45, 15, 67, 46, 16],
+
+			// 40
+			[19, 148, 118, 6, 149, 119],
+			[18, 75, 47, 31, 76, 48],
+			[34, 54, 24, 34, 55, 25],
+			[20, 45, 15, 61, 46, 16]
 		];
 
 		var qrRSBlock = function(totalCount, dataCount) {