Zeer beperkte aanpassing aan print.ts (functie uit een andere functie…

… gehaald, anders wil de online versie niet werken).
igoethal · Nov 1, 2024 · da0e401 · da0e401
1 parent 38f9ed7
commit da0e401
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/builddate.js b/builddate.js
@@ -1 +1 @@
-var CONF_builddate="20241101-151709"
+var CONF_builddate="20241101-152135"
diff --git a/eendraadschema.js b/eendraadschema.js
@@ -781,6 +781,19 @@ function dosvgdownload() {
     var filename = document.getElementById("dosvgname").value;
     download_by_blob(prtContent, filename, 'data:image/svg+xml;charset=utf-8'); //Was text/plain
 }
+function getPrintSVGWithoutAddress(outSVG, page) {
+    if (page === void 0) { page = structure.print_table.displaypage; }
+    var scale = 1;
+    var startx = structure.print_table.pages[page].start;
+    var width = structure.print_table.pages[page].stop - startx;
+    var starty = structure.print_table.getstarty();
+    var height = structure.print_table.getstopy() - starty;
+    var viewbox = '' + startx + ' ' + starty + ' ' + width + ' ' + height;
+    var outstr = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" transform="scale(1,1)" style="border:1px solid white" ' +
+        'height="' + (height * scale) + '" width="' + (width * scale) + '" viewBox="' + viewbox + '">' +
+        flattenSVGfromString(outSVG.data) + '</svg>';
+    return (outstr);
+}
 function printsvg() {
     function generatePdf() {
         if (typeof (structure.properties.dpi) == 'undefined')
@@ -791,19 +804,6 @@ function printsvg() {
         document.getElementById("progress_pdf") //HTML element where callback status can be given
         );
     }
-    function getPrintSVGWithoutAddress(outSVG, page) {
-        if (page === void 0) { page = structure.print_table.displaypage; }
-        var scale = 1;
-        var startx = structure.print_table.pages[page].start;
-        var width = structure.print_table.pages[page].stop - startx;
-        var starty = structure.print_table.getstarty();
-        var height = structure.print_table.getstopy() - starty;
-        var viewbox = '' + startx + ' ' + starty + ' ' + width + ' ' + height;
-        var outstr = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" transform="scale(1,1)" style="border:1px solid white" ' +
-            'height="' + (height * scale) + '" width="' + (width * scale) + '" viewBox="' + viewbox + '">' +
-            flattenSVGfromString(outSVG.data) + '</svg>';
-        return (outstr);
-    }
     function renderPrintSVG(outSVG) {
         document.getElementById("printarea").innerHTML = '<div id="printsvgarea">' +
             getPrintSVGWithoutAddress(outSVG) +

diff --git a/src/print/print.ts b/src/print/print.ts
@@ -9,6 +9,23 @@ function dosvgdownload() {
     download_by_blob(prtContent, filename, 'data:image/svg+xml;charset=utf-8'); //Was text/plain
 }
 
+function getPrintSVGWithoutAddress(outSVG: SVGelement, page:number = structure.print_table.displaypage) {
+    var scale = 1;
+
+    var startx = structure.print_table.pages[page].start;
+    var width = structure.print_table.pages[page].stop - startx;
+    var starty = structure.print_table.getstarty();
+    var height = structure.print_table.getstopy() - starty;
+
+    var viewbox = '' + startx + ' ' + starty + ' ' + width + ' ' + height;
+
+    var outstr = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" transform="scale(1,1)" style="border:1px solid white" ' +
+              'height="' + (height*scale) + '" width="' + (width*scale) + '" viewBox="' + viewbox + '">' +
+              flattenSVGfromString(outSVG.data) + '</svg>';
+
+    return(outstr);
+}
+
 function printsvg() {
 
     function generatePdf() {
@@ -27,23 +44,6 @@ function printsvg() {
         );
     }
 
-    function getPrintSVGWithoutAddress(outSVG: SVGelement, page:number = structure.print_table.displaypage) {
-        var scale = 1;
-
-        var startx = structure.print_table.pages[page].start;
-        var width = structure.print_table.pages[page].stop - startx;
-        var starty = structure.print_table.getstarty();
-        var height = structure.print_table.getstopy() - starty;
-
-        var viewbox = '' + startx + ' ' + starty + ' ' + width + ' ' + height;
-
-        var outstr = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" transform="scale(1,1)" style="border:1px solid white" ' +
-                  'height="' + (height*scale) + '" width="' + (width*scale) + '" viewBox="' + viewbox + '">' +
-                  flattenSVGfromString(outSVG.data) + '</svg>';
-
-        return(outstr);
-    }
-
     function renderPrintSVG(outSVG: SVGelement) {
         document.getElementById("printarea").innerHTML = '<div id="printsvgarea">' +
                                                             getPrintSVGWithoutAddress(outSVG) +