Skip to content

Commit ba35d5d

Browse files
BrianDXBrianDX
committed
update 18.2
1 parent 3cab3e9 commit ba35d5d

17 files changed

+241
-236
lines changed

‎CS/WpfDashboard_LinkedInteractivity/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
55
</startup>
66
</configuration>

‎CS/WpfDashboard_LinkedInteractivity/Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CS/WpfDashboard_LinkedInteractivity/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CS/WpfDashboard_LinkedInteractivity/WpfDashboard_LinkedInteractivity.csproj

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WpfDashboard_LinkedInteractivity</RootNamespace>
1111
<AssemblyName>WpfDashboard_LinkedInteractivity</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
@@ -25,6 +25,7 @@
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
2727
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
<Prefer32Bit>false</Prefer32Bit>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,75 +35,76 @@
3435
<DefineConstants>TRACE</DefineConstants>
3536
<ErrorReport>prompt</ErrorReport>
3637
<WarningLevel>4</WarningLevel>
38+
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<ItemGroup>
39-
<Reference Include="DevExpress.Sparkline.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
41+
<Reference Include="DevExpress.Sparkline.v18.2.Core">
4042
<SpecificVersion>False</SpecificVersion>
4143
</Reference>
42-
<Reference Include="DevExpress.Dashboard.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
44+
<Reference Include="DevExpress.Dashboard.v18.2.Core">
4345
<SpecificVersion>False</SpecificVersion>
4446
</Reference>
45-
<Reference Include="DevExpress.Dashboard.v18.1.Wpf, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
47+
<Reference Include="DevExpress.Dashboard.v18.2.Wpf">
4648
<SpecificVersion>False</SpecificVersion>
4749
</Reference>
48-
<Reference Include="DevExpress.Data.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
50+
<Reference Include="DevExpress.Data.v18.2">
4951
<SpecificVersion>False</SpecificVersion>
5052
</Reference>
51-
<Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
53+
<Reference Include="DevExpress.DataAccess.v18.2">
5254
<SpecificVersion>False</SpecificVersion>
5355
</Reference>
54-
<Reference Include="DevExpress.Map.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
56+
<Reference Include="DevExpress.Map.v18.2.Core">
5557
<SpecificVersion>False</SpecificVersion>
5658
</Reference>
57-
<Reference Include="DevExpress.Mvvm.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
59+
<Reference Include="DevExpress.Mvvm.v18.2">
5860
<SpecificVersion>False</SpecificVersion>
5961
</Reference>
60-
<Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
62+
<Reference Include="DevExpress.Printing.v18.2.Core">
6163
<SpecificVersion>False</SpecificVersion>
6264
</Reference>
63-
<Reference Include="DevExpress.PivotGrid.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
65+
<Reference Include="DevExpress.PivotGrid.v18.2.Core">
6466
<SpecificVersion>False</SpecificVersion>
6567
</Reference>
66-
<Reference Include="DevExpress.Office.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
68+
<Reference Include="DevExpress.Office.v18.2.Core">
6769
<SpecificVersion>False</SpecificVersion>
6870
</Reference>
69-
<Reference Include="DevExpress.RichEdit.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
71+
<Reference Include="DevExpress.RichEdit.v18.2.Core">
7072
<SpecificVersion>False</SpecificVersion>
7173
</Reference>
72-
<Reference Include="DevExpress.Xpf.Charts.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
74+
<Reference Include="DevExpress.Xpf.Charts.v18.2">
7375
<SpecificVersion>False</SpecificVersion>
7476
</Reference>
75-
<Reference Include="DevExpress.Xpf.Core.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
77+
<Reference Include="DevExpress.Xpf.Core.v18.2">
7678
<SpecificVersion>False</SpecificVersion>
7779
</Reference>
78-
<Reference Include="DevExpress.Xpf.Dashboard.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
80+
<Reference Include="DevExpress.Xpf.Dashboard.v18.2">
7981
<SpecificVersion>False</SpecificVersion>
8082
</Reference>
81-
<Reference Include="DevExpress.Xpf.Docking.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
83+
<Reference Include="DevExpress.Xpf.Docking.v18.2">
8284
<SpecificVersion>False</SpecificVersion>
8385
</Reference>
84-
<Reference Include="DevExpress.Xpf.Printing.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
86+
<Reference Include="DevExpress.Xpf.Printing.v18.2">
8587
<SpecificVersion>False</SpecificVersion>
8688
</Reference>
87-
<Reference Include="DevExpress.Xpf.Grid.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
89+
<Reference Include="DevExpress.Xpf.Grid.v18.2">
8890
<SpecificVersion>False</SpecificVersion>
8991
</Reference>
90-
<Reference Include="DevExpress.Xpf.Grid.v18.1.Core, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
92+
<Reference Include="DevExpress.Xpf.Grid.v18.2.Core">
9193
<SpecificVersion>False</SpecificVersion>
9294
</Reference>
93-
<Reference Include="DevExpress.Xpf.Map.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
95+
<Reference Include="DevExpress.Xpf.Map.v18.2">
9496
<SpecificVersion>False</SpecificVersion>
9597
</Reference>
96-
<Reference Include="DevExpress.Xpf.PivotGrid.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
98+
<Reference Include="DevExpress.Xpf.PivotGrid.v18.2">
9799
<SpecificVersion>False</SpecificVersion>
98100
</Reference>
99-
<Reference Include="DevExpress.Xpf.PropertyGrid.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
101+
<Reference Include="DevExpress.Xpf.PropertyGrid.v18.2">
100102
<SpecificVersion>False</SpecificVersion>
101103
</Reference>
102-
<Reference Include="DevExpress.Xpf.RichEdit.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
104+
<Reference Include="DevExpress.Xpf.RichEdit.v18.2">
103105
<SpecificVersion>False</SpecificVersion>
104106
</Reference>
105-
<Reference Include="DevExpress.Xpf.TreeMap.v18.1, Version=18.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
107+
<Reference Include="DevExpress.Xpf.TreeMap.v18.2">
106108
<SpecificVersion>False</SpecificVersion>
107109
</Reference>
108110
<Reference Include="System" />
@@ -193,4 +195,4 @@
193195
<Target Name="AfterBuild">
194196
</Target>
195197
-->
196-
</Project>
198+
</Project>

