Skip to content

Fixed ToolWindow zoom when in Pan mode #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FObermaier merged 2 commits into from
Feb 16, 2017
Merged

Fixed ToolWindow zoom when in Pan mode #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee2fde
Fixed WPF example layer changed handler
AleksandarDev Dec 1, 2016
1928671
Update MapBox.cs
AleksandarDev Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions SharpMap.UI.WPF/SharpMapHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,29 +403,33 @@ private void OnMapLayerChanged(object sender, NotifyCollectionChangedEventArgs e
switch (e.Action)
{
case NotifyCollectionChangedAction.Add:
{
var layers = sender as ObservableCollection<ILayer>;
if (layers != null)
{
foreach (var layer in layers.Where(layer => !_mapBox.Map.Layers.Contains(layer)))
var layers = e.NewItems;
if (layers != null)
{
_mapBox.Map.Layers.Add(layer);
foreach (var layer in layers)
{
var castedLayer = layer as ILayer;
if (castedLayer != null && MapBox.Map.Layers.All(l => l.LayerName != castedLayer.LayerName))
MapBox.Map.Layers.Add(castedLayer);
}
}
}
}

break;
case NotifyCollectionChangedAction.Remove:
{
var layers = sender as ObservableCollection<ILayer>;
if (layers != null)
{
foreach (var layer in layers.Where(layer => _mapBox.Map.Layers.Contains(layer)))
var layers = e.OldItems;
if (layers != null)
{
_mapBox.Map.Layers.Remove(layer);
foreach (var layer in layers)
{
var castedLayer = layer as ILayer;
if (castedLayer != null && MapBox.Map.Layers.Any(l => l.LayerName == castedLayer.LayerName))
MapBox.Map.Layers.Remove(castedLayer);
}
}
}
}

break;
case NotifyCollectionChangedAction.Reset:
Expand Down
13 changes: 10 additions & 3 deletions SharpMap.UI/Forms/MapBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,10 +2256,17 @@ protected override void OnMouseUp(MouseEventArgs e)
{
if (_rectangle.Width > 0 && _rectangle.Height > 0)
{
var zoomWindowStartPoint = _dragStartPoint;
var zoomWindowEndPoint = new PointF(e.X, e.Y);

Coordinate lowerLeft;
Coordinate upperRight;
GetBounds(_map.ImageToWorld(_dragStartPoint), _map.ImageToWorld(_dragEndPoint),
out lowerLeft, out upperRight);
GetBounds(
_map.ImageToWorld(zoomWindowStartPoint),
_map.ImageToWorld(zoomWindowEndPoint),
out lowerLeft,
out upperRight);

_dragEndPoint.X = 0;
_dragEndPoint.Y = 0;

Expand Down Expand Up @@ -2551,4 +2558,4 @@ static public bool PutEnhMetafileOnClipboard(IntPtr hWnd, Metafile mf)
}
}
#endif
}
}