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

  this.use_filled = use_filled || 0;\
  this.use_dashed = use_dashed || 0;\
  this.dashtype0 = dashtype0 || 4;\
  this.dashtype1 = dashtype1 || 4;\
  this.use_offset = use_offset || 0;\
+ this.clicked = 0;\
  if( this.onclick == 2 && this.use_slider != -1){this.onclick = 5;};\
  dragdrop_reply[object_cnt] = {object_cnt:this.object_cnt,type:onclick,x:this.x[0],y:this.y[0],r:this.w[0],angle:this.angle,clicked:0};\
  };");
 // dragdrop_reply[object_cnt] = {object_cnt:this.object_cnt,type:onclick,x:this.x[0],y:this.y[0],r:this.w[0],angle:this.angle,clicked:0};
   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( '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){if( wims_status == \"done\"){return null;};var mouse = getMouse(e,canvas);var mx = mouse.x;var my = mouse.y;var shapes = myState.shapes;var l = shapes.length;var chk = -1;for(var i=0;i<l;i++){chk = shapes[i].contains(mx, my);if ( chk != -1 ){if( myState.shapes[i].use_slider[0] != -1 ){if( slidergroup[shapes[i].object_cnt] == null ){slidergroup[shapes[i].object_cnt] = shapes[i];}else{slidergroup[shapes[i].object_cnt] = null;};};myState.chk = chk;myState.selection = shapes[i];myState.valid = false;switch(shapes[i].onclick){case 0:myState.dragging = false;break;case 1:if( dragdrop_reply[myState.selection.object_cnt].clicked != 1 ){myState.selection.line_width = 2*myState.selection.org_line_width;myState.selection.font_family = parseInt(myState.selection.font_size+10)+\"px Courier\";dragdrop_reply[myState.selection.object_cnt].clicked = 1;}else{dragdrop_reply[myState.selection.object_cnt].clicked = 0;myState.selection.font_family = myState.selection.org_font_family;myState.selection.line_width = myState.selection.org_line_width;};myState.dragging = false;myState.draw();myState.selection = null;break;\
+  function mousedown(e){if( wims_status == \"done\"){return null;};var mouse = getMouse(e,canvas);var mx = mouse.x;var my = mouse.y;var shapes = myState.shapes;var l = shapes.length;var chk = -1;for(var i=0;i<l;i++){chk = shapes[i].contains(mx, my);if ( chk != -1 ){if( myState.shapes[i].use_slider[0] != -1 ){if( slidergroup[shapes[i].object_cnt] == null ){slidergroup[shapes[i].object_cnt] = shapes[i];}else{slidergroup[shapes[i].object_cnt] = null;};};myState.chk = chk;myState.selection = shapes[i];myState.valid = false;switch(shapes[i].onclick){case 0:myState.dragging = false;break;case 1:if( dragdrop_reply[myState.selection.object_cnt].clicked != 1 ){myState.selection.line_width = 2*myState.selection.org_line_width;myState.selection.clicked = 1;myState.selection.font_family = parseInt(myState.selection.font_size+10)+\"px Courier\";dragdrop_reply[myState.selection.object_cnt].clicked = 1;}else{dragdrop_reply[myState.selection.object_cnt].clicked = 0;myState.selection.clicked = 0;myState.selection.font_family = myState.selection.org_font_family;myState.selection.line_width = myState.selection.org_line_width;};myState.dragging = false;myState.draw();myState.selection = null;break;\
   case 2: myState.dragging = true;break;\
   case 3: break;\
   case 4: break;\
   case 5: myState.dragging = true;break;\
   default:break;};myState.valid = true;return;};};myState.valid = true;return;};\
  dragdrop + onclick for 'dragstuff', command 'copy' and external 'xml/mathml/javascript objects'
  only the FIRST x,y value-pair is used for the reply !!
  */
   if(reply_format == 100){/* this reply is raw javascript giving ALL object/properties */
    fprintf(js_include_file,"\n/* add reply stuff  */\
-   CanvasState.prototype.read_dragdrop = function(){\
+   CanvasState.prototype.read_dragdrop = function(props){\
     if( wims_status == 'done' || use_dragdrop_reply == -1 ){return null;};\
+    if( typeof(props) !== 'object' ){var props = ['clicked','text','angle'];};\
+    var s = props.length;\
     var obj = dragstuff.shapes;\
     var total = '';var rep = '';\
+    for(var pr = 0 ; pr < s ; pr++){\
+     var prop = props[pr];\
-    Object.getOwnPropertyNames(obj).forEach(\
+     Object.getOwnPropertyNames(obj).forEach(\
-     function(val, idx, array){ var tmp = obj[val];\
+      function(val, idx, array){ var tmp = obj[val];\
-      Object.getOwnPropertyNames(tmp).forEach(\
+       Object.getOwnPropertyNames(tmp).forEach(\
-       function(val, idx, array){\
+        function(val, idx, array){\
-        rep = rep+':'+val+'='+tmp[val]+'\\t';\
+         if(val == prop){rep = rep+':'+val+'='+tmp[val]+'\\t';}\
-       }\
+        }\
-      )\
+       );\
-      total = total+tmp['object_cnt']+rep+'\\n';rep='';\
+       total = total+tmp['object_cnt']+rep+'\\n';rep='';\
-     }\
+      }\
-    );\
+     );\
+    };\
     return total;\
    };read_dragdrop%d = dragstuff.read_dragdrop;",canvas_root_id);
   }else{
    fprintf(js_include_file,"\n/* add reply stuff  */\
    function set_precision(val){val = (Math.round(dragdrop_precision*val))/dragdrop_precision;if(Number.isNaN(val) ){return 'NaN';}else{return val;};};\

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdragstuff.c – Rev 16700 → 16718