Allow specifying the min and max version number in qrCreate

livecodepanos · livecodepanos · commit ee8956220ceb · 2018-10-25T17:46:51.000+03:00
diff --git a/extensions/script-libraries/qr/qr.livecodescript b/extensions/script-libraries/qr/qr.livecodescript
@@ -1436,6 +1436,35 @@ Create a QR code
 Example:
 qrCreate "MyImage", "QR data", "M", 3
 
+Example: 
+--creating QR Code with ECC level M, Size 3, Mask 7 and version 14
+qrCreate "MyImage", "QR data", "M", 3, 7, 14, 14
+
+Example:
+-- example how to use qrCreate with LiveCode server
+qrCreate "!", tData, tECC, tSize
+put the result into tData
+if tData begins with "Error" then
+   put tData
+else
+   # line 1 of the result contains some info
+   # the remaining lines contain the png image data
+   put line 1 of tData into tInfo
+   delete line 1 of tData
+
+   put "&lt;b&gt;Qr code info&lt;/b&gt;&lt;br/&gt;" & LF
+   put "Version: " & item 1 of tInfo & "&lt;br/&gt;" & LF
+   put "ECC: " & item 2 of tInfo & "&lt;br/&gt;" & LF
+   put "Mode: " & item 3 of tInfo & "&lt;br/&gt;" & LF
+   put "Mask: " & item 4 of tInfo & "&lt;br/&gt;" & LF
+
+   # show the image
+   put base64Encode(tData) into tData
+   replace LF with empty in tData
+   put "&lt;img src='data:image/png;base64," & tData & "'/&gt;&lt;br/&gt;" & LF
+end if
+
+
 Description:
 Set the text of an image to a QR code or get the PMG data of the QR code image.
 
@@ -1466,6 +1495,14 @@ Each mask pattern changes the bits according to their coordinates in
 the QR matrix. The purpose of a mask pattern is to make the QR code
 easier for a QR scanner to read.
 
+pMinVersion:
+An integer value between 1 and 40. It must be lower or equal to pMaxVersion.
+If pMinVersion is not specified then the default value of 1 is used.
+
+pMaxVersion:
+An integer value between 1 and 40. It must be higher or equal to pMaxVersion.
+If pMaxVersion is not specified then the default value of 40 is used.
+
 The result:
 If successful, the first line of the result will be the following values: 
 - QR version
@@ -1483,7 +1520,7 @@ with LiveCode server to generate QR codes on web pages.
 
 */
 
-command qrCreate pImg, pData, pECC, pSize, pMask
+command qrCreate pImg, pData, pECC, pSize, pMask, pMinVersion, pMaxVersion
    lock screen
    
    try
@@ -1522,7 +1559,13 @@ command qrCreate pImg, pData, pECC, pSize, pMask
       # calculate minimum version required
       local tMinVersion
       put 0 into tMinVersion
-      repeat with tVersion = 1 to 40
+      
+      if pMinVersion is empty then put 1 into pMinVersion
+      if pMaxVersion is empty then put 40 into pMaxVersion
+      if pMaxVersion  > 40  or pMaxVersion < 1 or pMinVersion < 1 or pMinVersion >40 then throw "allowed values for pMinVersion to pMaxVersion are 1 to 40"
+      if pMinVersion >pMaxVersion then throw "pMinversion must be lower or equal to pMaxVersion"
+     
+      repeat with tVersion = pMinVersion to pMaxVersion
          local tCCIBits, tBitStreamLength, tErrorWords, tTotalWords, tBitStreamMax, tRemBits
          put 0 into tCCIBits -- character count indicator
          put 0 into tBitStreamLength
