Commit 84d65d9c authored by claes's avatar claes

Bugfix in draw function, contour line was sometimes not redrawn

parent 629fdadb
/* /*
* Proview $Id: glow_growbar.cpp,v 1.7 2005-09-01 14:57:53 claes Exp $ * Proview $Id: glow_growbar.cpp,v 1.8 2005-12-06 09:13:08 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -193,9 +193,9 @@ void GrowBar::draw( int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -193,9 +193,9 @@ void GrowBar::draw( int ll_x, int ll_y, int ur_x, int ur_y)
ur_y = tmp; ur_y = tmp;
} }
if ( x_right * ctx->zoom_factor_x - ctx->offset_x >= ll_x && if ( x_right * ctx->zoom_factor_x - ctx->offset_x + 1 >= ll_x &&
x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x && x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x &&
y_high * ctx->zoom_factor_y - ctx->offset_y >= ll_y && y_high * ctx->zoom_factor_y - ctx->offset_y + 1 >= ll_y &&
y_low * ctx->zoom_factor_y- ctx->offset_y <= ur_y) y_low * ctx->zoom_factor_y- ctx->offset_y <= ur_y)
{ {
if ( !inverse) if ( !inverse)
......
/* /*
* Proview $Id: glow_growmenu.cpp,v 1.6 2005-09-01 14:57:54 claes Exp $ * Proview $Id: glow_growmenu.cpp,v 1.7 2005-12-06 09:13:08 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -76,9 +76,9 @@ void GrowMenu::draw( int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -76,9 +76,9 @@ void GrowMenu::draw( int ll_x, int ll_y, int ur_x, int ur_y)
ur_y = tmp; ur_y = tmp;
} }
if ( x_right * ctx->zoom_factor_x - ctx->offset_x >= ll_x && if ( x_right * ctx->zoom_factor_x - ctx->offset_x + 1 >= ll_x &&
x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x && x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x &&
y_high * ctx->zoom_factor_y - ctx->offset_y >= ll_y && y_high * ctx->zoom_factor_y - ctx->offset_y + 1 >= ll_y &&
y_low * ctx->zoom_factor_y- ctx->offset_y <= ur_y) y_low * ctx->zoom_factor_y- ctx->offset_y <= ur_y)
{ {
if ( !inverse) if ( !inverse)
......
/* /*
* Proview $Id: glow_grownode.cpp,v 1.10 2005-09-01 14:57:54 claes Exp $ * Proview $Id: glow_grownode.cpp,v 1.11 2005-12-06 09:13:08 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -980,9 +980,9 @@ void GrowNode::draw( int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -980,9 +980,9 @@ void GrowNode::draw( int ll_x, int ll_y, int ur_x, int ur_y)
ur_y = tmp; ur_y = tmp;
} }
if ( x_right * ctx->zoom_factor_x - ctx->offset_x >= ll_x && if ( x_right * ctx->zoom_factor_x - ctx->offset_x + 1 >= ll_x &&
x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x && x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x &&
y_high * ctx->zoom_factor_y - ctx->offset_y >= ll_y && y_high * ctx->zoom_factor_y - ctx->offset_y + 1 >= ll_y &&
y_low * ctx->zoom_factor_y - ctx->offset_y <= ur_y) y_low * ctx->zoom_factor_y - ctx->offset_y <= ur_y)
{ {
if ( !inverse) if ( !inverse)
......
/* /*
* Proview $Id: glow_growtable.cpp,v 1.8 2005-09-01 14:57:54 claes Exp $ * Proview $Id: glow_growtable.cpp,v 1.9 2005-12-06 09:13:08 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -209,9 +209,9 @@ void GrowTable::draw( int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -209,9 +209,9 @@ void GrowTable::draw( int ll_x, int ll_y, int ur_x, int ur_y)
ur_y = tmp; ur_y = tmp;
} }
if ( x_right * ctx->zoom_factor_x - ctx->offset_x >= ll_x && if ( x_right * ctx->zoom_factor_x - ctx->offset_x + 1 >= ll_x &&
x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x && x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x &&
y_high * ctx->zoom_factor_y - ctx->offset_y >= ll_y && y_high * ctx->zoom_factor_y - ctx->offset_y + 1 >= ll_y &&
y_low * ctx->zoom_factor_y- ctx->offset_y <= ur_y) { y_low * ctx->zoom_factor_y- ctx->offset_y <= ur_y) {
draw( (GlowTransform *)NULL, highlight, hot, NULL, NULL); draw( (GlowTransform *)NULL, highlight, hot, NULL, NULL);
} }
......
/* /*
* Proview $Id: glow_growtrend.cpp,v 1.4 2005-09-01 14:57:54 claes Exp $ * Proview $Id: glow_growtrend.cpp,v 1.5 2005-12-06 09:13:08 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -289,9 +289,9 @@ void GrowTrend::draw( int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -289,9 +289,9 @@ void GrowTrend::draw( int ll_x, int ll_y, int ur_x, int ur_y)
ur_y = tmp; ur_y = tmp;
} }
if ( x_right * ctx->zoom_factor_x - ctx->offset_x >= ll_x && if ( x_right * ctx->zoom_factor_x - ctx->offset_x + 1 >= ll_x &&
x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x && x_left * ctx->zoom_factor_x - ctx->offset_x <= ur_x &&
y_high * ctx->zoom_factor_y - ctx->offset_y >= ll_y && y_high * ctx->zoom_factor_y - ctx->offset_y + 1 >= ll_y &&
y_low * ctx->zoom_factor_y - ctx->offset_y <= ur_y) y_low * ctx->zoom_factor_y - ctx->offset_y <= ur_y)
{ {
if ( !inverse) if ( !inverse)
......
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