Fix for Issue #399 - RangeSelector slowing things down quite badly

Additional logic added to ensure no more than one data point per pixel.