Index: src/Common/DelftTools.Controls.Swf/Charting/Series/ILineChartSeries.cs
===================================================================
diff -u -r48005de98cf6e07ecbe31596f5ec4b0c86fda82a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/DelftTools.Controls.Swf/Charting/Series/ILineChartSeries.cs (.../ILineChartSeries.cs) (revision 48005de98cf6e07ecbe31596f5ec4b0c86fda82a)
+++ src/Common/DelftTools.Controls.Swf/Charting/Series/ILineChartSeries.cs (.../ILineChartSeries.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -16,11 +16,6 @@
DashStyle DashStyle { get; set; }
///
- /// Custom dash pattern (used when is Custom)
- ///
- float[] DashPattern { get; set; }
-
- ///
/// Pointer color
///
Color PointerColor { get; set; }
@@ -51,11 +46,6 @@
bool TitleLabelVisible { get; set; }
///
- /// Values on the x axis should be treated as DateTime values
- ///
- bool XValuesDateTime { get; set; }
-
- ///
/// Color of the line around the points
///
Color PointerLineColor { get; set; }
@@ -64,32 +54,5 @@
/// Show a line around the points
///
bool PointerLineVisible { get; set; }
-
- ///
- /// Transparency (in %) of the line
- ///
- int Transparency { get; set; }
-
- ///
- /// Gets the maximum value on the y axis
- ///
- double MaxYValue();
-
- ///
- /// Gets the minimum value on the y axis
- ///
- double MinYValue();
-
- ///
- /// Gives horizontal screen position for a given point
- ///
- /// Index of the point
- double CalcXPos(int index);
-
- ///
- /// Gives vertical screen position for a given point
- ///
- /// Index of the point
- double CalcYPos(int index);
}
}
\ No newline at end of file
Index: src/Common/DelftTools.Controls.Swf/ControlHelper.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/DelftTools.Controls.Swf/ControlHelper.cs (.../ControlHelper.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls.Swf/ControlHelper.cs (.../ControlHelper.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Windows.Forms;
@@ -14,19 +12,6 @@
[DllImport("uxtheme.dll", CharSet = CharSet.Unicode)]
public static extern int SetWindowTheme(IntPtr hWnd, string textSubAppName, string textSubIdList);
- public static Control GetFocusControl()
- {
- Control focusControl = null;
- var focusHandle = GetFocus();
- if (focusHandle != IntPtr.Zero)
- {
- // returns null if handle is not to a .NET control
- focusControl = Control.FromHandle(focusHandle);
- }
-
- return focusControl;
- }
-
///
/// Call this method on a view if you want to trigger data binding. For example when switching between views, closing a
/// view or when performing a save.
@@ -55,12 +40,6 @@
containerControl.ActiveControl = null; //unfocus current control, to force binding to happen
}
- public static IEnumerable GetChildControls(Control control)
- {
- var controls = control.Controls.Cast();
- return control.Controls.OfType().Concat(controls.SelectMany(GetChildControls));
- }
-
// Import GetFocus() from user32.dll
[DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.Winapi)]
internal static extern IntPtr GetFocus();
Index: src/Common/DelftTools.Controls.Swf/DataEditorGenerator/DataEditorGeneratorSwf.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/DelftTools.Controls.Swf/DataEditorGenerator/DataEditorGeneratorSwf.cs (.../DataEditorGeneratorSwf.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls.Swf/DataEditorGenerator/DataEditorGeneratorSwf.cs (.../DataEditorGeneratorSwf.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -14,7 +14,6 @@
public static class DataEditorGeneratorSwf
{
public const int LabelWidth = 150;
- public const int EditorWidth = FieldEditControlWidth;
public const int DefaultHeight = 26;
private const int FieldEditControlWidth = 125;
Index: src/Common/DelftTools.Controls/ITableViewPasteController.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/DelftTools.Controls/ITableViewPasteController.cs (.../ITableViewPasteController.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls/ITableViewPasteController.cs (.../ITableViewPasteController.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -10,28 +10,12 @@
///
event EventHandler> PasteFailed;
- ///
- /// Occurs when a paste finished.
- ///
- event EventHandler PasteFinished;
-
- ///
- /// Whether or not the controller is pasting.
- ///
- bool IsPasting { get; }
-
///
/// Gets or sets the paste behaviour value
///
- TableViewPasteBehaviourOptions PasteBehaviour { get; set; }
+ TableViewPasteBehaviourOptions PasteBehaviour { set; }
///
- /// Paste value string into tableview at current selection
- ///
- ///
- void PasteLines(string[] lines);
-
- ///
/// This method does most of the work. It Pastes Clipboard content to the table view.
///
void PasteClipboardContents();
Index: src/Common/DelftTools.Utils/Editing/IEditableObject.cs
===================================================================
diff -u -rfbe5d1ac043ae74461b82b0ab71c5388bfbbc58b -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/DelftTools.Utils/Editing/IEditableObject.cs (.../IEditableObject.cs) (revision fbe5d1ac043ae74461b82b0ab71c5388bfbbc58b)
+++ src/Common/DelftTools.Utils/Editing/IEditableObject.cs (.../IEditableObject.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -4,31 +4,17 @@
{
///
/// True if object is being edited (potentially in invalid state).
- /// Note: When IsEditing is set to true, must not be null.
- /// Note: When IsEditing is set to false, must not be null.
///
bool IsEditing { get; }
///
- /// Is set to true if the last edit action was cancelled.
- ///
- bool EditWasCancelled { get; }
-
- ///
- /// Current edit action.
- ///
- IEditAction CurrentEditAction { get; }
-
- ///
/// Start editing object with the named action.
- /// Note: Object must assign to before is changed.
///
///
void BeginEdit(IEditAction action);
///
/// Submit changes to the datasource.
- /// Postcondition: After call for last in stack, must be null and must be false.
///
void EndEdit();
Index: src/Common/DelftTools.Utils/INotifyPropertyChange.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/DelftTools.Utils/INotifyPropertyChange.cs (.../INotifyPropertyChange.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Utils/INotifyPropertyChange.cs (.../INotifyPropertyChange.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -4,12 +4,6 @@
{
public interface INotifyPropertyChange : INotifyPropertyChanged, INotifyPropertyChanging
{
- ///
- /// Indicates that object already has parent defined. This property is set to true after instance is added to the object tree where
- /// consistency checks are enabled (see also ).
- ///
- /// TODO: this property must be moved to IEntity.
- ///
- bool HasParent { get; set; }
+
}
}
\ No newline at end of file
Index: src/Common/NetTopologySuite/Geometries/GeometryCollection.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/NetTopologySuite/Geometries/GeometryCollection.cs (.../GeometryCollection.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/Geometries/GeometryCollection.cs (.../GeometryCollection.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -12,16 +12,11 @@
public class GeometryCollection : Geometry, IGeometryCollection
{
///
- /// Represents an empty GeometryCollection.
+ /// Internal representation of this GeometryCollection.
///
- public static readonly IGeometryCollection Empty = DefaultFactory.CreateGeometryCollection(null);
+ protected IGeometry[] geometries;
///
- /// Internal representation of this GeometryCollection.
- ///
- protected IGeometry[] geometries = null;
-
- ///
///
///
///
@@ -30,21 +25,6 @@
/// point. Elements may be empty Geometrys,
/// but not nulls.
///
- ///
- /// For create this is used a standard
- /// with == .
- ///
- public GeometryCollection(IGeometry[] geometries) : this(geometries, DefaultFactory) {}
-
- ///
- ///
- ///
- ///
- /// The Geometrys for this GeometryCollection,
- /// or null or an empty array to create the empty
- /// point. Elements may be empty Geometrys,
- /// but not nulls.
- ///
///
public GeometryCollection(IGeometry[] geometries, IGeometryFactory factory) : base(factory)
{
@@ -273,25 +253,6 @@
}
}
- ///
- /// Return true if all features in collection are of the same type.
- ///
- public bool IsHomogeneous
- {
- get
- {
- IGeometry baseGeom = Geometries[0];
- for (int i = 1; i < Geometries.Length; i++)
- {
- if (baseGeom.GetType() != Geometries[i].GetType())
- {
- return false;
- }
- }
- return true;
- }
- }
-
/* BEGIN ADDED BY MPAUL42: monoGIS team */
///
Index: src/Common/NetTopologySuite/NetTopologySuite.csproj
===================================================================
diff -u -rcbba848ecb8dc1dd4edf148beac44e7f7220fc08 -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/NetTopologySuite/NetTopologySuite.csproj (.../NetTopologySuite.csproj) (revision cbba848ecb8dc1dd4edf148beac44e7f7220fc08)
+++ src/Common/NetTopologySuite/NetTopologySuite.csproj (.../NetTopologySuite.csproj) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -298,17 +298,14 @@
-
-
-
@@ -330,7 +327,6 @@
-
Fisheye: Tag 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2 refers to a dead (removed) revision in file `src/Common/NetTopologySuite/Triangulate/IConstraintSplitPointFinder.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2 refers to a dead (removed) revision in file `src/Common/NetTopologySuite/Triangulate/QuadEdge/QuadEdgeTriangle.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2 refers to a dead (removed) revision in file `src/Common/NetTopologySuite/Triangulate/Segment.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2 refers to a dead (removed) revision in file `src/Common/NetTopologySuite/Triangulate/TriangulateSummary.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/Common/SharpMap.Api/Layers/ILabelLayer.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/SharpMap.Api/Layers/ILabelLayer.cs (.../ILabelLayer.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap.Api/Layers/ILabelLayer.cs (.../ILabelLayer.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -1,40 +1,11 @@
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
using DelftTools.Utils.Aop;
using SharpMap.Api.Delegates;
-using SharpMap.Api.Enums;
namespace SharpMap.Api.Layers
{
public interface ILabelLayer : ILayer
{
///
- /// Gets or sets labelling behavior on multipart geometries
- ///
- /// Default value is
- MultipartGeometryBehaviourEnum MultipartGeometryBehaviour { get; set; }
-
- ///
- /// Render whether smoothing (antialiasing) is applied to lines and curves and the edges of filled areas
- ///
- SmoothingMode SmoothingMode { get; set; }
-
- ///
- /// Specifies the quality of text rendering
- ///
- TextRenderingHint TextRenderingHint { get; set; }
-
- ///
- /// Gets or sets the rendering style of the label layer.
- ///
- ILabelStyle Style { get; set; }
-
- ///
- /// Gets or sets thematic settings for the layer. Set to null to ignore thematics
- ///
- ITheme Theme { get; set; }
-
- ///
/// Data column or expression where label text is extracted from.
///
///
@@ -59,18 +30,6 @@
///
GetLabelMethod LabelStringDelegate { get; set; }
- ///
- /// Data column from where the label rotation is derived.
- /// If this is empty, rotation will be zero, or aligned to a linestring.
- /// Rotation are in degrees (positive = clockwise).
- ///
- string RotationColumn { get; set; }
-
- ///
- /// A value indication the priority of the label in cases of label-collision detection
- ///
- int Priority { get; set; }
-
[Aggregation]
ILayer Parent { get; set; }
}
Index: src/Common/SharpMap/Data/FeatureDataRow.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/SharpMap/Data/FeatureDataRow.cs (.../FeatureDataRow.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Data/FeatureDataRow.cs (.../FeatureDataRow.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -9,7 +9,7 @@
/// Represents a row of data in a FeatureDataTable.
///
// [System.Diagnostics.DebuggerStepThrough()]
- [Serializable()]
+ [Serializable]
public class FeatureDataRow : DataRow, IFeature, IComparable
{
private IGeometry geometry;
@@ -18,8 +18,6 @@
internal FeatureDataRow(DataRowBuilder rb) : base(rb) {}
- public virtual long Id { get; set; }
-
///
/// The geometry of the current feature
///
@@ -51,28 +49,6 @@
}
}
- public virtual Type GetEntityType()
- {
- return GetType();
- }
-
- ///
- /// Returns true of the geometry is null
- ///
- ///
- public bool IsFeatureGeometryNull()
- {
- return Geometry == null;
- }
-
- ///
- /// Sets the geometry column to null
- ///
- public void SetFeatureGeometryNull()
- {
- Geometry = null;
- }
-
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj))
Index: src/Common/SharpMap/Rendering/Thematics/ThemeHelper.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/Common/SharpMap/Rendering/Thematics/ThemeHelper.cs (.../ThemeHelper.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Rendering/Thematics/ThemeHelper.cs (.../ThemeHelper.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -1,80 +1,11 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
using SharpMap.Api;
using SharpMap.Styles;
namespace SharpMap.Rendering.Thematics
{
- public class ThemeHelper
+ public static class ThemeHelper
{
- ///
- /// Used for caching, optimization.
- ///
- ///
- ///
- ///
- ///
- public static void RefreshCachedFillColorsAndValues(ITheme theme, List colors, ArrayList values)
- {
- //use sorted dictionary to make sure values and colors are in the correct order
- var themeItemsDictionary = new SortedDictionary();
- var categorialTheme = theme as CategorialTheme;
- var gradientTheme = theme as GradientTheme;
- var quantityTheme = theme as QuantityTheme;
-
- if (categorialTheme != null)
- {
- foreach (CategorialThemeItem item in categorialTheme.ThemeItems)
- {
- themeItemsDictionary.Add(item, item.Value);
- }
- }
- else if (quantityTheme != null)
- {
- if (values.Count > 0)
- {
- colors.Add(ExtractFillColorFromThemeItem(quantityTheme.ThemeItems[0]));
- values.Add(Convert.ChangeType(((QuantityThemeItem) quantityTheme.ThemeItems[0]).Interval.Min,
- typeof(T)));
- }
- foreach (QuantityThemeItem item in quantityTheme.ThemeItems)
- {
- themeItemsDictionary[item] = item.Interval.Max;
- }
- }
- else if (gradientTheme != null)
- {
- double currentMax = gradientTheme.Min;
- double totalWidth = gradientTheme.Max - gradientTheme.Min;
- double widthPerClass = totalWidth/values.Count;
-
- if (values.Count > 0)
- {
- colors.Add(ExtractFillColorFromThemeItem(gradientTheme.ThemeItems[0]));
- values.Add(Convert.ChangeType(gradientTheme.Min, typeof(T)));
- }
- for (int i = 0; i < values.Count; i++)
- {
- currentMax += widthPerClass;
- //VectorStyle style = (VectorStyle) gradientTheme.GetStyle(currentMax);
-
- themeItemsDictionary.Add(gradientTheme.ThemeItems[i], Convert.ChangeType(currentMax, values[0].GetType()));
- }
- }
-
- foreach (IThemeItem item in themeItemsDictionary.Keys)
- {
- Color color = ExtractFillColorFromThemeItem(item);
- if (!colors.Contains(color))
- {
- colors.Add(color);
- values.Add(Convert.ChangeType(themeItemsDictionary[item], typeof(T)));
- }
- }
- }
-
public static Color ExtractFillColorFromThemeItem(IThemeItem item)
{
Color c = Color.Empty;
Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs
===================================================================
diff -u -rfe0228504fc61d6af56be4c0f6a8fc28690f9064 -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs (.../MapAddLayerCommand.cs) (revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
+++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs (.../MapAddLayerCommand.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -16,14 +16,6 @@
private IEnumerable addedLayers;
- public IEnumerable AddedLayers
- {
- get
- {
- return addedLayers.Any() ? addedLayers : Enumerable.Empty();
- }
- }
-
///
/// Shows a file dialog for adding layers
///
Index: test/Common/DelftTools.Utils.Tests/Collections/Generic/EventedListTest.cs
===================================================================
diff -u -rcbba848ecb8dc1dd4edf148beac44e7f7220fc08 -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- test/Common/DelftTools.Utils.Tests/Collections/Generic/EventedListTest.cs (.../EventedListTest.cs) (revision cbba848ecb8dc1dd4edf148beac44e7f7220fc08)
+++ test/Common/DelftTools.Utils.Tests/Collections/Generic/EventedListTest.cs (.../EventedListTest.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -242,8 +242,6 @@
throw new NotImplementedException();
}
}
-
- bool INotifyPropertyChange.HasParent { get; set; }
}
private class MockClassWithTwoProperties : INotifyPropertyChange
@@ -271,8 +269,6 @@
}
}
}
-
- bool INotifyPropertyChange.HasParent { get; set; }
}
}
}
\ No newline at end of file
Index: test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs
===================================================================
diff -u -r97ebda114265b9ccdc6cf73bab8312e5422e3de4 -r8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2
--- test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision 97ebda114265b9ccdc6cf73bab8312e5422e3de4)
+++ test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision 8ffcee6dc5fb975b590ae4e15123edf0acf6a8b2)
@@ -326,8 +326,6 @@
[ReadOnly(true)] //one static property
public string Description { get; set; }
- bool INotifyPropertyChange.HasParent { get; set; }
-
///
/// Method checks if propertyName property is read-only (setter can be used).
///