‎VB/WpfDashboard_LinkedInteractivity.sln

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio 14
34
VisualStudioVersion = 14.0.25420.1
45
MinimumVisualStudioVersion = 10.0.40219.1

‎VB/WpfDashboard_LinkedInteractivity/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
55
</startup>
66
</configuration>

‎VB/WpfDashboard_LinkedInteractivity/Application.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Application x:Class="WpfDashboard_LinkedInteractivity.App"
1+
<Application x:Class="WpfDashboard_LinkedInteractivity.App"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:local="clr-namespace:WpfDashboard_LinkedInteractivity"

‎VB/WpfDashboard_LinkedInteractivity/Application.xaml.vb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Imports System.Threading.Tasks
77
Imports System.Windows
88

99
Namespace WpfDashboard_LinkedInteractivity
10-
''' <summary>
11-
''' Interaction logic for App.xaml
12-
''' </summary>
13-
Partial Public Class App
14-
Inherits Application
10+
''' <summary>
11+
''' Interaction logic for App.xaml
12+
''' </summary>
13+
Partial Public Class App
14+
Inherits Application
1515

16-
End Class
16+
End Class
1717
End Namespace

‎VB/WpfDashboard_LinkedInteractivity/ChildWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Window
1+
<Window
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

‎VB/WpfDashboard_LinkedInteractivity/ChildWindow.xaml.vb

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,80 +6,80 @@ Imports System.Linq
66
Imports System.Windows
77

88
Namespace WpfDashboard_LinkedInteractivity
9-
''' <summary>
10-
''' Interaction logic for ChildWindow.xaml
11-
''' </summary>
12-
Partial Public Class ChildWindow
13-
Inherits Window
9+
''' <summary>
10+
''' Interaction logic for ChildWindow.xaml
11+
''' </summary>
12+
Partial Public Class ChildWindow
13+
Inherits Window
1414

