Subversion Repositories wimsdev

Rev

Rev 7779 | Rev 7782 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7779 Rev 7780
Line 970... Line 970...
970 
            }
 970 
            }
971 
            else
 971 
            else
972 
            if( strcmp(draw_type,"polyline") == 0 ){
 972 
            if( strcmp(draw_type,"polyline") == 0 ){
973 
                if( js_function[DRAW_POLYLINE] != 1 ){ js_function[DRAW_POLYLINE] = 1;}
 973 
                if( js_function[DRAW_POLYLINE] != 1 ){ js_function[DRAW_POLYLINE] = 1;}
974 
                if(reply_format < 1){reply_format = 11;}
 974 
                if(reply_format < 1){reply_format = 11;}
975 
                if( use_input_xy > 0 ){
 975 
                if( use_input_xy == 1 ){
976 
                    add_textarea_polyline(js_include_file);
 976 
                    add_input_polyline(js_include_file);
977 
                    if( use_input_xy == 2 ){
 - 
 
978 
                        add_textarea_xy(js_include_file,canvas_root_id);
 - 
 
979 
                    }
 - 
 
980 
                    else
 - 
 
981 
                    {
 - 
 
982 
                        add_input_xy(js_include_file,canvas_root_id);
 977 
                    add_input_xy(js_include_file,canvas_root_id);
983 
                    }
 - 
 
984 
                }
 978 
                }
985 
                add_js_polyline(js_include_file,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
 979 
                add_js_polyline(js_include_file,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
986 
            }
 980 
            }
987 
            else
 981 
            else
988 
            if( strcmp(draw_type,"segments") == 0 ){
 982 
            if( strcmp(draw_type,"segments") == 0 ){
Line 1090... Line 1084...
1090 
            else
 1084 
            else
1091 
            if(strcmp(draw_type,"polygon") == 0){
 1085 
            if(strcmp(draw_type,"polygon") == 0){
1092 
                if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
 1086 
                if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
1093 
                if(reply_format < 1){reply_format = 2;}
 1087 
                if(reply_format < 1){reply_format = 2;}
1094 
                add_js_poly(js_include_file,-1,draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
 1088 
                add_js_poly(js_include_file,-1,draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
1095 
                if( use_input_xy > 0 ){
 1089 
                if( use_input_xy == 2 ){
1096 
                    add_textarea_polygon(js_include_file);
 1090 
                  add_textarea_polygon(js_include_file);
1097 
                    if( use_input_xy == 2 ){
 - 
 
1098 
                        add_textarea_xy(js_include_file,canvas_root_id);
 1091 
                  add_textarea_xy(js_include_file,canvas_root_id);
1099 
                    }
 - 
 
1100 
                    else
 - 
 
1101 
                    {
 - 
 
1102 
                        add_input_xy(js_include_file,canvas_root_id);
 - 
 
1103 
                    }
 - 
 
1104 
                }
 1092 
                }
1105 
            }
 1093 
            }
1106 
            else
 1094 
            else
1107 
            if(strncmp(draw_type,"poly",4) == 0){
 1095 
            if(strncmp(draw_type,"poly",4) == 0){
1108 
                if(strlen(draw_type) < 5){canvas_error("use command \"userdraw poly[3-9],color\" eg userdraw poly6,blue");}
 1096 
                if(strlen(draw_type) < 5){canvas_error("use command \"userdraw poly[3-9],color\" eg userdraw poly6,blue");}
Line 1123... Line 1111...
1123 
                if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
 1111 
                if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
1124 
                if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
 1112 
                if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
1125 
                if(reply_format < 1){reply_format = 11;}
 1113 
                if(reply_format < 1){reply_format = 11;}
1126 
                add_js_lines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
 1114 
                add_js_lines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
1127 
                if( use_input_xy == 1 ){
 1115 
                if( use_input_xy == 1 ){
1128 
                    add_textarea_line(js_include_file,1);
 1116 
                    add_input_line(js_include_file,1);
1129 
                    add_input_x1y1x2y2(js_include_file,canvas_root_id);
 1117 
                    add_input_x1y1x2y2(js_include_file,canvas_root_id);
1130 
                }
 1118 
                }
1131 
            }
 1119 
            }
1132 
            else
 1120 
            else
1133 
            if( strcmp(draw_type,"lines") == 0 ){
 1121 
            if( strcmp(draw_type,"lines") == 0 ){
1134 
                if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
 1122 
                if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
1135 
                if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
 1123 
                if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
1136 
                if(reply_format < 1){reply_format = 11;}
 1124 
                if(reply_format < 1){reply_format = 11;}
1137 
                add_js_lines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
 1125 
                add_js_lines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
1138 
                if( use_input_xy == 1 ){
 1126 
                if( use_input_xy == 1 ){
1139 
                    add_textarea_line(js_include_file,2);
 1127 
                    add_input_line(js_include_file,2);
1140 
                    add_input_x1y1x2y2(js_include_file,canvas_root_id);
 1128 
                    add_input_x1y1x2y2(js_include_file,canvas_root_id);
1141 
                }
 1129 
                }
1142 
            }
 1130 
            }
1143 
            else
 1131 
            else
1144 
            if( strcmp(draw_type,"rects") == 0){
 1132 
            if( strcmp(draw_type,"rects") == 0){