mirror of
https://github.com/Merricx/qrazybox.git
synced 2025-04-19 17:49:04 +02:00
fix Txt file loading
This commit is contained in:
parent
ee0174594c
commit
cbc1ade0e6
1 changed files with 38 additions and 34 deletions
30
js/main.js
30
js/main.js
|
@ -301,14 +301,15 @@ function getInfoBits(){
|
|||
* Load Waidotto QR text format
|
||||
* https://github.com/waidotto/strong-qr-decoder
|
||||
***/
|
||||
function loadtxt2qrarray(lines) {
|
||||
function loadTxt2Array(lines) {
|
||||
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++) {
|
||||
data[i] = [];
|
||||
|
||||
for (let j=0; j<sz ; j++ ) {
|
||||
if ( true || is_data_module[i][j]){
|
||||
switch ( lines[i][j] )
|
||||
{
|
||||
case 'X':
|
||||
|
@ -317,17 +318,17 @@ function loadtxt2qrarray(lines) {
|
|||
case 'o':
|
||||
case '#':
|
||||
case '1':
|
||||
qr_array[i][j] = 1;
|
||||
data[i].push(1);
|
||||
break;
|
||||
|
||||
case '_':
|
||||
case ' ':
|
||||
case '0':
|
||||
qr_array[i][j] = 0;
|
||||
data[i].push(0);
|
||||
break;
|
||||
|
||||
case '?':
|
||||
qr_array[i][j] = -1 ; //grey
|
||||
data[i].push(-1) ; //grey
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -335,17 +336,19 @@ function loadtxt2qrarray(lines) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return data;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/***
|
||||
*
|
||||
* Create text format compatible with Strong Decoder based on qr_array values
|
||||
* from https://github.com/saitouena/qrazybox/commit/b64a0580be81e0d091c544abae3fff5e246dc09c
|
||||
***/
|
||||
function dump_qr_array() {
|
||||
function dumpQRArray() {
|
||||
let sz = qr_array.length;
|
||||
dump_qr = "";
|
||||
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").css( 'font-family', 'Courier New');
|
||||
$("#qr-result-dump").css("font-size", "7px");
|
||||
$("#qr-result-dump").val( dump_qr_array() );
|
||||
$("#qr-result-dump").val( dumpQRArray() );
|
||||
|
||||
$("#qr-result").show();
|
||||
$("#qr-table").hide();
|
||||
|
@ -1511,10 +1514,11 @@ $(document).ready(function(){
|
|||
const lines = file.split(/\r\n|\n/);
|
||||
$("#hidden-txt").val(lines.join('\n'));
|
||||
$("#div-new").hide();
|
||||
var version = (lines[0].length-17)/4;
|
||||
generateTable( version );
|
||||
loadtxt2qrarray(lines);
|
||||
updateQRArray(qr_array);
|
||||
qr_size = lines[0].length;
|
||||
qr_version = (qr_size-17)/4;
|
||||
generateTable( qr_version );
|
||||
data = loadTxt2Array(lines);
|
||||
updateQRArray(data);
|
||||
clearHistory();
|
||||
updateHistory("Load from image");
|
||||
refreshTable();
|
||||
|
|
Loading…
Add table
Reference in a new issue