Skip to content

Commit 940d50c

Browse files
committed
Merge pull request #5 from Esri/v.next
V.next
2 parents a0bb149 + 6d58847 commit 940d50c

30 files changed

+55
-554
lines changed

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/ArcGISRuntimeSDKDotNet_DesktopSamples.csproj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
<Compile Include="Samples\GeoprocessingTasks\Viewshed.xaml.cs">
224224
<DependentUpon>Viewshed.xaml</DependentUpon>
225225
</Compile>
226-
<Compile Include="Samples\GraphicsLayers\MovePoints.xaml.cs">
226+
<Compile Include="Samples\Editing\MovePoints.xaml.cs">
227227
<DependentUpon>MovePoints.xaml</DependentUpon>
228228
</Compile>
229229
<Compile Include="Samples\GraphicsLayers\AddInteractively.xaml.cs">
@@ -253,9 +253,6 @@
253253
<Compile Include="Samples\GraphicsLayers\GraphicsSourceSample.xaml.cs">
254254
<DependentUpon>GraphicsSourceSample.xaml</DependentUpon>
255255
</Compile>
256-
<Compile Include="Samples\GraphicsLayers\SmoothGraphicAnimation.xaml.cs">
257-
<DependentUpon>SmoothGraphicAnimation.xaml</DependentUpon>
258-
</Compile>
259256
<Compile Include="Samples\ImageryTasks\ComputeClassStatistics.xaml.cs">
260257
<DependentUpon>ComputeClassStatistics.xaml</DependentUpon>
261258
</Compile>
@@ -651,7 +648,7 @@
651648
<Generator>MSBuild:Compile</Generator>
652649
<SubType>Designer</SubType>
653650
</Page>
654-
<Page Include="Samples\GraphicsLayers\MovePoints.xaml">
651+
<Page Include="Samples\Editing\MovePoints.xaml">
655652
<Generator>MSBuild:Compile</Generator>
656653
<SubType>Designer</SubType>
657654
</Page>
@@ -691,10 +688,6 @@
691688
<Generator>MSBuild:Compile</Generator>
692689
<SubType>Designer</SubType>
693690
</Page>
694-
<Page Include="Samples\GraphicsLayers\SmoothGraphicAnimation.xaml">
695-
<Generator>MSBuild:Compile</Generator>
696-
<SubType>Designer</SubType>
697-
</Page>
698691
<Page Include="Samples\ImageryTasks\ComputeClassStatistics.xaml">
699692
<Generator>MSBuild:Compile</Generator>
700693
<SubType>Designer</SubType>

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Assets/SampleDescriptions.xml

Lines changed: 4 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/DynamicServiceLayers/ArcGISDynamicMapServiceLayerLocalSample.xaml.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ namespace ArcGISRuntimeSDKDotNet_DesktopSamples.Samples
1616
/// <subcategory>Dynamic Service Layers</subcategory>
1717
public partial class ArcGISDynamicMapServiceLayerLocalSample : UserControl
1818
{
19-
20-
2119
/// <summary>
2220
/// Initializes a new instance of the <see cref="ArcGISDynamicMapServiceLayerLocalSample"/> class.
2321
/// </summary>
@@ -27,7 +25,7 @@ public ArcGISDynamicMapServiceLayerLocalSample()
2725

2826
InitializeComponent();
2927

30-
CreateLocalServiceAndDynamicLayer();
28+
var _ = CreateLocalServiceAndDynamicLayer();
3129
}
3230

3331
public async Task CreateLocalServiceAndDynamicLayer()
@@ -44,7 +42,7 @@ public async Task CreateLocalServiceAndDynamicLayer()
4442
ServiceUri = localMapService.UrlMapService,
4543
};
4644

