Commit 7f772ff2 authored by Claes Sjofors's avatar Claes Sjofors

Ge trend and xycurve fix for curves in subwindow

parent 55485da4
...@@ -506,8 +506,8 @@ void GrowTrend::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, voi ...@@ -506,8 +506,8 @@ void GrowTrend::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, voi
x = 0; x = 0;
width += ll_x; width += ll_x;
} }
if ( ur_x > w->window_width) if ( ur_x > w->subwindow_x + w->window_width)
width -= ur_x - w->window_width; width -= ur_x - (w->subwindow_x + w->window_width);
ctx->gdraw->fill_rect( w, x, ll_y, width, ur_y - ll_y, drawtype); ctx->gdraw->fill_rect( w, x, ll_y, width, ur_y - ll_y, drawtype);
} }
else { else {
...@@ -572,8 +572,8 @@ void GrowTrend::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, voi ...@@ -572,8 +572,8 @@ void GrowTrend::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, voi
x = 0; x = 0;
width += ll_x; width += ll_x;
} }
if ( ur_x > w->window_width) if ( ur_x > w->subwindow_x + w->window_width)
width -= ur_x - w->window_width; width -= ur_x - (w->subwindow_x + w->window_width);
ctx->gdraw->line( w, x, y, x + width, y, drawtype, 0, 0); ctx->gdraw->line( w, x, y, x + width, y, drawtype, 0, 0);
} }
......
...@@ -234,7 +234,7 @@ void GrowXYCurve::set_xy_data( double *y_data, double *x_data, int curve_idx, in ...@@ -234,7 +234,7 @@ void GrowXYCurve::set_xy_data( double *y_data, double *x_data, int curve_idx, in
ctx->nodraw++; ctx->nodraw++;
curve[j] = new GrowPolyLine( ctx, "", pointarray, cpoints, dt, curve[j] = new GrowPolyLine( ctx, "", pointarray, cpoints, dt,
curve_width, curve_width,
0, fill_curve, 1, 0, dt_fill); 0, fill_curve, 1, 0, dt_fill, 0, 1);
ctx->nodraw--; ctx->nodraw--;
free( (char *) pointarray); free( (char *) pointarray);
draw(); draw();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment