Index: Core/GIS/src/Core.GIS.SharpMap/Core.GIS.SharpMap.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -rb8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6
--- Core/GIS/src/Core.GIS.SharpMap/Core.GIS.SharpMap.csproj (.../Core.GIS.SharpMap.csproj) (revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Core/GIS/src/Core.GIS.SharpMap/Core.GIS.SharpMap.csproj (.../Core.GIS.SharpMap.csproj) (revision b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6)
@@ -179,12 +179,8 @@
-
-
-
-
Fisheye: Tag b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6 refers to a dead (removed) revision in file `Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/QuantityTheme.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6 refers to a dead (removed) revision in file `Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/QuantityThemeIntervalType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6 refers to a dead (removed) revision in file `Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/QuantityThemeItem.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/ThemeFactory.cs
===================================================================
diff -u -r7735c2286d919d0e1ee597a5af50cfebb7abe39f -rb8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6
--- Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/ThemeFactory.cs (.../ThemeFactory.cs) (revision 7735c2286d919d0e1ee597a5af50cfebb7abe39f)
+++ Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/ThemeFactory.cs (.../ThemeFactory.cs) (revision b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6)
@@ -2,9 +2,7 @@
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
-using System.Linq;
using Core.GIS.GeoAPI.Geometries;
-using Core.GIS.NetTopologySuite.Index.Bintree;
using Core.GIS.SharpMap.Styles;
namespace Core.GIS.SharpMap.Rendering.Thematics
@@ -134,114 +132,6 @@
return categorialTheme;
}
- public static QuantityTheme CreateQuantityTheme(string attribute, VectorStyle defaultStyle, ColorBlend blend,
- int numberOfClasses, IList intervals)
- {
- float minSize = defaultStyle.Line.Width;
- float maxSize = defaultStyle.Line.Width;
-
- return CreateQuantityTheme(attribute, defaultStyle, blend, numberOfClasses, intervals, minSize, maxSize, false, false);
- }
-
- public static QuantityTheme CreateQuantityTheme(string attribute, VectorStyle defaultStyle, ColorBlend blend,
- int numberOfClasses, IList values, float minSize, float maxSize, bool skipColors, bool skipSizes, QuantityThemeIntervalType intervalType)
- {
- var intervals = ThemeFactoryHelper.GetIntervalsForNumberOfClasses(values.Select(i => Convert.ToSingle(i)).ToList(),
- intervalType, numberOfClasses);
- return CreateQuantityTheme(attribute, defaultStyle, blend, numberOfClasses, intervals, minSize, maxSize, skipColors, skipSizes);
- }
-
- public static QuantityTheme CreateQuantityTheme(string attribute, VectorStyle defaultStyle, ColorBlend blend,
- int numberOfClasses, IList intervals, float minSize, float maxSize, bool skipColors, bool skipSizes)
- {
- if (defaultStyle == null)
- {
- defaultStyle = new VectorStyle();
- defaultStyle.GeometryType = typeof(IPolygon);
- }
-
- var quantityTheme = new QuantityTheme(attribute, defaultStyle);
-
- var totalMinValue = (float) intervals[0].Min;
- var totalMaxValue = (float) intervals[intervals.Count - 1].Max;
-
- if (totalMinValue == totalMaxValue)
- {
- return null;
- }
-
- for (int i = 0; i < numberOfClasses; i++)
- {
- Color color = numberOfClasses > 1
- ? blend.GetColor(1 - (float) i/(numberOfClasses - 1))
- : ((SolidBrush) defaultStyle.Fill).Color;
-
- float size = defaultStyle.Line.Width;
-
- if (!skipSizes)
- {
- var minValue = (float) intervals[i].Min;
- var maxValue = (float) intervals[i].Max;
-
- float width = maxValue - minValue;
- float mean = minValue + 0.5f*width;
-
- float fraction = (mean - totalMinValue)/(totalMaxValue - totalMinValue);
-
- size = minSize + fraction*(maxSize - minSize);
- }
-
- var vectorStyle = new VectorStyle
- {
- GeometryType = defaultStyle.GeometryType
- };
-
- if (defaultStyle.GeometryType == typeof(IPoint))
- {
- if (skipColors)
- {
- color = ((SolidBrush) defaultStyle.Fill).Color;
- }
-
- vectorStyle.Fill = new SolidBrush(color);
- vectorStyle.Shape = defaultStyle.Shape;
-
- if (!skipSizes)
- {
- vectorStyle.ShapeSize = Convert.ToInt32(size);
- vectorStyle.Line.Width = size;
- }
- }
- else if ((defaultStyle.GeometryType == typeof(IPolygon)) || (defaultStyle.GeometryType == typeof(IMultiPolygon)))
- {
- if (skipColors)
- {
- color = ((SolidBrush) defaultStyle.Fill).Color;
- }
- vectorStyle.Fill = new SolidBrush(color);
- vectorStyle.Line = CreatePen(color, size, defaultStyle.Line);
- vectorStyle.Outline.Width = (defaultStyle.Outline.Width - defaultStyle.Line.Width) + size;
- }
- else if ((defaultStyle.GeometryType == typeof(ILineString)) || (defaultStyle.GeometryType == typeof(IMultiLineString)))
- {
- if (skipColors)
- {
- color = defaultStyle.Line.Color;
- }
- vectorStyle.Line = CreatePen(color, size, defaultStyle.Line);
- vectorStyle.Outline.Width = (defaultStyle.Outline.Width - defaultStyle.Line.Width) + size;
- }
- else
- {
- vectorStyle.Fill = new SolidBrush(color);
- }
-
- quantityTheme.AddStyle(vectorStyle, intervals[i]);
- }
-
- return quantityTheme;
- }
-
public static CustomTheme CreateSingleFeatureTheme(Type geometryType, Color color, float width)
{
var vectorStyle = new VectorStyle
Fisheye: Tag b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6 refers to a dead (removed) revision in file `Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/ThemeFactoryHelper.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.SharpMap.Tests/Core.GIS.SharpMap.Tests.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -rb8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6
--- Core/GIS/test/Core.GIS.SharpMap.Tests/Core.GIS.SharpMap.Tests.csproj (.../Core.GIS.SharpMap.Tests.csproj) (revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Core/GIS/test/Core.GIS.SharpMap.Tests/Core.GIS.SharpMap.Tests.csproj (.../Core.GIS.SharpMap.Tests.csproj) (revision b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6)
@@ -137,8 +137,6 @@
-
-
Fisheye: Tag b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMap.Tests/Rendering/Thematics/QuantityThemeTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMap.Tests/Rendering/Thematics/ThemeFactoryHelperTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLayerLegend.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -rb8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLayerLegend.cs (.../MapLayerLegend.cs) (revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLayerLegend.cs (.../MapLayerLegend.cs) (revision b8ba6aba1df53a77e72e1fe9cfa73c62aadadeb6)
@@ -23,7 +23,6 @@
{
GradientTheme gradientTheme;
CustomTheme customTheme;
- QuantityTheme quantityTheme;
CategorialTheme categorialTheme;
if ((customTheme = vectorLayer.Theme as CustomTheme) != null)
{
@@ -57,13 +56,6 @@
Styles.Add(gradientThemeItem.Style);
}
}
- else if ((quantityTheme = vectorLayer.Theme as QuantityTheme) != null)
- {
- foreach (QuantityThemeItem quantityThemeItem in quantityTheme.ThemeItems)
- {
- Styles.Add(quantityThemeItem.Style);
- }
- }
else
{
throw new NotSupportedException("This kind of theme is not supported");