From f28b3704cf7bd56fca3819ba7d25e5869289c0b3 Mon Sep 17 00:00:00 2001
From: mddifilippo89 <mdifilippo@infragistics.com>
Date: Wed, 28 Aug 2024 17:37:53 -0400
Subject: [PATCH 1/2] mdd-funnel-chart

mdd-funnel-chart
---
 samples/charts/funnel-chart/legend.json    | 23 ++++++++++++++++++++
 samples/charts/funnel-chart/overview.json  | 14 ++++++++++++
 samples/charts/funnel-chart/selection.json | 23 ++++++++++++++++++++
 samples/charts/funnel-chart/styling.json   | 25 ++++++++++++++++++++++
 4 files changed, 85 insertions(+)
 create mode 100644 samples/charts/funnel-chart/legend.json
 create mode 100644 samples/charts/funnel-chart/overview.json
 create mode 100644 samples/charts/funnel-chart/selection.json
 create mode 100644 samples/charts/funnel-chart/styling.json

diff --git a/samples/charts/funnel-chart/legend.json b/samples/charts/funnel-chart/legend.json
new file mode 100644
index 000000000..332c982c9
--- /dev/null
+++ b/samples/charts/funnel-chart/legend.json
@@ -0,0 +1,23 @@
+{
+  "strings": {
+    "legendTitle": "Global Electricity Demand by Energy Use"
+  },
+  "descriptions": {
+    "legend": {
+      "type": "ItemLegend",
+      "name": "legend",
+      "orientation": "Horizontal"
+    },
+    "content": {
+      "type": "FunnelChart",
+      "name": "chart",
+      "valueMemberPath": "Value",
+      "innerLabelMemberPath": "Summary",
+      "dataSourceRef": "EnergyGlobalDemand"
+    }
+  },
+  "modules": [
+    "charts/ItemLegendModule",
+    "charts/FunnelChartModule"
+  ]
+}
\ No newline at end of file
diff --git a/samples/charts/funnel-chart/overview.json b/samples/charts/funnel-chart/overview.json
new file mode 100644
index 000000000..4e99305d8
--- /dev/null
+++ b/samples/charts/funnel-chart/overview.json
@@ -0,0 +1,14 @@
+{
+  "descriptions": {
+    "content": {
+      "type": "FunnelChart",
+      "name": "chart",
+      "innerLabelMemberPath": "Summary",
+      "valueMemberPath": "Value",
+      "dataSourceRef": "EnergyGlobalDemand"
+    }
+  },
+  "modules": [
+    "charts/FunnelChartModule"
+  ]
+}
\ No newline at end of file
diff --git a/samples/charts/funnel-chart/selection.json b/samples/charts/funnel-chart/selection.json
new file mode 100644
index 000000000..8a54c6cf9
--- /dev/null
+++ b/samples/charts/funnel-chart/selection.json
@@ -0,0 +1,23 @@
+{
+  "strings": {
+    "legendTitle": "Global Electricity Demand by Energy Use"
+  },
+  "descriptions": {
+    "legend": {
+      "type": "ItemLegend",
+      "name": "legend",
+      "orientation": "Horizontal"
+    },
+    "content": {
+      "type": "FunnelChart",
+      "name": "chart",
+      "innerLabelMemberPath": "Summary",
+      "valueMemberPath": "Value",
+      "dataSourceRef": "EnergyGlobalDemand"
+    }
+  },
+  "modules": [
+    "charts/ItemLegendModule",
+    "charts/FunnelChartModule"
+  ]
+}
\ No newline at end of file
diff --git a/samples/charts/funnel-chart/styling.json b/samples/charts/funnel-chart/styling.json
new file mode 100644
index 000000000..1f0e68c72
--- /dev/null
+++ b/samples/charts/funnel-chart/styling.json
@@ -0,0 +1,25 @@
+{
+  "strings": {
+    "legendTitle": "Global Electricity Demand by Energy Use"
+  },
+  "descriptions": {
+    "legend": {
+      "type": "ItemLegend",
+      "name": "legend",
+      "orientation": "Horizontal"
+    },
+    "content": {
+      "type": "FunnelChart",
+      "name": "chart",
+      "valueMemberPath": "Value",
+      "innerLabelMemberPath": "Summary",
+      "brushes": ["#f7d262", "#a8a8b7", "#e051a9", "#f8a15f", "#735656"],
+      "outlines": ["#ffffff"],
+      "dataSourceRef": "EnergyGlobalDemand"
+    }
+  },
+  "modules": [
+    "charts/FunnelChartModule",
+    "charts/ItemLegendModule"
+  ]
+}
\ No newline at end of file

From ce3652181e7dd25f4bb3a4d02377a22829d2ac30 Mon Sep 17 00:00:00 2001
From: mddifilippo89 <mdifilippo@infragistics.com>
Date: Thu, 29 Aug 2024 10:40:10 -0400
Subject: [PATCH 2/2] Update main-template.csproj

---
 .../WPF/main-template/main-template.csproj    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/editor-templates/WPF/main-template/main-template.csproj b/editor-templates/WPF/main-template/main-template.csproj
index 04af87db4..82397bf90 100644
--- a/editor-templates/WPF/main-template/main-template.csproj
+++ b/editor-templates/WPF/main-template/main-template.csproj
@@ -39,29 +39,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="InfragisticsWPF4.Controls.Charts.XamDataChart.v23.2">
+    <Reference Include="InfragisticsWPF4.Controls.Charts.XamDataChart.v24.1">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Charts.XamDataChart.v23.2.dll</HintPath>
+      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Charts.XamDataChart.v24.1.dll</HintPath>
     </Reference>
-    <Reference Include="InfragisticsWPF4.Controls.Grids.XamPropertyEditor.v23.2">
+    <Reference Include="InfragisticsWPF4.Controls.Grids.XamPropertyEditor.v24.1">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Grids.XamPropertyEditor.v23.2.dll</HintPath>
+      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Grids.XamPropertyEditor.v24.1.dll</HintPath>
     </Reference>
-    <Reference Include="InfragisticsWPF4.Controls.Layouts.v23.2">
+    <Reference Include="InfragisticsWPF4.Controls.Layouts.v24.1">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Layouts.v23.2.dll</HintPath>
+      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Layouts.v24.1.dll</HintPath>
     </Reference>
-    <Reference Include="InfragisticsWPF4.Controls.Inputs.v23.2">
+    <Reference Include="InfragisticsWPF4.Controls.Inputs.v24.1">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Inputs.v23.2.dll</HintPath>
+      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.Controls.Inputs.v24.1.dll</HintPath>
     </Reference>
-    <Reference Include="InfragisticsWPF4.DataVisualization.v23.2">
+    <Reference Include="InfragisticsWPF4.DataVisualization.v24.1">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.DataVisualization.v23.2.dll</HintPath>
+      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.DataVisualization.v24.1.dll</HintPath>
     </Reference>
-    <Reference Include="InfragisticsWPF4.v23.2">
+    <Reference Include="InfragisticsWPF4.v24.1">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.v23.2.dll</HintPath>
+      <HintPath>C:\Work\dev-tools\XAML\Main\Source\Build\InfragisticsWPF4.v24.1.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />