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

   font_size = 12;/* this may lead to problems when using something like <code>fontfamily Italic 24px Arial</code> the ''fontsize`` value is not substituted into fontfamily !! */
   int fly_font_size = 12; /*fly_font_size is relative to this... */
   for(i=0;i<MAX_JS_FUNCTIONS;i++){js_function[i]=0;}
   int arrow_head = 8; /* size in px needed for arrow based  userdraw:  "userdraw arrow,color" */
   int crosshair_size = 5; /* size in px*/
+  int level_step = 1; /* resolution in pixels of level curves */
   int plot_steps = 250;/* the js-arrays with x_data_points and y_data_points will have size 250 each: use with care !!! use jscurve when precise plots are required  */
   int found_size_command = 0; /* 1 = found size ; 2 = found xrange; 3 = found yrange: just to flag an error message */
   int object_cnt = 0; /*counter to identify the "onclick" ojects ; 0 is first object set onclick: reply[object_cnt]=1 when clicked ; otherwise reply[object_cnt]=0 ; object_cnt is only increased when another object is set  again */
   int clock_cnt = 0; /* counts the amount of clocks used -> unique object clock%d */
   int boxplot_cnt = 0;
   @ any color (object) in the <a href="#canvastype">canvastype</a> will act as border to the bucket fill
   @ use this command after all boundary objects are declared.
   @ Use command 'userdraw clickfill,color' for user click driven flood fill.
   @ use command <a href="#canvastype">canvastype </a> to fill another canvas (default should be fine: DRAG_CANVAS = 5)
   @ note: the fill-family of commands are very (client) cpu intensive operations!<br>filling is done pixel by pixel e.g. image size of 400x400 uses 160000 pixels: each pixel contains 4 data (R,G,B,Opacity) = 640000 data.<br>on every data a few operations / comparisons are done...<br>So have pity on your students CPU..
