diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c index 48ff581eae3889bc5d6aae87eda29cc324d6e91e..900977287b3e4cf6b0ece5f0d3d554682dd0e223 100644 --- a/pd/src/g_editor.c +++ b/pd/src/g_editor.c @@ -191,6 +191,11 @@ int gobj_shouldvis(t_gobj *x, struct _glist *glist) t_preset_hub *ph = (t_preset_hub *)x; if (ph->ph_invis > 0) return(0); } + /*fprintf(stderr,"checking %d\n", (glist->gl_havewindow || + (ob->te_pd != canvas_class && + ob->te_pd->c_wb != &text_widgetbehavior) || + (ob->te_pd == canvas_class && (((t_glist *)ob)->gl_isgraph)) || + (glist->gl_goprect && (ob->te_type == T_TEXT))));*/ return (glist->gl_havewindow || (ob->te_pd != canvas_class && ob->te_pd->c_wb != &text_widgetbehavior) || diff --git a/pd/src/g_graph.c b/pd/src/g_graph.c index b562f34dfdf973dd02c0fd24e768b0ac0f41569a..4508270722072fddeadabb56281d6a8a3523cda8 100644 --- a/pd/src/g_graph.c +++ b/pd/src/g_graph.c @@ -1130,12 +1130,12 @@ static void graph_getrect(t_gobj *z, t_glist *glist, has_garray = 1; } } - if (has_garray) { + /*if (has_garray) { x1 -= 1; y1 -= 2; //x2 += 1; y2 += 1; - } + }*/ } else text_widgetbehavior.w_getrectfn(z, glist, &x1, &y1, &x2, &y2); *xp1 = x1; diff --git a/pd/src/g_template.c b/pd/src/g_template.c index 43c83da44d1c8c6e8b7ff84043afb3bdd1a0655f..0579bec71e66be2b5832405f567ee94c66f47db8 100644 --- a/pd/src/g_template.c +++ b/pd/src/g_template.c @@ -1209,17 +1209,17 @@ static void curve_vis(t_gobj *z, t_glist *glist, t_scalar *sc, fill); if (flags & CLOSED && !(flags & BBOX)) { - sys_vgui(".x%lx.c create ppolygon\\\n", + sys_vgui(".x%lx.c create ppolygon \\\n", glist_getcanvas(glist)); } else if (flags & BBOX) /* rectangles and ellipses */ { n = 2; /* silently truncate extra coordinates */ if(flags & BEZ) - sys_vgui(".x%lx.c create ellipse\\\n", + sys_vgui(".x%lx.c create ellipse \\\n", glist_getcanvas(glist)); else - sys_vgui(".x%lx.c create prect\\\n", + sys_vgui(".x%lx.c create prect \\\n", glist_getcanvas(glist)); } } @@ -1228,18 +1228,18 @@ static void curve_vis(t_gobj *z, t_glist *glist, t_scalar *sc, if(flags & BBOX) { if(flags & BEZ) - sys_vgui(".x%lx.c create ellipse\\\n", glist_getcanvas(glist)); + sys_vgui(".x%lx.c create ellipse \\\n", glist_getcanvas(glist)); else - sys_vgui(".x%lx.c create prect\\\n", glist_getcanvas(glist)); + sys_vgui(".x%lx.c create prect \\\n", glist_getcanvas(glist)); } else - sys_vgui(".x%lx.c create polyline\\\n", glist_getcanvas(glist)); + sys_vgui(".x%lx.c create polyline \\\n", glist_getcanvas(glist)); } for (i = 0; i < n; i++) { - sys_vgui("%d %d\\\n", pix[2*i], pix[2*i+1]); + sys_vgui("%d %d \\\n", pix[2*i], pix[2*i+1]); if ((flags & BEZ) && (flags & BBOX)) { - sys_vgui("-rx %d -ry %d\\\n", + sys_vgui("-rx %d -ry %d \\\n", (t_int)fielddesc_getfloat(x->x_vec+2, template, data, 1), (t_int)fielddesc_getfloat(x->x_vec+3, @@ -1247,12 +1247,12 @@ static void curve_vis(t_gobj *z, t_glist *glist, t_scalar *sc, break; } } - sys_vgui("-strokewidth %f\\\n", width); - if (flags & CLOSED) sys_vgui("-fill %s -stroke %s -fillopacity %g\\\n", + sys_vgui("-strokewidth %f \\\n", width); + if (flags & CLOSED) sys_vgui("-fill %s -stroke %s -fillopacity %g \\\n", fill, outline, fielddesc_getfloat(&x->x_fillopacity, template, data, 1)); - else if(flags & BBOX) sys_vgui("-stroke %s\\\n", outline); - else sys_vgui("-stroke %s\\\n", outline); - //if ((flags & BEZ) && !(flags & BBOX)) sys_vgui("-smooth 1\\\n"); //this doesn't work with tkpath + else if(flags & BBOX) sys_vgui("-stroke %s \\\n", outline); + else sys_vgui("-stroke %s \\\n", outline); + //if ((flags & BEZ) && !(flags & BBOX)) sys_vgui("-smooth 1 \\\n"); //this doesn't work with tkpath sys_vgui("-tags {.x%lx.x%lx.template%lx scalar%lx}\n", glist_getcanvas(glist), glist, data, sc); if (!glist_istoplevel(glist)) { @@ -1923,7 +1923,7 @@ static void plot_vis(t_gobj *z, t_glist *glist, t_scalar *sc, int mey1 = (int)glist_ytopixels(glist, basey + fielddesc_cvttocoord(yfielddesc, minyval)) - 1; int mex2 = inextx; int mey2 = py2; - sys_vgui("M %d %d H %d V %d H %d z\\\n", + sys_vgui("M %d %d H %d V %d H %d z \\\n", mex1, mey1, mex2, mey2, mex1); //} //part of experimental code above ndrawn++; @@ -2020,9 +2020,9 @@ static void plot_vis(t_gobj *z, t_glist *glist, t_scalar *sc, fielddesc_cvttocoord(wfielddesc, wval))); } ouch: - sys_vgui(" -strokewidth 1 -fill %s -stroke %s\\\n", + sys_vgui(" -strokewidth 1 -fill %s -stroke %s \\\n", symfill->s_name, symoutline->s_name); - //if (style == PLOTSTYLE_BEZ) sys_vgui("-smooth 1\\\n"); //this doesn't work with tkpath + //if (style == PLOTSTYLE_BEZ) sys_vgui("-smooth 1 \\\n"); //this doesn't work with tkpath sys_vgui("-tags {.x%lx.x%lx.template%lx scalar%lx}\n", glist_getcanvas(glist), glist, data, sc); @@ -2064,11 +2064,11 @@ static void plot_vis(t_gobj *z, t_glist *glist, t_scalar *sc, glist_ytopixels(glist, basey + yloc + fielddesc_cvttocoord(yfielddesc, yval))); - //sys_vgui("-strokewidth %f\\\n", linewidth); - //sys_vgui("-fill %s\\\n", outline); - sys_vgui("-strokewidth %f -stroke %s\\\n", linewidth, symoutline->s_name); - //sys_vgui("-fill %s\\\n", symoutline->s_name); - //if (style == PLOTSTYLE_BEZ) sys_vgui("-smooth 1\\\n"); //this doesn't work with tkpath + //sys_vgui("-strokewidth %f \\\n", linewidth); + //sys_vgui("-fill %s \\\n", outline); + sys_vgui("-strokewidth %f -stroke %s \\\n", linewidth, symoutline->s_name); + //sys_vgui("-fill %s \\\n", symoutline->s_name); + //if (style == PLOTSTYLE_BEZ) sys_vgui("-smooth 1 \\\n"); //this doesn't work with tkpath sys_vgui("-tags {.x%lx.x%lx.template%lx scalar%lx}\n", glist_getcanvas(glist), glist, data,sc); }