Subversion Repositories wimsdev

Compare Revisions

Ignore whitespace Rev 14948 → Rev 14949

/trunk/wims/src/Misc/canvasdraw/canvasmacro.c
35,7 → 35,7
container_div.addEventListener( 'mouseup' , mouseup, false);\
container_div.addEventListener( 'mousemove' , mousemove,false);\
container_div.addEventListener( 'mousedown' , mousedown,false);\
container_div.addEventListener('touchstart' , function(e) { e.preventDefault(); mousedown(e.changedTouches[0]);},false);\
container_div.addEventListener( 'touchstart' , function(e) { e.preventDefault(); mousedown(e.changedTouches[0]);},false);\
container_div.addEventListener( 'touchmove' , function(e) { e.preventDefault(); mousemove(e.changedTouches[0]);},false);\
container_div.addEventListener( 'touchend' , function(e) { e.preventDefault(); mouseup( e.changedTouches[0]);},false);\
 
56,10 → 56,10
var context_userdraw = canvas_userdraw.getContext(\"2d\");\
var multidraw_click_cnt = 0;\
if(wims_status != \"done\"){\
canvas_div.addEventListener('mousedown',user_draw,false);\
canvas_div.addEventListener('mousemove',user_drag,false);\
canvas_div.addEventListener('touchstart' , function(e) { e.preventDefault(); user_draw(e.changedTouches[0]);},false);\
canvas_div.addEventListener( 'touchmove' , function(e) { e.preventDefault(); user_drag(e.changedTouches[0]);},false);\
canvas_div.addEventListener('mousedown' , user_draw, false);\
canvas_div.addEventListener('mousemove' , user_drag, false);\
canvas_div.addEventListener('touchstart' , function(e) { e.preventDefault(); user_draw(e.changedTouches[0]);},false);\
canvas_div.addEventListener('touchmove' , function(e) { e.preventDefault(); user_drag(e.changedTouches[0]);},false);\
};\
clear_draw_area%d = function(type,name){\
switch(type){\
92,7 → 92,7
};\
};\
function user_draw(evt){\
if(evt.which == 3){clear_draw_area%d(userdraw_primitive,0);return;};\
if(evt.button == 2){clear_draw_area%d(userdraw_primitive,0);return;};\
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var x = mouse.x;\
var y = mouse.y;\
1287,7 → 1287,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
x0 = xy[0];y0 = xy[1];\
if(y0 < ysize + 1){\
if(evt.button == 0 || evt.identifier >= 0){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( click_cnt == 0 ){\
userdraw_x[xy_cnt] = x0;\
userdraw_y[xy_cnt] = y0;\
1364,7 → 1364,7
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
x0 = xy[0];y0 = xy[1];\
if(evt.button == 0 || evt.identifier >= 0){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
userdraw_x[xy_cnt] = x0;\
userdraw_y[xy_cnt] = y0;\
userdraw_radius[xy_cnt] = line_width;\
1406,7 → 1406,7
var x = xy[0];\
var y = xy[1];\
var num = %d;var inputs;\
if(evt.which == 1){\
if(evt.button == 0){\
var inputs;var xi;var yi;var wi;var hi;\
var found = 0;\
if( start_input_cnt < input_cnt){\
1486,7 → 1486,7
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];var y = xy[1];var x1,y1,x2,y2;\
if(evt.button == 0 || evt.identifier >= 0 ){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
userdraw_x[xy_cnt] = x;\
userdraw_y[xy_cnt] = y;\
x1 = x - crosshair_size;\
1564,7 → 1564,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
x0 = xy[0];\
y0 = xy[0];\
if( evt.button == 0 || evt.identifier >= 0 ){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if(clickcnt == 0 ){\
clickcnt = 1;\
userdraw_x[xy_cnt] = x0;userdraw_y[xy_cnt] = y0;xy_cnt++;\
1664,7 → 1664,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
x = xy[0];\
y = xy[1];\
if( evt.button == 0 || evt.identifier >= 0 ){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( num == -1 && xy_cnt > 2 ){\
if( x - marge < userdraw_x[0] && x + marge > userdraw_x[0]){\
if( y - marge < userdraw_y[0] && y + marge > userdraw_y[0]){\
1739,7 → 1739,7
x = xy[0];\
y = xy[1];\
var lu = userdraw_x.length;\
if( evt.button == 0 || evt.identifier >= 0 ){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
userdraw_x[lu] = x;userdraw_y[lu] = y;\
if( cnt == 0 ){\
user_drag(evt);\
1799,7 → 1799,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];\
var y = xy[1];\
if( evt.button == 0 || evt.identifier >= 0){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( lu%%2 == 0){\
x0 = x;y0 = y;\
if(num == 1){ userdraw_x = [];userdraw_y = [];userdraw_x[0] = x0;userdraw_y[0] = y0;} else {userdraw_x[lu] = x0;userdraw_y[lu] = y0;};\
1879,7 → 1879,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];\
var y = xy[1];\
if( evt.button == 0 || evt.identifier >= 0 ){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( lu%%2 == 0){\
x0 = x;y0 = y;\
if(num == 1){ userdraw_x = [];userdraw_y = [];userdraw_x[0] = x0;userdraw_y[0] = y0;} else {userdraw_x[lu] = x0;userdraw_y[lu] = y0;}\
1958,7 → 1958,7
var dashtype1 = %d;\
var x0,y0;\
function user_draw(evt){\
if( evt.button == 0 || evt.identifier >= 0){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];\
2003,7 → 2003,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];\
var y = xy[1];\
if( evt.button == 0 || evt.identifier >= 0 ){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( lu%%2 == 0){\
x0 = x;y0 = y;\
if(num == 1){ userdraw_x = [];userdraw_y = [];userdraw_x[0] = x0;userdraw_y[0] = y0;} else {userdraw_x[lu] = x0;userdraw_y[lu] = y0;}\
2090,7 → 2090,7
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];\
var y = xy[1];\
if( evt.button == 0 || evt.identifier >= 0 ){\
if( evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( lu%%2 == 0){\
x0 = x;y0 = y;\
if(num == 1){ userdraw_x = [];userdraw_y = [];userdraw_x[0] = x0;userdraw_y[0] = y0;} else {userdraw_x[lu] = x0;userdraw_y[lu] = y0;}\
2153,7 → 2153,7
xy_cnt = 0;\
var use_snap = %d;\
function user_draw(evt){\
if(evt.button == 0 || evt.identifier >= 0){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
if(1 == %d){if(xy_cnt == 3){xy_cnt = 0;userdraw_x = [];userdraw_y = [];context_userdraw.clearRect(0,0,xsize,ysize);};};\
2163,7 → 2163,7
return;\
};\
function user_drag(evt){\
if(evt.button == 0 || evt.identifier >= 0){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
context_userdraw.clearRect(0,0,xsize,ysize);\
2224,7 → 2224,7
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
var x = xy[0];var y = xy[1];\
if(evt.button == 0 || evt.identifier >= 0){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
if( click_cnt == 0 ){\
click_cnt = 1;\
user_drag(evt);\
2382,8 → 2382,8
};\
};\
function user_draw(evt){\
if( evt.which == 3 ){ remove_me(evt);return;};\
if( evt.which != 1 ){ return; };\
if( evt.button == 2 ){ remove_me(evt);return;};\
if( evt.button != 0 ){ return; };\
if(current_id != null){\
var centered = %d;\
var snap = %d;\
2539,7 → 2539,7
var num = %d;\
var x,xc,x1,x2,y,yc,y1,y2;var lu = userdraw_x.length;\
if( num == 1 && lu == 3 ){ userdraw_x = [];userdraw_y = [];userdraw_radius = [];};\
if(evt.button == 0 || evt.identifier >= 0 ){\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined' ){\
var mouse = dragstuff.getMouse(evt,canvas_userdraw);\
var xy = multisnap_check(mouse.x,mouse.y,use_snap);\
if(num == 1 && lu == 3){userdraw_x = [];userdraw_y = [];userdraw_radius = [];};\
2705,7 → 2705,7
var canvas_type = %d;\
var mouse_canvas = create_canvas%d(canvas_type,xsize,ysize);\
var mouse_context = mouse_canvas.getContext(\"2d\");\
mouse_canvas.addEventListener(\"mousemove\",show_coordinate%d,false);\
mouse_canvas.addEventListener(\"mousemove\", show_coordinate%d,false);\
mouse_canvas.addEventListener(\"touchmove\", function(e){ e.preventDefault();show_coordinate%d(e.changedTouches[0]);},false);\
var prec = Math.log(%d)/(Math.log(10));\
function show_coordinate%d(evt){\
2930,13 → 2930,13
slider_ctx.closePath();\
slider_ctx.fill();\
slider_ctx.stroke();\
slider_canvas.addEventListener(\"mousedown\" ,slider_on,false);\
slider_canvas.addEventListener(\"mouseup\" ,slider_off,false);\
slider_canvas.addEventListener(\"mouseout\" ,slider_off,false);\
slider_canvas.addEventListener(\"mousemove\" ,slide_me,false);\
slider_canvas.addEventListener(\"mousedown\" , slider_on, false);\
slider_canvas.addEventListener(\"mouseup\" , slider_off, false);\
slider_canvas.addEventListener(\"mouseout\" , slider_off, false);\
slider_canvas.addEventListener(\"mousemove\" , slide_me, false);\
slider_canvas.addEventListener(\"touchmove\" , function(e){ e.preventDefault();slide_me(e.changedTouches[0]);},false);\
slider_canvas.addEventListener(\"touchstart\", function(e){ e.preventDefault();slider_on(e.changedTouches[0]);},false);\
slider_canvas.addEventListener(\"touchend\" , function(e){ e.preventDefault(); slider_off(e.changedTouches[0]);},false);\
slider_canvas.addEventListener(\"touchend\" , function(e){ e.preventDefault();slider_off(e.changedTouches[0]);},false);\
var slider_is_active = false;\
function slider_on(evt){\
slider_is_active = true;\
2998,7 → 2998,7
 
/*
 
if(evt.button == 0 || evt.identifier >= 0){dx=0;dy=Math.PI/4;};\
if(evt.button == 0 || typeof(evt.identifier) != 'undefined'){dx=0;dy=Math.PI/4;};\
 
add xyslider
return value is array : value[0] is the actual x-value between value_1 and value_2, value[1] is y-value between value_1 and value_2
3043,9 → 3043,9
slider_ctx.closePath();\
slider_ctx.rect(0,0,slider_width,slider_height);\
slider_ctx.stroke();\
this.canvas.addEventListener(\"mousemove\",sliderdrag_%d,false);\
this.canvas.addEventListener(\"mousedown\",sliderclick_%d,false);\
this.canvas.addEventListener(\"touchmove\",function(e){ e.preventDefault();sliderdrag_%d(e.changedTouches[0]);},false);\
this.canvas.addEventListener(\"mousemove\", sliderdrag_%d,false);\
this.canvas.addEventListener(\"mousedown\", sliderclick_%d,false);\
this.canvas.addEventListener(\"touchmove\", function(e){ e.preventDefault();sliderdrag_%d(e.changedTouches[0]);},false);\
this.canvas.addEventListener(\"touchstart\", function(e){ e.preventDefault();sliderclick_%d(e.changedTouches[0]);},false);\
var canvas_rect = (slider_canvas).getBoundingClientRect();\
function sliderdrag_%d(evt){\
3098,7 → 3098,7
if( typeof(yaxislabel) !== 'undefined' ){label_y = yaxislabel;}\
calc_div.innerHTML=\"<br /><span style='font-style:italic;font-size:%dpx'>\"+label_x+\" : <input type='text' size='4' value='' id='calc_input_x' style='%s' />&nbsp;\"+ label_y+\" : <input type='text' size='5' value='' id='calc_output_y' style='%s' readonly /><input id='calc_button' type='button' value='OK' onclick='' style='color:red;background-color:lightblue;' /></span> \";\
var calc_button = document.getElementById(\"calc_button\");\
calc_button.addEventListener(\"mousedown\",show_it,false);\
calc_button.addEventListener(\"mousedown\", show_it,false);\
calc_button.addEventListener(\"touchstart\", function(e){ e.preventDefault();show_it(e.changedTouches[0]);},false);\
function show_it(){\
var x_value=document.getElementById(\"calc_input_x\").value;\
4423,7 → 4423,7
container_div.addEventListener( 'mouseup' , mouseup, false);\
container_div.addEventListener( 'mousemove' , mousemove,false);\
container_div.addEventListener( 'mousedown' , mousedown,false);\
container_div.addEventListener('touchstart' , function(e) { e.preventDefault(); mousedown(e.changedTouches[0]);},false);\
container_div.addEventListener( 'touchstart' , function(e) { e.preventDefault(); mousedown(e.changedTouches[0]);},false);\
container_div.addEventListener( 'touchmove' , function(e) { e.preventDefault(); mousemove(e.changedTouches[0]);},false);\
container_div.addEventListener( 'touchend' , function(e) { e.preventDefault(); mouseup( e.changedTouches[0]);},false);\
function mousedown(e){\