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

-/*
-/7/2013 version 0.01
+/*27/7/2013 version 0.01
 "Inspired" by FLY program: http://martin.gleeson.com/fly
 *********************************************************************************
 * J.M. Evers 7/2013                                                             *
 * This is all just amateur scriblings... So no copyrights.                      *
 * This source code file, and compiled objects derived from it,                  *
             break;
         case CROSSHAIR:
         /*
         @ crosshair x,y,color
         @ draw a single crosshair point at (x;y) in color 'color'
         @ use command 'crosshairsize int' and / or 'linewidth int'  to adust
         @ may be set draggable / onclick
         */
             for(i=0;i<3;i++){
                 switch(i){
                     case 0: double_data[0] = get_real(infile,0);break; /* x */
                         decimals = find_number_of_digits(precision);
                         fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,7,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s,%d,%d));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],crosshair_size,crosshair_size,line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix,slider,slider_cnt);
                         click_cnt++;reset();
                         break;
                     default:break;
                 }
             }
             break;
         case CROSSHAIRS:
         /*
         @ crosshairs color,x1,y1,x2,y2,...,x_n,y_n
         @ draw multiple crosshair points at given coordinates in color 'color'
         @ use command 'crosshairsize int' and / or 'linewidth int'  to adust
         @ may be set draggable / onclick individually (!)
         */
             stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
             fill_color = stroke_color;
             i=0;
             while( ! done ){     /* get next item until EOL*/
                 if(i > MAX_INT - 1){canvas_error("to many points in argument: repeat command multiple times to fit");}
                 if(i%2 == 0 ){
                     double_data[i] = get_real(infile,0); /* x */
                 }
                 else
+                {
                     double_data[i] = get_real(infile,1); /* y */
+                }
                 i++;
+            }
             decimals = find_number_of_digits(precision);
             for(c=0 ; c < i-1 ; c = c+2){
                 fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,7,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s,%d,%d));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+1],crosshair_size,crosshair_size,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix,slider,slider_cnt);
                 click_cnt++;
             }
             reset();
             break;
         case POINT:
         /*
         @ point x,y,color
                     double_data[i] = get_real(infile,1); /* y */
+                }
                 i++;
+            }
             decimals = find_number_of_digits(precision);
             for(c = 0 ; c < i-1 ; c = c+2){
                 fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,2,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s,%d,%d));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+1],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix,slider,slider_cnt);
+                click_cnt++;
+            }
+            reset();
+            break;
+        case SEGMENTS:
+        /*
+        @ segments color,x1,y1,x2,y2,...,x_n,y_n
+        @ draw multiple segments at given coordinates in color 'color'
+        @ use command 'linewidth int'  to adust size
+        @ may be set draggable / onclick individually (!)
+        */
+            stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
+            fill_color = stroke_color;
+            i=0;
+            while( ! done ){     /* get next item until EOL*/
+                if(i > MAX_INT - 1){canvas_error("to many points in argument: repeat command multiple times to fit");}
+                if(i%2 == 0 ){
+                    double_data[i] = get_real(infile,0); /* x */
+                }
+                else
+                {
+                    double_data[i] = get_real(infile,1); /* y */
+                }
+                i++;
+            }
+            decimals = find_number_of_digits(precision);
+            for(c = 0 ; c < i-1 ; c = c+4){
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s,%d,%d));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+2],decimals,double_data[c+1],decimals,double_data[c+3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix,slider,slider_cnt);
                 click_cnt++;
+            }
             reset();
             break;
         case SEGMENT:
                     case 2: double_data[2]= get_real(infile,0);break; /* x2-values */
                     case 3: double_data[3]= get_real(infile,0);break; /* y2-values */
                     case 4: stroke_color=get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
                         fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s,%d,%d));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix,slider,slider_cnt);
                         click_cnt++;reset();
                         break;
                     default: break;
