Michel2/image2cpp
1
0
Fork 0
mirror of https://github.com/javl/image2cpp.git synced 2026-07-28 04:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix way trailing whitespace+comma gets removed from code

Browse Source 
Closes #18

Instead of removing an x-amount of characters from the strings to get
rid of trailing commas, a regular expression is now used.
This commit is contained in:
javl
2018-05-24 11:31:54 +02:00
parent 43820ab394
commit 044a4e3db9
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+11 -9
View File
@@ -805,12 +805,12 @@
images.each(function(image) {
code = imageToString(settings['drawMode'], image);
// remove last comma and space chars
code = code.substring(0, code.length - 3);
// Trim whitespace from end and remove trailing comma
code = code.replace(/,\s*$/,"");
code = "\t" + code.split("\n").join("\n\t") + "\n";
var variableCount = images.length() > 1 ? count++ : "";
var comment = " // '" + image.glyph + "', "+image.canvas.width+"x"+image.canvas.height+"px\n";
var comment = "// '" + image.glyph + "', "+image.canvas.width+"x"+image.canvas.height+"px\n";
code = comment + "const unsigned char "
+ getIdentifier()
@@ -831,7 +831,8 @@
output_string += comment + code;
});
output_string = output_string.substring(0, output_string.length - 3);
output_string = output_string.replace(/,\s*$/,"");
output_string = "const unsigned char "
+ getIdentifier()
+ " [] PROGMEM = {"
@@ -850,7 +851,7 @@
if(image.glyph.length == 1) useGlyphs++;
});
output_string = output_string.substring(0, output_string.length - 3);
output_string = output_string.replace(/,\s*$/,"");
output_string = "const unsigned char "
+ getIdentifier()
+ "Bitmap"
@@ -877,7 +878,7 @@
String.fromCharCode(firstAschiiChar++)) + "'"
+ " }"
if(image != images.last()) code += ",";
code += " // '" + image.glyph + "'\n";
code += "// '" + image.glyph + "'\n";
offset += image.canvas.width;
});
code += "};\n";
@@ -896,15 +897,16 @@
+ "\n};\n"
break;
};
default: {
default: { // plain
images.each(function(image) {
code = imageToString(settings['drawMode'], image);
var comment = image.glyph ? (" // '" + image.glyph + "', " + image.canvas.width+"x"+image.canvas.height+"px\n") : "";
var comment = image.glyph ? ("// '" + image.glyph + "', " + image.canvas.width+"x"+image.canvas.height+"px\n") : "";
if(image.img != images.first().img) comment = "\n" + comment;
code = comment + code;
output_string += code;
});
output_string = output_string.substring(0, output_string.length - 2);
// Trim whitespace from end and remove trailing comma
output_string = output_string.replace(/,\s*$/gm,"");
}
}