WebSVN – wimsdev – Diff – /trunk/wims/src/Misc/canvasdraw/canvasmultidraw.c

   else
+  {
    fprintf(js_include_file,"userdraw_primitive = %d;",u);
+  }
   break;
+  /*
-  /* images : identical ! to userdraw images,bogus_color */
+  images : identical ! to userdraw images,bogus_color
+/1/2021 : corrected long standing flaw regarding "centered" on external stuff
+  tested: bitmap,svg,TeX [tested KaTeX]
+  */
   case 20:
-  fprintf(js_include_file,"var current_id = null;var external_div_cnt=0;function image_adjust(image,x,y){\
+  fprintf(js_include_file,"var current_id = null;var external_div_cnt=0;\
+  function image_adjust(image,x,y){\
    var centered = %d;\
    var w = parseInt(image.width);var h = parseInt(image.height);\
+   if(w == 0 || h == 0 ){\
+    w = parseInt(window.getComputedStyle(image).width);\
+    h = parseInt(window.getComputedStyle(image).height);\
+   };\
    switch(centered){\
     case 0: return [x,y];break;\
     case 1: return [x,parseInt(y-0.5*h)];break;\
     case 2: return [parseInt(x+0.5*h),y];break;\
     case 3: return [parseInt(x+0.5*h),parseInt(y-0.5*h)];break;\
     case 4: return [parseInt(x-0.5*w),parseInt(y-0.5*h)];break;\
     default: return [x,y];break;\
    };\
+  };\
-  };place_image_on_canvas = function(id){\
+  place_image_on_canvas = function(id){\
    var thing = document.getElementById(id);\
    var tag = thing.tagName;\
    if(tag == 'SVG'){draw_mathml_svg(thing,id);return;};\
    if(tag == 'DIV' || tag == 'SPAN' || tag == 'P' || tag == 'TD' || tag == 'TH'){draw_mathml_div(thing,id);return;};\
    var src = thing.src;\
    image.id = 'placed_'+id;\
    image.width = thing.width;\
    image.height = thing.height;\
    image.onload = function(){ current_id = id; };\
    return;\
+  };\
-  };function draw_mathml_div(thing,id){\
+  function draw_mathml_div(thing,id){\
    var fix_div = document.createElement('DIV');\
    var new_id='placed_'+external_div_cnt+'_'+id;\
    fix_div.setAttribute('id',new_id);\
    var w = parseInt(thing.clientWidth);\
    var h = parseInt(thing.clientHeight);\
    fix_div.innerHTML = thing.innerHTML;\
    fix_div.setAttribute('style','display:none;position;absolute;width:'+w+'px;height:'+h+'px');\
    fix_div.width = w;fix_div.height = h;\
    canvas_div.appendChild(fix_div);\
    current_id = new_id;\
    external_div_cnt++;\
    return;\
+  };\
-  };function draw_mathml_svg(thing,id){\
+  function draw_mathml_svg(thing,id){\
    var fix_div = document.createElement('DIV');\
    fix_div.setAttribute('style','display:none;position;relative');\
    canvas_div.appendChild(fix_div);\
    var image = new Image();\
    var svg_string = new XMLSerializer().serializeToString(thing);\
    image.src= url;\
    image.id = 'placed_'+id;\
    image.onload = function(){\
     current_id = image.id;\
     fix_div.innerHTML='<img src='+image.src+' id='+image.id+' alt=\"this should not happen today...!\"/>';\
    };\
    return;\
+  };\
-  };function images(x,y,event_which,num){\
+  function images(x,y,event_which,num){\
    if(event_which == 1){ return;};\
    if(num == 1 && current_id){\
     var xy = multi_snap_check(x,y,images_snap);\
     images_x.push(xy[0]);\
     images_y.push(xy[1]);\
     images_id.push(current_id);\
     current_id = null;\
    };\
    draw_images();\
+  };\
-  };function draw_images(){\
+  function draw_images(){\
-   context_images.clearRect(0,0,xsize,ysize);\
    var xy;var img;var tag;\
+   for(var i=0; i<2;i++){\
-   for(var p = 0 ; p < images_x.length; p++){\
+    for(var p = 0 ; p < images_x.length; p++){\
-    if( images_id[p] ){\
+     if( images_id[p] ){\
-     img = document.getElementById(images_id[p]);\
+      img = document.getElementById(images_id[p]);\
-     tag = img.tagName;\
+      tag = img.tagName;\
-     xy = image_adjust(img,images_x[p],images_y[p]);\
+      xy = image_adjust(img,images_x[p],images_y[p]);\
-     if( tag != 'IMG' ){\
+      if( tag != 'IMG' ){\
-       img.setAttribute('style','display:inline-block;position:absolute;top:'+xy[1]+'px;left:'+xy[0]+'px;');\
+       img.setAttribute('style','display:block;position:absolute;top:'+xy[1]+'px;left:'+xy[0]+'px;');\
-     }else{\
+      }else{\
-      context_images.drawImage(img,xy[0],xy[1],img.width,img.height);\
+       context_images.drawImage(img,xy[0],xy[1],img.width,img.height);\
+      };\
      };\
     };\
    };\
+  };\
-  };var canvas_images = create_canvas%d(10%d,xsize,ysize);\
+  var canvas_images = create_canvas%d(10%d,xsize,ysize);\
   var context_images = canvas_images.getContext(\"2d\");\
   context_images.font = multifont_family;\
   context_images.fillStyle = \"rgba(\"+multifont_color+\",\"+multistrokeopacity[%d]+\")\";\
   var images_snap = multisnaptogrid[%d];\
   var images_x = new Array();var images_y = new Array();\
    u,i,canvas_root_id,u,i,canvas_root_id,u);
 */

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasmultidraw.c – Rev 15663 → 15665