+                }
+            }
             break;
         case LINE:
             break;
         case ARROW:
         /*
         @ arrow x1,y1,x2,y2,h,color
         @ draw a single headed arrow/vector from (x1:y1) to (x2:y2)<br />with arrowhead size h in px and in color 'color'
         @ use command 'linewidth int' to adjust thickness of the arrow
         @ may be set draggable / onclick
         */
             for(i=0;i<6;i++){
                 switch(i){
                     case 0: double_data[0] = get_real(infile,0);break; /* x */
                     case 1: double_data[1] = get_real(infile,0);break; /* y */
                     case 2: double_data[2] = get_real(infile,0);break; /* x */
                     case 3: double_data[3] = get_real(infile,0);break; /* y */
                     case 4: arrow_head = (int) get_real(infile,0);break;/* h */
                     case 5: stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
+                }
                 add_js_polyline(js_include_file,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
+            }
             else
             if( strcmp(draw_type,"segments") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if( js_function[DRAW_SEGMENTS] != 1 ){ js_function[DRAW_SEGMENTS] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 1){
                     add_input_segment(js_include_file,2);
+                }
                 add_js_segments(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
+            }
             else
             if( strcmp(draw_type,"circle") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if(reply_format == 0){reply_format = 10;}
                 /* 9 = x1:y1:r1,x2:y2:r2,x3:y3:r3,x4:y4:r3...x_n:y_n:r_n in x/y-range */
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 1){
                     add_input_circle(js_include_file,2,1);
                     add_input_xyr(js_include_file,canvas_root_id);
             if(strcmp(draw_type,"crosshairs") == 0 ){
                 if( js_function[DRAW_CROSSHAIRS] != 1 ){ js_function[DRAW_CROSSHAIRS] = 1;}
                 if(reply_format == 0){reply_format = 8;}
                 /* 7 = x1:y1,x2:y2,x3:y3,x4:y4...x_n:y_n in x/y-range */
                 add_js_crosshairs(js_include_file,2,draw_type,line_width,crosshair_size ,stroke_color,stroke_opacity);
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 1){
                     add_input_crosshair(js_include_file,2);
                     add_input_xy(js_include_file,canvas_root_id);
+                }
             }
             else
             if(strcmp(draw_type,"freehandline") == 0 ){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 6;}
                 add_js_paths(js_include_file,1,draw_type,line_width,0,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if(strcmp(draw_type,"freehandlines") == 0 ){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 6;}
                 add_js_paths(js_include_file,2,draw_type,line_width,0,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if(strcmp(draw_type,"path") == 0 ){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 6;}
                 add_js_paths(js_include_file,1,draw_type,line_width,1,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if(strcmp(draw_type,"paths") == 0 ){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 6;}
                 add_js_paths(js_include_file,2,draw_type,line_width,1,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if(strcmp(draw_type,"arrows") == 0 ){
                 if( js_function[DRAW_ARROWS] != 1 ){ js_function[DRAW_ARROWS] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_arrows(js_include_file,2,draw_type,line_width,1,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1],arrow_head);
                 if(use_input_xy == 1){
                     add_input_arrow(js_include_file,2);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
+                }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if(strcmp(draw_type,"arrows2") == 0 ){
                 if( js_function[DRAW_ARROWS] != 1 ){ js_function[DRAW_ARROWS] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_arrows(js_include_file,2,draw_type,line_width,2,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1],arrow_head);
                 if(use_input_xy == 1){
                     add_input_arrow(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
+                }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if(strcmp(draw_type,"arrow2") == 0 ){
                 if( js_function[DRAW_ARROWS] != 1 ){ js_function[DRAW_ARROWS] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_arrows(js_include_file,1,draw_type,line_width,2,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1],arrow_head);
                 if(use_input_xy == 1){
                     add_input_arrow(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if(strcmp(draw_type,"arrow") == 0 ){
                 if( js_function[DRAW_ARROWS] != 1 ){ js_function[DRAW_ARROWS] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_arrows(js_include_file,1,draw_type,line_width,1,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1],arrow_head);
                 if(use_input_xy == 1){
                     add_input_arrow(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if(strcmp(draw_type,"polygon") == 0){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 2;}
             else
             if(strcmp(draw_type,"triangle") == 0){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 2;}
                 add_js_poly(js_include_file,3,draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"hline") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"hlines") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"vline") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,3,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"vlines") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,4,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             if( strcmp(draw_type,"line") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_lines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if( use_input_xy == 1 ){
                     add_input_line(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"lines") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_lines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if( use_input_xy == 1 ){
                     add_input_line(js_include_file,2);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"demilines") == 0 || strcmp(draw_type,"demilines") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if( js_function[DRAW_DEMILINES] != 1 ){ js_function[DRAW_DEMILINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                     case 1: int_data[0] = x2px(get_real(infile,0));break; /* x */
                     case 2: int_data[1] = y2px(get_real(infile,0));break; /* y */
                     case 3: fly_font = get_string_argument(infile,0);
                             if(strcmp(fly_font,"giant") == 0){
                                 font_size = (int)(font_size + 24);
                             }
                             else
                             {
                                 if(strcmp(fly_font,"huge") == 0){
                                     font_size = (int)(font_size + 14);
+                                }
                                 else
+                                {
                     string_length = snprintf(NULL,0,"draw_text(%d,%d,%d,%d,\"%s\",\"%s\",%.2f,90,\"%s\",%d,%.2f,%d,%s);\n",STATIC_CANVAS,int_data[0],int_data[1],font_size,font_family,font_color,stroke_opacity,temp,use_rotate,angle,use_affine,affine_matrix);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                     snprintf(tmp_buffer,string_length,"draw_text(%d,%d,%d,%d,\"%s\",\"%s\",%.2f,90,\"%s\",%d,%.2f,%d,%s);\n",STATIC_CANVAS,int_data[0],int_data[1],font_size,font_family,font_color,stroke_opacity,temp,use_rotate,angle,use_affine,affine_matrix);
                     add_to_buffer(tmp_buffer);
                     break;
                     default:break;
                 }
+            }
             reset();
             break;
         case FONTFAMILY:
         /*
          @ font_description: Ariel ,Courier, Helvetica etc
          @ in case commands<br /> 'string color,x,y,the string'<br /> 'stringup color,x,y,rotation,the string'<br />fontfamily can be something like:<br />italic 34px Ariel
          @ use correct syntax : 'font style' 'font size'px 'fontfamily'
         */
             font_family = get_string(infile,1);
             break;
         case STRINGUP:
         /*
          @ stringup color,x,y,rotation_degrees,the text string
          @ can <b>not</b> be set "onclick" or "drag xy" (because of translaton matrix...mouse incompatible)
          @ unicode supported: stringup red,0,0,45,\\u2232
                     case 2: temp = get_string_argument(infile,1);
                             /* draw_text = function(canvas_type,y,font_family,stroke_color,stroke_opacity,text) */
                             decimals = find_number_of_digits(precision);
                             string_length = snprintf(NULL,0,
                             "draw_centerstring(%d,%.*f,\"%s\",\"%s\",%.2f,\"%s\");\n",canvas_root_id,decimals,double_data[0],font_family,stroke_color,stroke_opacity,temp);
                             check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                             snprintf(tmp_buffer,string_length,"draw_centerstring(%d,%.*f,\"%s\",\"%s\",%.2f,\"%s\");\n",canvas_root_id,decimals,double_data[0],font_family,stroke_color,stroke_opacity,temp);
                             add_to_buffer(tmp_buffer);
                             break;
                     default:break;
+                }
                     }else{
                         if(strstr(temp,"radius") != NULL){
                             int_data[0] = 4;
                         }else{
                             int_data[0] = 2;
                         }
+                    }
+                }
+            }
+        }
         stroke_color = get_color(infile,0);
                     if( strstr(temp,".mp3") != 0 ){ temp = str_replace(temp,".mp3","");}
                     if( strstr(temp,".ogg") != 0 ){ temp = str_replace(temp,".ogg","");}
                     string_length = snprintf(NULL,0,  "draw_audio(%d,%d,%d,%d,%d,%d,%d,\"%s.ogg\",\"%s.mp3\");\n",canvas_root_id,int_data[0],int_data[1],int_data[2],int_data[3],int_data[4],int_data[5],temp,temp);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                     snprintf(tmp_buffer,string_length,"draw_audio(%d,%d,%d,%d,%d,%d,%d,\"%s.ogg\",\"%s.mp3\");\n",canvas_root_id,int_data[0],int_data[1],int_data[2],int_data[3],int_data[4],int_data[5],temp,temp);
                     add_to_buffer(tmp_buffer);
                     break;
                     default:break;
+                }
+            }
             reset();
             break;
                            decimals = find_number_of_digits(precision);/*floodfill(interaction,x,y,[R,G,B,A]) */
                            /* we need to set a timeout: the canvas is not yet draw in memory? when floodfill is called directly... */
                            string_length = snprintf(NULL,0,  "setTimeout(function(){floodfill(0,%.*f,%.*f,[%s,%d]);},1000);\n",decimals,double_data[0],decimals,double_data[1],fill_color,(int) (fill_opacity/0.0039215));
                            check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                            snprintf(tmp_buffer,string_length,"setTimeout(function(){floodfill(0,%.*f,%.*f,[%s,%d]);},1000);\n",decimals,double_data[0],decimals,double_data[1],fill_color,(int) (fill_opacity/0.0039215));
                            add_to_buffer(tmp_buffer);
                            break;
                     default:break;
                 }
+            }
             reset();
         break;
         case CLICKFILLMARGE:
             clickfillmarge = (int) (get_real(infile,1));
+  }
   else
+  {
     if( found_size_command != 3 ){
      canvas_error("Please specify both xrange and yrange ...");
     }
   }
   /* if needed, add generic draw functions (grid / xml etc) to buffer : these are no draggable/clickable shapes / objects  ! */
   add_javascript_functions(js_function,canvas_root_id);
    /* add read_canvas() etc functions if needed */
   if( reply_format > 0 ){ add_read_canvas(canvas_root_id,reply_format,reply_precision);}
 **
 **  sync_input
 **
 **  synchronises input line - reads to end of line, leaving file pointer
 **  at first character of next line.
 **
 **  Used by:
 **  main program - error handling.
 **
 ******************************************************************************/
 void sync_input(FILE *infile)
+    }
     if ((ret = malloc(retlen + 1)) == NULL){
         ret = NULL;
         canvas_error("string argument is NULL");
     }
     else
     {
         for (r = ret, p = str; (q = strstr(p, old)) != NULL; p = q + oldlen) {
             size_t l = q - p;
             memcpy(r, p, l);
             r += l;
             memcpy(r, new, newlen);
 fprintf(js_include_file,"\n<!-- draw text -->\n\
 var draw_text = function(canvas_type,x,y,font_size,font_family,stroke_color,stroke_opacity,angle2,text,use_rotate,angle,use_affine,affine_matrix){\
   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\");\
    x_e = x2px(i*num);\
    if( i == 1 ){\
     ctx.lineWidth = line_width;\
     ctx.strokeStyle=\"rgba(\"+major_color+\",\"+major_opacity+\")\";\
     if( use_axis_numbering == 1 && p > x_min){\
       xtxt = xlogbase+'^'+p.toFixed(0);\
       corr = 0.5*(ctx.measureText(xtxt).width);\
       ctx.fillText(xtxt,x_e - corr,ysize - 4);\
     };\
    }else{\
     ctx.lineWidth = 0.2*line_width;\
     ctx.strokeStyle=\"rgba(\"+minor_color+\",\"+minor_opacity+\")\";\
    };\
    if( x_e >= xmarge ){\
     ctx.beginPath();\
     ctx.moveTo(x_e,0);\
     ctx.lineTo(x_e,ysize - ymarge);\
     ctx.stroke();\
         *dashed="dashed",
         *filled="filled",
         *lattice="lattice",
         *parallel="parallel",
         *segment="segment",
+        *segments="segments",
         *dsegment="dsegment",
         *seg="seg",
         *bgimage="bgimage",
         *bgcolor="bgcolor",
         *strokecolor="strokecolor",
         return VLINE;
+        }
         if( strcmp(input_type, line) == 0 ){
         free(input_type);
         return LINE;
+        }
+        if( strcmp(input_type, segments) == 0 ){
+        free(input_type);
+        return SEGMENTS;
+        }
         if( strcmp(input_type, seg) == 0 ||  strcmp(input_type, segment) == 0 ){
         free(input_type);
         return SEGMENT;
+        }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 8297 → 8299