mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2025-12-06 07:12:04 +01:00
Version 4.10.0: Set TargetFrameworkVersion to 4.6.2
This commit is contained in:
parent
f281e27d1a
commit
2d7a0b99e3
|
|
@ -9,7 +9,7 @@
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>MapControl.Caching</RootNamespace>
|
<RootNamespace>MapControl.Caching</RootNamespace>
|
||||||
<AssemblyName>FileDbCache.WPF</AssemblyName>
|
<AssemblyName>FileDbCache.WPF</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>MapControl</RootNamespace>
|
<RootNamespace>MapControl</RootNamespace>
|
||||||
<AssemblyName>MBTiles.WPF</AssemblyName>
|
<AssemblyName>MBTiles.WPF</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<NuGetPackageImportStamp>
|
<NuGetPackageImportStamp>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>MapControl</RootNamespace>
|
<RootNamespace>MapControl</RootNamespace>
|
||||||
<AssemblyName>MapControl.WPF</AssemblyName>
|
<AssemblyName>MapControl.WPF</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
|
|
||||||
|
|
@ -66,13 +66,14 @@ namespace MapControl
|
||||||
var latLabels = new List<Label>((int)((boundingBox.North - latLabelStart) / lineDistance) + 1);
|
var latLabels = new List<Label>((int)((boundingBox.North - latLabelStart) / lineDistance) + 1);
|
||||||
var lonLabels = new List<Label>((int)((boundingBox.East - lonLabelStart) / lineDistance) + 1);
|
var lonLabels = new List<Label>((int)((boundingBox.East - lonLabelStart) / lineDistance) + 1);
|
||||||
var typeface = new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
|
var typeface = new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
|
||||||
|
var pixelsPerDpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
|
||||||
var pen = CreatePen();
|
var pen = CreatePen();
|
||||||
|
|
||||||
for (var lat = latLabelStart; lat <= boundingBox.North; lat += lineDistance)
|
for (var lat = latLabelStart; lat <= boundingBox.North; lat += lineDistance)
|
||||||
{
|
{
|
||||||
latLabels.Add(new Label(lat, new FormattedText(
|
latLabels.Add(new Label(lat, new FormattedText(
|
||||||
GetLabelText(lat, labelFormat, "NS"),
|
GetLabelText(lat, labelFormat, "NS"),
|
||||||
CultureInfo.InvariantCulture, FlowDirection.LeftToRight, typeface, FontSize, Foreground, 1d)));
|
CultureInfo.InvariantCulture, FlowDirection.LeftToRight, typeface, FontSize, Foreground, pixelsPerDpi)));
|
||||||
|
|
||||||
drawingContext.DrawLine(pen,
|
drawingContext.DrawLine(pen,
|
||||||
projection.LocationToViewportPoint(new Location(lat, boundingBox.West)),
|
projection.LocationToViewportPoint(new Location(lat, boundingBox.West)),
|
||||||
|
|
@ -83,7 +84,7 @@ namespace MapControl
|
||||||
{
|
{
|
||||||
lonLabels.Add(new Label(lon, new FormattedText(
|
lonLabels.Add(new Label(lon, new FormattedText(
|
||||||
GetLabelText(Location.NormalizeLongitude(lon), labelFormat, "EW"),
|
GetLabelText(Location.NormalizeLongitude(lon), labelFormat, "EW"),
|
||||||
CultureInfo.InvariantCulture, FlowDirection.LeftToRight, typeface, FontSize, Foreground, 1d)));
|
CultureInfo.InvariantCulture, FlowDirection.LeftToRight, typeface, FontSize, Foreground, pixelsPerDpi)));
|
||||||
|
|
||||||
drawingContext.DrawLine(pen,
|
drawingContext.DrawLine(pen,
|
||||||
projection.LocationToViewportPoint(new Location(boundingBox.South, lon)),
|
projection.LocationToViewportPoint(new Location(boundingBox.South, lon)),
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>MapControl.Projections</RootNamespace>
|
<RootNamespace>MapControl.Projections</RootNamespace>
|
||||||
<AssemblyName>MapProjections.WPF</AssemblyName>
|
<AssemblyName>MapProjections.WPF</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue