From ca70b73dd112cec19227af3943e95f3ce9085e14 Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 20 May 2010 19:44:03 +0000
Subject: [PATCH] .Scatter: Changed AddSeries to show marks only if width > 1

git-svn-id: svn://ultimatepp.org/upp/trunk@2416 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/Scatter/Scatter.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bazaar/Scatter/Scatter.cpp b/bazaar/Scatter/Scatter.cpp
index 71e2cc85d..d18459b4e 100644
--- a/bazaar/Scatter/Scatter.cpp
+++ b/bazaar/Scatter/Scatter.cpp
@@ -395,7 +395,10 @@ Scatter &Scatter::AddSeries(Vector<XY> & points,const String& legend,const bool&
 	vPThickness.Add(thickness);
 	vLegend.Add(legend);
 	vMarkColors.Add(pcolor);
-	vShowMark.Add(true);
+	if (width <= 1)
+		vShowMark.Add(false);
+	else
+		vShowMark.Add(true);
 	vMarkStyles.Add(CIRCLE);	
 	vPPrimaryY.Add(true);
 	vPSequential.Add(sequentialXAll);
@@ -1035,6 +1038,8 @@ void Scatter::Scroll(double factorX, double factorY)
 
 void Scatter::MouseWheel(Point, int zdelta, dword) 
 {
+	if (zdelta == 0)
+		return;
 	double scale = zdelta > 0 ? zdelta/100. : -100./zdelta;
 	Zoom(scale);
 }