fix Txt file loading

This commit is contained in:
wphiphi 2022-01-04 23:08:17 +01:00 committed by GitHub
parent ee0174594c
commit cbc1ade0e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -301,51 +301,54 @@ function getInfoBits(){
* Load Waidotto QR text format * Load Waidotto QR text format
* https://github.com/waidotto/strong-qr-decoder * https://github.com/waidotto/strong-qr-decoder
***/ ***/
function loadtxt2qrarray(lines) { function loadTxt2Array(lines) {
let sz = lines.length; let sz = lines.length;
var is_data_module = getDataModule(lines); //getDataModule use lines.lenght only :D var data = [];
for(let i=0;i<sz;i++) { for(let i=0;i<sz;i++) {
data[i] = [];
for (let j=0; j<sz ; j++ ) { for (let j=0; j<sz ; j++ ) {
if ( true || is_data_module[i][j]){ switch ( lines[i][j] )
switch ( lines[i][j] ) {
{ case 'X':
case 'X': case 'x':
case 'x': case 'O':
case 'O': case 'o':
case 'o': case '#':
case '#': case '1':
case '1': data[i].push(1);
qr_array[i][j] = 1; break;
break;
case '_': case '_':
case ' ': case ' ':
case '0': case '0':
qr_array[i][j] = 0; data[i].push(0);
break; break;
case '?': case '?':
qr_array[i][j] = -1 ; //grey data[i].push(-1) ; //grey
break; break;
default: default:
throw "Error invalid text QR caracters" throw "Error invalid text QR caracters"
}
} }
} }
} }
return data;
} }
/*** /***
* *
* Create text format compatible with Strong Decoder based on qr_array values * Create text format compatible with Strong Decoder based on qr_array values
* from https://github.com/saitouena/qrazybox/commit/b64a0580be81e0d091c544abae3fff5e246dc09c * from https://github.com/saitouena/qrazybox/commit/b64a0580be81e0d091c544abae3fff5e246dc09c
***/ ***/
function dump_qr_array() { function dumpQRArray() {
let sz = qr_array.length; let sz = qr_array.length;
dump_qr = ""; dump_qr = "";
for(let i=0;i<sz;i++) { for(let i=0;i<sz;i++) {
@ -412,7 +415,7 @@ function generateResult(){
$("#qr-result-dump").attr('cols', qr_version*4 +17 ); $("#qr-result-dump").attr('cols', qr_version*4 +17 );
$("#qr-result-dump").css( 'font-family', 'Courier New'); $("#qr-result-dump").css( 'font-family', 'Courier New');
$("#qr-result-dump").css("font-size", "7px"); $("#qr-result-dump").css("font-size", "7px");
$("#qr-result-dump").val( dump_qr_array() ); $("#qr-result-dump").val( dumpQRArray() );
$("#qr-result").show(); $("#qr-result").show();
$("#qr-table").hide(); $("#qr-table").hide();
@ -1511,10 +1514,11 @@ $(document).ready(function(){
const lines = file.split(/\r\n|\n/); const lines = file.split(/\r\n|\n/);
$("#hidden-txt").val(lines.join('\n')); $("#hidden-txt").val(lines.join('\n'));
$("#div-new").hide(); $("#div-new").hide();
var version = (lines[0].length-17)/4; qr_size = lines[0].length;
generateTable( version ); qr_version = (qr_size-17)/4;
loadtxt2qrarray(lines); generateTable( qr_version );
updateQRArray(qr_array); data = loadTxt2Array(lines);
updateQRArray(data);
clearHistory(); clearHistory();
updateHistory("Load from image"); updateHistory("Load from image");
refreshTable(); refreshTable();