47-
MyMapView.Map.Layers.Add(arcGISDynamicMapServiceLayer);
45+
MyMapView.Map.Layers.Add(arcGISDynamicMapServiceLayer);
4846
}
4947
catch (Exception ex)
5048
{

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/MovePoints.xaml renamed to src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/Editing/MovePoints.xaml

File renamed without changes.

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/MovePoints.xaml.cs renamed to src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/Editing/MovePoints.xaml.cs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
using Esri.ArcGISRuntime.Controls;
22
using Esri.ArcGISRuntime.Geometry;
33
using Esri.ArcGISRuntime.Layers;
4-
using Esri.ArcGISRuntime.Symbology;
54
using System;
6-
using System.ComponentModel;
7-
using System.Threading.Tasks;
8-
using System.Windows;
95
using System.Windows.Controls;
106

117
namespace ArcGISRuntimeSDKDotNet_DesktopSamples.Samples
128
{
139
/// <summary>
14-
/// Move point graphics around using hittesting and mouse move.
15-
/// </summary>
16-
/// <title>Move point graphics interactively</title>
17-
/// <category>Layers</category>
18-
/// <subcategory>Graphics Layers</subcategory>
19-
public partial class MovePoints : UserControl
10+
/// Demonstrates one method of moving graphic points on the map.
11+
/// </summary>
12+
/// <title>Move Points</title>
13+
/// <category>Editing</category>
14+
public partial class MovePoints : UserControl
2015
{
21-
2216
public MovePoints()
2317
{
2418
InitializeComponent();

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GeocodingTasks/GeocodeFullAddressInput.xaml.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public GeocodeFullAddressInput()
111111

112112
_candidateAddressesGraphicsLayer = map1.Layers["CandidateAddressesGraphicsLayer"] as GraphicsLayer;
113113

114-
SetSimpleRendererSymbols();
114+
var _ = SetSimpleRendererSymbols();
115115
}
116116

117117
private async Task SetSimpleRendererSymbols()
@@ -132,7 +132,7 @@ private async Task SetSimpleRendererSymbols()
132132
_candidateAddressesGraphicsLayer.Renderer = findResultRenderer;
133133
}
134134

135-
private async Task SetupLocator()
135+
private void SetupLocator()
136136
{
137137
if (!IsOnline)
138138
{
@@ -142,7 +142,6 @@ private async Task SetupLocator()
142142
{
143143
_locatorTask = new OnlineLocatorTask(new Uri("http://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer"), string.Empty);
144144
}
145-
146145
}
147146

148147
private async void FindButton_Click(object sender, RoutedEventArgs e)

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GeocodingTasks/GeocodeSingleLineInput.xaml.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,11 @@ public GeocodeSingleLineInput()
9393

9494
_candidateAddressesGraphicsLayer = map1.Layers["CandidateAddressesGraphicsLayer"] as GraphicsLayer;
9595

96-
SetSimpleRendererSymbols();
96+
var _ = SetSimpleRendererSymbols();
9797
}
9898

99-
10099
private async Task SetSimpleRendererSymbols()
101100
{
102-
103101
PictureMarkerSymbol findResultMarkerSymbol = new PictureMarkerSymbol()
104102
{
105103
Width = 48,
@@ -115,7 +113,7 @@ private async Task SetSimpleRendererSymbols()
115113
_candidateAddressesGraphicsLayer.Renderer = findResultRenderer;
116114
}
117115

118-
private async Task SetupLocator()
116+
private void SetupLocator()
119117
{
120118
if (!IsOnline)
121119
{
@@ -129,7 +127,6 @@ private async Task SetupLocator()
129127

130128
private async void FindButton_Click(object sender, RoutedEventArgs e)
131129
{
132-
133130
_candidateAddressesGraphicsLayer.Graphics.Clear();
134131

135132
string text = SearchTextBox.Text;

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/GraphicsLayerSample.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace ArcGISRuntimeSDKDotNet_DesktopSamples.Samples
99
/// <summary>
1010
/// This sample demonstrates how to add a GraphicsLayer with Graphics and Symbols to the map in XAML. The sample also shows how to add Polyline graphics to a GraphicsLayer from the code-behind.
1111
/// </summary>
12-
/// <title>Graphics Layer Sample</title>
12+
/// <title>Graphics Layer</title>
1313
/// <category>Layers</category>
1414
/// <subcategory>Graphics Layers</subcategory>
1515
public partial class GraphicsLayerSample : UserControl

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/SmoothGraphicAnimation.xaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/SmoothGraphicAnimation.xaml.cs

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)