15-
Private dControl As DashboardControl
15+
Private dControl As DashboardControl
1616

17-
Public Sub New(ByVal dControl As DashboardControl)
18-
InitializeComponent()
19-
Me.dControl = dControl
20-
End Sub
21-
Private Sub Window_Loaded(ByVal sender As Object, ByVal e As RoutedEventArgs)
22-
childDashboardControl.LoadDashboard("Data\DashboardChild.xml")
23-
Dim dParentControl As DashboardControl = Me.dControl
24-
AddHandler dParentControl.MasterFilterSet, AddressOf DControl_MasterFilterSet
25-
AddHandler dParentControl.MasterFilterCleared, AddressOf DControl_MasterFilterCleared
26-
AddHandler dParentControl.DrillDownPerformed, AddressOf DControl_DrillDownPerformed
27-
AddHandler dParentControl.DrillUpPerformed, AddressOf DControl_DrillUpPerformed
28-
End Sub
17+
Public Sub New(ByVal dControl As DashboardControl)
18+
InitializeComponent()
19+
Me.dControl = dControl
20+
End Sub
21+
Private Sub Window_Loaded(ByVal sender As Object, ByVal e As RoutedEventArgs)
22+
childDashboardControl.LoadDashboard("Data\DashboardChild.xml")
23+
Dim dParentControl As DashboardControl = Me.dControl
24+
AddHandler dParentControl.MasterFilterSet, AddressOf DControl_MasterFilterSet
25+
AddHandler dParentControl.MasterFilterCleared, AddressOf DControl_MasterFilterCleared
26+
AddHandler dParentControl.DrillDownPerformed, AddressOf DControl_DrillDownPerformed
27+
AddHandler dParentControl.DrillUpPerformed, AddressOf DControl_DrillUpPerformed
28+
End Sub
2929

30-
Private Function HasDashboardItem(ByVal itemName As String) As Boolean
31-
Return childDashboardControl.Dashboard.Items.Select(Function(i) i.ComponentName).Contains(itemName)
32-
End Function
30+
Private Function HasDashboardItem(ByVal itemName As String) As Boolean
31+
Return childDashboardControl.Dashboard.Items.Select(Function(i) i.ComponentName).Contains(itemName)
32+
End Function
3333

34-
Private Sub DControl_MasterFilterSet(ByVal sender As Object, ByVal e As MasterFilterSetEventArgs)
35-
If HasDashboardItem(e.DashboardItemName) Then
36-
Dim itemName As String = e.DashboardItemName
37-
If e.SelectedValues IsNot Nothing Then
38-
childDashboardControl.SetMasterFilter(itemName, e.SelectedValues)
39-
End If
40-
If e.SelectedRange IsNot Nothing Then
41-
childDashboardControl.SetRange(itemName, e.SelectedRange)
42-
End If
43-
End If
44-
End Sub
45-
Private Sub DControl_MasterFilterCleared(ByVal sender As Object, ByVal e As MasterFilterClearedEventArgs)
46-
If HasDashboardItem(e.DashboardItemName) Then
47-
Dim itemName As String = e.DashboardItemName
48-
If childDashboardControl.CanClearMasterFilter(itemName) Then
49-
childDashboardControl.ClearMasterFilter(itemName)
50-
End If
51-
End If
52-
End Sub
53-
Private Sub DControl_DrillDownPerformed(ByVal sender As Object, ByVal e As DrillActionEventArgs)
54-
If HasDashboardItem(e.DashboardItemName) Then
55-
Dim itemName As String = e.DashboardItemName
56-
Dim row As DashboardDataRow = e.Values(0)
57-
Dim value As Object = row(row.Length - 1)
34+
Private Sub DControl_MasterFilterSet(ByVal sender As Object, ByVal e As MasterFilterSetEventArgs)
35+
If HasDashboardItem(e.DashboardItemName) Then
36+
Dim itemName As String = e.DashboardItemName
37+
If e.SelectedValues IsNot Nothing Then
38+
childDashboardControl.SetMasterFilter(itemName, e.SelectedValues)
39+
End If
40+
If e.SelectedRange IsNot Nothing Then
41+
childDashboardControl.SetRange(itemName, e.SelectedRange)
42+
End If
43+
End If
44+
End Sub
45+
Private Sub DControl_MasterFilterCleared(ByVal sender As Object, ByVal e As MasterFilterClearedEventArgs)
46+
If HasDashboardItem(e.DashboardItemName) Then
47+
Dim itemName As String = e.DashboardItemName
48+
If childDashboardControl.CanClearMasterFilter(itemName) Then
49+
childDashboardControl.ClearMasterFilter(itemName)
50+
End If
51+
End If
52+
End Sub
53+
Private Sub DControl_DrillDownPerformed(ByVal sender As Object, ByVal e As DrillActionEventArgs)
54+
If HasDashboardItem(e.DashboardItemName) Then
55+
Dim itemName As String = e.DashboardItemName
56+
Dim row As DashboardDataRow = e.Values(0)
57+
Dim value As Object = row(row.Length - 1)
5858