-  @%fillall%size 400,400%xrange -10,10%yrange -10,10%linewidth 2%vlines black,-5,0,-5,0,-4,0,-4,0,3,0,3,0%hlines black,-5,0,-5,0,-5,4,-5,4,-5,-2,-5,-2%circles green,0,0,2,3,3,5,-5,-5,3%opacity 240,50%fillall blue,1,1,8,8,-8,-8
+  @%fillall%size 400,400%xrange -10,10%yrange -10,10%linewidth 2%vlines black,-5,0,-4,0,3,0,hlines black,-5,0,-5,4,-5,-2,%circles green,0,0,2,3,3,5,-5,-5,3%opacity 240,50%fillall blue,1,1,8,8,-8,-8
   */
           decimals = find_number_of_digits(precision);
           fill_color=get_color(infile,0); /* how nice: now the color comes first...*/
           i=0;
           if(js_function[DRAW_FILLTOBORDER] != 1 ){/* use only once */
   @ linewidth int
   @ default 1
   @%linewidth%size 400,400%xrange -10,10%yrange -10,10%linewidth 1%line -5,-5,-5,5,red%linewidth 2%line -4,-5,-4,5,green%linewidth 3%line -3,-5,-3,5,blue%linewidth 4%line -2,-5,-2,5,orange%linewidth 1%line -1,-5,-1,5,brown%linewidth 5%line 1,-5,1,5,cyan%linewidth 6%line 3,-5,3,5,purple%linewidth 7%line 5,-5,5,5,black
   */
           line_width = (int) (get_real(infile,1));
+          break;
+        case LEVELSTEP:
+          level_step = (int) (get_real(infile,1));
+          if (level_step < 1) level_step=1;
+          if (level_step > 16) level_step=16;
           break;
         case LEVELCURVE:
   /*
   @ levelcurve color,expression in x/y,l1,l2,...
   @ draws very primitive level curves for expression, with levels l1,l2,l3,...,l_n
             i++;
+          }
           if( use_slider != -1 && onclick == 0){ onclick = 3; }/* no drag&onclick but slideable */
           for(c = 0 ; c < i; c++){
             tmp_buffer=my_newmem(MAX_BUFFER);
-            check_string_length(snprintf(tmp_buffer,MAX_BUFFER, "dragstuff.addShape(new Shape(%d,%d,%d,%d,16,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%s,%s,%d));\n",drag_type,object_cnt,onclick,use_snap,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,my_sliders,rotation_center,use_offset));
+            check_string_length(snprintf(tmp_buffer,MAX_BUFFER, "dragstuff.addShape(new Shape(%d,%d,%d,%d,16,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%s,%s,%d));\n",drag_type,object_cnt,onclick,use_snap,eval_levelcurve(xsize,ysize,fun1,xmin,xmax,ymin,ymax,level_step,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,my_sliders,rotation_center,use_offset));
             add_to_buffer(tmp_buffer);
             if(onclick != 0){object_cnt++;}
            /* object_cnt++; */
+          }
           dragstuff[16] = 1;
           reset();
           break;
         case PLOTSTEPS:
       /*
   @ plotsteps a_number
-  @ default 150
+  @ default 250
-  @ only used for commands <a href="#curve">curve / plot</a> and <a href="#levelcurve">levelcurve</a>
+  @ only used for commands <a href="#curve">curve / plot</a>
   @ use with care !
       */
           plot_steps = (int) (get_real(infile,1));
           break;
         case POINT:
   return double_xy2js_array(xydata,i,find_number_of_digits(precision));
+}
 static int filtre (int a, int b, int c, int d){
   return ((a>0)||(b>0)||(c>0)||(d>0))&&((a<0)||(b<0)||(c<0)||(d<0));
+}
-/* plot a very primitive (!) levelcurve : not to be compared with "flydraw levelcurve"
+/* plot a levelcurve
-  modified 04/07/2025 bernardi
+  modified 08/2025 bernardi */
-  pts for plotsteps*/
-char *eval_levelcurve(int xsize,int ysize,char *fun,double xmin,double xmax,double ymin,double ymax,int pts,int precision,double level){
+char *eval_levelcurve(int xsize,int ysize,char *fun,double xmin,double xmax,double ymin,double ymax,int levelstep,int precision,double level){
   void *f = eval_create(fun);
   if( f == NULL ){canvas_error("I'm having trouble parsing your \"expression\" ") ;}
+  int ptx=xsize/levelstep, pty=ysize/levelstep;
-  double dx = (xmax - xmin)/pts;
+  double dx = (xmax - xmin)/ptx;
-  double dy = (ymax - ymin)/pts;
+  double dy = (ymax - ymin)/pty;
-  int sgns[(pts+1)*(pts+1)];
+  int sgns[(ptx+1)*(pty+1)];
   double x, y, diff, xydata[MAX_BUFFER+1];
   int i, j, k;
-  for (j = 0; j <= pts; ++j)
+  for (j = 0; j <= ptx; ++j)
-    for (k = 0; k <= pts; ++k){
+    for (k = 0; k <= pty; ++k){
       x = xmin + j*dx;
       y = ymin + k*dy;
       diff = eval_x_y(f,x,y) - level;
-      sgns[k+j*(pts+1)] = (diff > 0) ? 1 : -(diff < 0);
+      sgns[k+j*(pty+1)] = (diff > 0) ? 1 : -(diff < 0);
     };
   i = 0;
-  for (j = 0; j < pts; ++j)
+  for (j = 0; j < ptx; ++j)
-    for (k = 0; k < pts; ++k){
+    for (k = 0; k < pty; ++k){
-      int b = k+j*(pts+1);
+      int b = k+j*(pty+1);
-      if(filtre(sgns[b],sgns[b+1],sgns[b+pts+1],sgns[b+pts+2])){
+      if(filtre(sgns[b],sgns[b+1],sgns[b+pty+1],sgns[b+pty+2])){
         if (i >= MAX_BUFFER)
           canvas_error("\nYour curve plotting produces too many data \n Use less plotsteps, decrease image size...\nor some other means to reduce the amount of data... ");
         xydata[i++] = xmin+j*dx;
         xydata[i++] = ymin+k*dy;
+      }
 {"latex",LATEX,0},
 {"lattice",LATTICE,0},
 {"legend",LEGEND,0},
 {"legendcolors",LEGENDCOLORS,0},
 {"levelcurve",LEVELCURVE,0},
+{"levelstep",LEVELSTEP,0},
 {"line",LINE,0},
 {"linear",LINEAR,0},
 {"linegraph",LINEGRAPH,0},
 {"lines",LINES,0},
 {"linewidth",LINEWIDTH,0},

Subversion Repositories wimsdev

(root)//trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 18665 → 18669