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

          @will animate a point on the next plot/curve command
          @the curve will not be draw
          @moves repeatedly from xmin to xmax
         */
             if( strstr(get_string(infile,1),"point") != 0 ){animation_type = 15;}else{canvas_error("the only animation type (for now) is \"point\"...");}
+            break;
+        case LEVELCURVE:
+        /*
+        @levelcurve color,expression in x/y,l1,l2,...
+        @Draws (pixel) level curves for expression, with levels l1, l2,...
+        @Take care : the arrays for holding the javascript data are limited in size !!
+        */
+            stroke_color = get_color(infile,0);
+            char *fun1 = get_string_argument(infile,0);
+            if( strlen(fun1) == 0 ){canvas_error("function is NOT OK !");}
+            i = 0;
+            done = FALSE;
+            while( !done ){
+             double_data[i] = get_real(infile,1);
+             i++;
+            }
+            for(c = 0 ; c < i; c++){
+             fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,16,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,eval_levelcurve(xsize,ysize,fun1,xmin,xmax,ymin,ymax,plot_steps,precision,double_data[c]),line_width,line_width,line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
+             click_cnt++;
+            }
+            reset();
             break;
         case CURVE:
         /*
          @curve color,formula(x)
          @plot color,formula(x)
                 use_parametric = FALSE;
                 stroke_color = get_color(infile,0);
                 char *fun1 = get_string_argument(infile,0);
                 char *fun2 = get_string_argument(infile,1);
                 if( strlen(fun1) == 0 || strlen(fun2) == 0 ){canvas_error("parametric functions are NOT OK !");}
-                use_parametric = FALSE;
                 fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,%d,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,animation_type,eval_parametric(xsize,ysize,fun1,fun2,xmin,xmax,ymin,ymax,tmin,tmax,plot_steps,precision),2*line_width,2*line_width,line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                 click_cnt++;
+            }
             else
+            {
                 char *fun1 = get_string_argument(infile,1);
                 if( strlen(fun1) == 0 ){canvas_error("function is NOT OK !");}
                 fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,%d,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,animation_type,eval(xsize,ysize,fun1,xmin,xmax,ymin,ymax,plot_steps,precision),line_width,line_width,line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                 click_cnt++;
+            }
-            animation_type = 9;/* rest to curve plotting without animation */
+            animation_type = 9;/* reset to curve plotting without animation */
             reset();
             break;
         case FLY_TEXT:
         /*
         @ text fontcolor,x,y,font,text_string
 answers may have:
 x-values,y-values,r-values,input-fields,mathml-inputfields,text-typed answers
 */
     case 1: fprintf(js_include_file,"\
 \n<!-- begin function 1 read_canvas() -->\n\
 function read_canvas(){\
  if( userdraw_x.length == 0){alert(\"nothing drawn...\");return;}\
  if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return userdraw_x+\"\\n\"+userdraw_y+\"\\n\"+input_reply + \"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return userdraw_x+\"\\n\"+userdraw_y+\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return userdraw_x+\"\\n\"+userdraw_y+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return userdraw_x+\"\\n\"+userdraw_y;\
   }\
  };\
 };\
 this.read_canvas = read_canvas;\n\
 <!-- end function 1 read_canvas() -->");
     break;
     case 2: fprintf(js_include_file,"\
 \n<!-- begin function 2 read_canvas() -->\n\
 function read_canvas(){\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply_x+\"\\n\"+reply_y+\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply_x+\"\\n\"+reply_y+\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
     break;
     case 3: fprintf(js_include_file,"\
 \n<!-- begin function 3 read_canvas() -->\n\
 function read_canvas(){\
  if( userdraw_x.length == 0){alert(\"nothing drawn...\");return;}\
  if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
         attention: we reset userdraw_x / userdraw_y  : because  userdraw_x = [][] userdraw_y = [][]
         used for userdraw multiple paths
     */
     case 5: fprintf(js_include_file,"\
 \n<!-- begin function 5 read_canvas() -->\n\
 function read_canvas(){\
  var p = 0;\
  var reply = \"\";\
  for(p = 0; p < userdraw_x.length;p++){\
   if(userdraw_x[p] != null ){\
    reply = reply + userdraw_x[p]+\"\\n\"+userdraw_y[p]+\"\\n\";\
   };\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  userdraw_x = [];userdraw_y = [];\
  if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
    reply = reply + tmp_x + \"\\n\" + tmp_y +\"\\n\";\
   };\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  userdraw_x = [];userdraw_y = [];\
  if( document.getElementById(\"canvas_input0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
   }\
  };\
 };\
 this.read_canvas = read_canvas;\n\
 <!-- end function 6 read_canvas() -->");
     break;
     case 7: fprintf(js_include_file,"\
 \n<!-- begin function 7 read_canvas() -->\n\
 function read_canvas(){\
  var reply = new Array();\
  var p = 0;\
    return reply+\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply+\"\\n\"+input_reply;\
   }\
  };\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply+\"\\n\"+userdraw_text;\
 function read_canvas(){\
  var reply = new Array();\
  var p = 0;\
  while(userdraw_x[p]){\
   reply[p] = px2x(userdraw_x[p]) +\":\" + px2y(userdraw_y[p]);\
   p++;\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply;\
   }\
  };\
 };\
 this.read_canvas = read_canvas;\n\
 <!-- end function 8 read_canvas() -->");
     break;
     case 9: fprintf(js_include_file,"\
 \n<!-- begin function 9 read_canvas() -->\n\
 function read_canvas(){\
  var reply = new Array();\
  var p = 0;\
 this.read_canvas = read_canvas;\n\
 <!-- end function 9 read_canvas() -->");
     break;
     case 10: fprintf(js_include_file,"\
 \n<!-- begin function 10 read_canvas() -->\n\
 function read_canvas(){\
  var reply = new Array();\
  var p = 0;\
  while(userdraw_x[p]){\
   reply[p] = px2x(userdraw_x[p]) +\":\" + px2y(userdraw_y[p]) +\":\" + userdraw_radius[p];\
   p++;\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  if( document.getElementById(\"canvas_input0\") ){\
-  var p = 0;var input_reply = new Array();\
-  if( document.getElementById(\"canvas_input0\")){\
-   var t = 0;\
-   while(document.getElementById(\"canvas_input\"+t)){\
-    if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
-     input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
-     p++;\
-    };\
-    t++;\
-   };\
-  };\
-  if( typeof userdraw_text != 'undefined' ){\
-   return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
-  }\
-  else\
-  {\
-   return reply +\"\\n\"+input_reply;\
-  }\
- }\
- else\
- {\
-  if( typeof userdraw_text != 'undefined' ){\
-   return reply +\"\\n\"+userdraw_text;\
-  }\
-  else\
-  {\
-   return reply;\
-  }\
- };\
-};\
-this.read_canvas = read_canvas;\n\
-<!-- end function 10 read_canvas() -->");
-    break;
-    case 11: fprintf(js_include_file,"\
-\n<!-- begin function 11 read_canvas() -->\n\
-function read_canvas(){\
- var reply = \"\";\
- var p = 0;\
- while(userdraw_x[p]){\
-  reply = reply + px2x(userdraw_x[p]) +\",\" + px2y(userdraw_y[p]) +\",\" + px2x(userdraw_x[p+1]) +\",\" + px2y(userdraw_y[p+1]) +\"\\n\" ;\
-  p = p+2;\
- };\
- if(p == 0){alert(\"nothing drawn...\");return;};\
- if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
+  }\
+ }\
+ else\
+ {\
+  if( typeof userdraw_text != 'undefined' ){\
+   return reply +\"\\n\"+userdraw_text;\
+  }\
+  else\
+  {\
+   return reply;\
+  }\
+ };\
+};\
+this.read_canvas = read_canvas;\n\
+<!-- end function 10 read_canvas() -->");
+    break;
+    case 11: fprintf(js_include_file,"\
+\n<!-- begin function 11 read_canvas() -->\n\
+function read_canvas(){\
+ var reply = \"\";\
+ var p = 0;\
+ while(userdraw_x[p]){\
+  reply = reply + px2x(userdraw_x[p]) +\",\" + px2y(userdraw_y[p]) +\",\" + px2x(userdraw_x[p+1]) +\",\" + px2y(userdraw_y[p+1]) +\"\\n\" ;\
+  p = p+2;\
+ };\
+ if(p == 0){alert(\"nothing drawn...\");return;};\
+ if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
+  var p = 0;var input_reply = new Array();\
+  if( document.getElementById(\"canvas_input0\")){\
+   var t = 0;\
+   while(document.getElementById(\"canvas_input\"+t)){\
+    if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
+     input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
+     p++;\
+    };\
+    t++;\
+   };\
+  };\
+  if( typeof userdraw_text != 'undefined' ){\
+   return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
+  }\
+  else\
+  {\
+   return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text;\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text\
   }\
   else\
   {\
    return reply;\
   }\
  };\
 function read_canvas(){\
  var reply = new Array();\
  var p = 0;var i = 0;\
  while(userdraw_x[p]){\
   reply[i] = px2x(userdraw_x[p]) +\":\" + px2y(userdraw_y[p]) +\":\" + px2x(userdraw_x[p+1]) +\":\" + px2y(userdraw_y[p+1]);\
   p = p+2;i++;\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  if( document.getElementById(\"canvas_input0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text\
   }\
   else\
   {\
    return reply;\
   }\
  };\
 };\
 this.read_canvas = read_canvas;\n\
 <!-- end function 13 read_canvas() -->");
     break;
     case 14: fprintf(js_include_file,"\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply;\
   }\
  };\
    t++;\
   };\
  };\
  if( typeof userdraw_text != 'undefined' ){\
    return input_reply +\"\\n\"+userdraw_text;\
  }\
  else\
  {\
   return input_reply;\
  };\
 };\
  this.read_canvas = read_canvas;\n\
 <!-- end function 15 read_canvas() -->");
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply;\
   }\
  };\
 };\
 this.read_canvas = read_canvas;\n\
 <!-- end function 22 read_canvas() -->");
     break;
     break;
     case DRAW_DIAMONDFILL:/* not used for userdraw */
 fprintf(js_include_file,"\n<!-- draw hatch fill -->\n\
 draw_diamondfill = function(canvas_type,x0,y0,dx,dy,linewidth,stroke_color,stroke_opacity,xsize,ysize){\
   var obj;\
  if( document.getElementById(\"wims_canvas%d\"+canvas_type) ){\
   obj = document.getElementById(\"wims_canvas%d\"+canvas_type);\
  }\
  else\
  {\
   obj = create_canvas%d(canvas_type,xsize,ysize);\
  };\
  var ctx = obj.getContext(\"2d\");\
  var x;\
  var y;\
  ctx.save();\
  ctx.lineWidth = linewidth;\
  ctx.strokeStyle=\"rgba(\"+stroke_color+\",\"+stroke_opacity+\")\";\
  y = ysize;\
  for( x = x0 ; x < xsize ; x = x + dx ){\
   ctx.moveTo(x,y0);\
   ctx.lineTo(xsize,y);\
   y = y - dy;\
  };\
  y = y0;\
  for( x = xsize ; x > 0 ; x = x - dx){\
  y = ysize;\
  for( x = x0 ; x < xsize ; x = x + dx ){\
   ctx.moveTo(x,y0);\
   ctx.lineTo(xsize,y);\
   y = y - dy;\
  };\
  y = y0;\
  for( x = xsize ; x >= dx ; x = x - dx){\
   ctx.moveTo(x,ysize);\
   ctx.lineTo(x0,y);\
   y = y + dy;\
  };",canvas_root_id,canvas_root_id,canvas_root_id);
     break;
     case DRAW_CIRCLES:/*  used for userdraw */
 fprintf(js_include_file,"\n<!-- draw circles -->\n\
 draw_circles = function(ctx,x_points,y_points,radius,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype0,dashtype1,use_rotate,angle,use_translate,vector){\
  ctx.save();\
  if(use_translate == 1 ){ctx.translate(vector[0],vector[1]);}\
  if(use_rotate == 1 ){ctx.rotate(angle*Math.PI/180);}\
  ctx.lineWidth = line_width;\
  for(var p = 0 ; p < x_points.length ; p++ ){\
   ctx.beginPath();\
   ctx.arc(x_points[p],y_points[p],radius[p],0,2*Math.PI,false);\
   ctx.closePath();\
   if(use_dashed == 1){if(ctx.setLineDash){ctx.setLineDash([dashtype0,dashtype1]);}else{ctx.mozDash = [dashtype0,dashtype1];};};\
   if(use_filled == 1){ctx.fillStyle = \"rgba(\"+fill_color+\",\"+fill_opacity+\")\";ctx.fill();}\
   ctx.strokeStyle=\"rgba(\"+stroke_color+\",\"+stroke_opacity+\")\";\
   ctx.stroke();\
  }\
  ctx.restore();\
  return;\
 };");
     break;
     case DRAW_POLYLINE:/* user for userdraw : draw lines through points */
 fprintf(js_include_file,"\n<!-- draw polyline -->\n\
 draw_polyline = function(ctx,x_points,y_points,line_width,stroke_color,stroke_opacity,use_dashed,dashtype0,dashtype1,use_rotate,angle,use_translate,vector){\
  ctx.save();\
  if(use_translate == 1 ){ctx.translate(vector[0],vector[1]);}\
  if(use_rotate == 1 ){ctx.rotate(angle*Math.PI/180);}\
  ctx.lineWidth = line_width;\
  ctx.strokeStyle=\"rgba(\"+stroke_color+\",\"+stroke_opacity+\")\";\
  if(use_dashed == 1){if(ctx.setLineDash){ctx.setLineDash([dashtype0,dashtype1]);}else{ctx.mozDash = [dashtype0,dashtype1];};};\
  ctx.clearRect(0,0,xsize,ysize);\
  ctx.beginPath();\
  for(var p = 0 ; p < x_points.length-1 ; p++ ){\
   ctx.moveTo(x_points[p],y_points[p]);\
   ctx.closePath();ctx.fill();ctx.stroke();\
  };\
  ctx.restore();\
  return;\
 };");
     break;
     case DRAW_SEGMENTS:/*  used for userdraw */
 fprintf(js_include_file,"\n<!-- draw segments -->\n\
 draw_segments = function(ctx,x_points,y_points,line_width,stroke_color,stroke_opacity,use_dashed,dashtype0,dashtype1,use_rotate,angle,use_translate,vector){\
  ctx.save();\
  return [0,Y1,xsize,Y2];\
 };\
 draw_lines = function(ctx,x_points,y_points,line_width,stroke_color,stroke_opacity,use_dashed,dashtype0,dashtype1,use_rotate,angle,use_translate,vector){\
  ctx.save();\
  var line = new Array(4);\
  if(use_translate == 1 ){ctx.translate(vector[0],vector[1]);}\
  if(use_rotate == 1 ){ctx.rotate(angle*Math.PI/180);}\
  ctx.lineWidth = line_width;\
  ctx.strokeStyle=\"rgba(\"+stroke_color+\",\"+stroke_opacity+\")\";\
  if(use_dashed == 1){if(ctx.setLineDash){ctx.setLineDash([dashtype0,dashtype1]);}else{ctx.mozDash = [dashtype0,dashtype1];};};\
  for(var p = 0 ; p < x_points.length ; p = p+2 ){\
   line = calc_line(x_points[p],x_points[p+1],y_points[p],y_points[p+1]);\
   ctx.beginPath();\
   ctx.moveTo(line[0],line[1]);\
       corr = 0.5*(ctx.measureText(xtxt).width);\n\
       ctx.fillText(xtxt,x_e - corr,ysize - 4);\n\
     };\n\
    }else{\
     ctx.lineWidth = 0.2*line_width;\n\n\
     ctx.strokeStyle=\"rgba(\"+minor_color+\",\"+minor_opacity+\")\";\n\
    };\n\
    if( x_e >= xmarge ){\
     ctx.beginPath();\n\
     ctx.moveTo(x_e,0);\n\
     ctx.lineTo(x_e,ysize - ymarge);\n\n\
     ctx.stroke();\n\
     ctx.closePath();\n\
    };\
   };\n\
  };\n\
  for(var p = y_min; p <= y_max ; p++){\n\
   num = Math.pow(ylogbase,p);\n\
   for(var i = 1 ; i < ylogbase ; i++){\n\
   ctx.save();\n\
   ctx.fillStyle=\"rgba(255,215,0,0.2)\";\n\
   ctx.rect(0,0,xmarge,ysize);\n\
   ctx.rect(0,ysize-ymarge,xsize,ysize);\n\
   ctx.fill();\n\
   ctx.restore();\n\
  }else{xmarge = 0;ymarge = 0;};\n\
  if( typeof xaxislabel !== 'undefined' ){\
   ctx.save();\n\
   ctx.font = \"italic \"+font_size+\"px Ariel\";\n\
   ctx.fillStyle = \"rgba(\"+font_color+\",\"+major_opacity+\")\";\n\
         *tsteps="tsteps",
         *curve="curve",
         *dcurve="dcurve",
         *plot="plot",
         *dplot="dplot",
+        *levelcurve="levelcurve",
         *fontsize="fontsize",
         *fontcolor="fontcolor",
         *axis="axis",
         *axisnumbering="axisnumbering",
         *axisnumbers="axisnumbers",
         if( strcmp(input_type, curve) == 0 ){
         free(input_type);
         return CURVE;
+        }
         if( strcmp(input_type, dcurve) == 0 ){
+        use_dashed = TRUE;
         free(input_type);
         return CURVE;
         }
         if( strcmp(input_type, plot) == 0 ){
         free(input_type);
+        return CURVE;
+        }
+        if( strcmp(input_type, dplot) == 0 ){
+        use_dashed = TRUE;
+        free(input_type);
         return CURVE;
+        }
-        if( strcmp(input_type, dplot) == 0 ){
+        if( strcmp(input_type, levelcurve) == 0 ){
         free(input_type);
-        return CURVE;
+        return LEVELCURVE;
+        }
         if( strcmp(input_type, plotsteps) == 0 ){
         free(input_type);
         return PLOTSTEPS;
+        }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 7786 → 7788