59-
Dim tuple As IList(Of AxisPointTuple) = childDashboardControl.GetAvailableDrillDownValues(itemName)
60-
Dim availableValues As IEnumerable(Of Object) = tuple.Select(Function(t) t.GetAxisPoint().UniqueValue)
61-
If availableValues.Contains(value) Then
62-
childDashboardControl.PerformDrillDown(e.DashboardItemName, value)
63-
End If
64-
End If
65-
End Sub
66-
Private Sub DControl_DrillUpPerformed(ByVal sender As Object, ByVal e As DrillActionEventArgs)
67-
If HasDashboardItem(e.DashboardItemName) Then
68-
Dim itemName As String = e.DashboardItemName
69-
Dim level As Integer = e.DrillDownLevel
70-
Dim tuple As AxisPointTuple = childDashboardControl.GetCurrentDrillDownValues(itemName)
71-
If tuple IsNot Nothing Then
72-
Dim point As AxisPoint = childDashboardControl.GetCurrentDrillDownValues(itemName).GetAxisPoint()
73-
Dim l As Integer = 0
74-
Do While point.Parent IsNot Nothing
75-
l += 1
76-
point = point.Parent
77-
Loop
78-
If (level + 1) = l AndAlso childDashboardControl.CanPerformDrillUp(itemName) Then
79-
childDashboardControl.PerformDrillUp(itemName)
80-
End If
81-
End If
82-
End If
83-
End Sub
84-
End Class
59+
Dim tuple As IList(Of AxisPointTuple) = childDashboardControl.GetAvailableDrillDownValues(itemName)
60+
Dim availableValues As IEnumerable(Of Object) = tuple.Select(Function(t) t.GetAxisPoint().UniqueValue)
61+
If availableValues.Contains(value) Then
62+
childDashboardControl.PerformDrillDown(e.DashboardItemName, value)
63+
End If
64+
End If
65+
End Sub
66+
Private Sub DControl_DrillUpPerformed(ByVal sender As Object, ByVal e As DrillActionEventArgs)
67+
If HasDashboardItem(e.DashboardItemName) Then
68+
Dim itemName As String = e.DashboardItemName
69+
Dim level As Integer = e.DrillDownLevel
70+
Dim tuple As AxisPointTuple = childDashboardControl.GetCurrentDrillDownValues(itemName)
71+
If tuple IsNot Nothing Then
72+
Dim point As AxisPoint = childDashboardControl.GetCurrentDrillDownValues(itemName).GetAxisPoint()
73+
Dim l As Integer = 0
74+
Do While point.Parent IsNot Nothing
75+
l += 1
76+
point = point.Parent
77+
Loop
78+
If (level + 1) = l AndAlso childDashboardControl.CanPerformDrillUp(itemName) Then
79+
childDashboardControl.PerformDrillUp(itemName)
80+
End If
81+
End If
82+
End If
83+
End Sub
84+
End Class
8585
End Namespace

‎VB/WpfDashboard_LinkedInteractivity/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Window
1+
<Window
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

0 commit comments

Comments
 (0)