Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.203" PrivateAssets="all" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" PrivateAssets="all" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.24.0.138807" PrivateAssets="all" />
</ItemGroup>
</Project>
18 changes: 6 additions & 12 deletions samples/Videra.InteractionSample/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -280,24 +280,18 @@ private void ApplySelectionRequest(SelectionRequestedEventArgs e)
selected = e.ObjectIds.Distinct().ToList();
break;
case VideraSelectionOperation.Add:
foreach (var objectId in e.ObjectIds)
{
if (!selected.Contains(objectId))
{
selected.Add(objectId);
}
}

selected.AddRange(e.ObjectIds.Where(objectId => !selected.Contains(objectId)));
break;
case VideraSelectionOperation.Toggle:
foreach (var objectId in e.ObjectIds)
selected = e.ObjectIds.Aggregate(selected, (current, objectId) =>
{
if (!selected.Remove(objectId))
if (!current.Remove(objectId))
{
selected.Add(objectId);
current.Add(objectId);
}
}

return current;
});
break;
default:
throw new ArgumentOutOfRangeException(nameof(e), e.Operation, "Unknown selection operation.");
Expand Down
7 changes: 2 additions & 5 deletions src/Videra.SurfaceCharts.Core/ScatterChartData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,9 @@ private static int ValidateAndCountPoints(
}

totalCount += scatterSeries.Points.Count;
foreach (var point in scatterSeries.Points)
if (scatterSeries.Points.Any(point => !metadata.Contains(point)))
{
if (!metadata.Contains(point))
{
throw new ArgumentException("Scatter points must remain within the declared metadata bounds.", nameof(series));
}
throw new ArgumentException("Scatter points must remain within the declared metadata bounds.", nameof(series));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,9 @@ private void DisposeTileResources()

private void EnsureResidentTileResources(SurfaceChartRenderState state)
{
foreach (var residentTile in state.ResidentTiles)
foreach (var residentTile in state.ResidentTiles.Where(residentTile => !_tileResources.ContainsKey(residentTile.Key)))
{
if (!_tileResources.ContainsKey(residentTile.Key))
{
AddOrReplaceTileResources(residentTile, state);
}
AddOrReplaceTileResources(residentTile, state);
}
}

Expand Down
11 changes: 4 additions & 7 deletions src/Videra.SurfaceCharts.Rendering/SurfaceChartRenderState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,11 @@ private SurfaceChartRenderChangeSet ApplyIncrementalChanges(SurfaceChartRenderIn
var addedKeys = new List<SurfaceTileKey>();
var colorMapChanged = !ReferenceEquals(_colorMap, inputs.ColorMap);

foreach (var existingKey in _residentTiles.Keys.ToArray())
foreach (var existingKey in _residentTiles.Keys.Where(existingKey => !incomingTiles.ContainsKey(existingKey)).ToArray())
{
if (!incomingTiles.ContainsKey(existingKey))
{
_residentTiles.Remove(existingKey);
_cachedResidentTiles = null;
removedKeys.Add(existingKey);
}
_residentTiles.Remove(existingKey);
_cachedResidentTiles = null;
removedKeys.Add(existingKey);
}

foreach (var tile in inputs.LoadedTiles)
Expand Down
Loading