[DebianGIS-dev] [SCM] saga branch, master, updated. 94539575e5b8d35f1caca5ebb5ebcf2135d0115a

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit 671b67206ea07538fbac56610e911285d56b4f2e
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed May 5 12:41:15 2010 +0200

    Fix bug: deep map window zoom freezes SAGA
    
    Upstream commit of 2010-03-24

diff --git a/src/saga_core/saga_gui/dc_helper.cpp b/src/saga_core/saga_gui/dc_helper.cpp
index 426bf13..ec0fc77 100644
--- a/src/saga_core/saga_gui/dc_helper.cpp
+++ b/src/saga_core/saga_gui/dc_helper.cpp
@@ -338,8 +338,18 @@ void		Draw_Scale(wxDC &dc, wxRect r, double zMin, double zMax, bool bHorizontal,
 
 		//-------------------------------------------------
 		z			= dz * floor(zMin / dz);
-		if( Style != 0 && z < zMin )	z	+= dz;
 
+		if( Style != 0 && z < zMin )
+		{
+			z	+= dz;
+		}
+
+		if( z == z + dz )
+		{
+			return;
+		}
+
+		//-------------------------------------------------
 		for(; z<=zMax; z+=dz)
 		{
 			s.Printf(wxT("%.*f"), Decimals, z);

-- 
Saga GIS