Skip to content

Commit 8820170

Browse files
committed
Merged latest v8.x changes from the "SciChart_v8_Release" branch
2 parents 4931af3 + e008b64 commit 8820170

530 files changed

Lines changed: 8012 additions & 2105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Examples/CommonVersion.targets

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Product>SciChart</Product>
5+
<Company>SciChart Ltd</Company>
6+
<Trademark>SCICHART™</Trademark>
7+
<Copyright>Copyright © SciChart Ltd 2011-2025, www.scichart.com</Copyright>
8+
<Description>SciChart - high performance real-time WPF charts for Scientific and Trading applications. For more info see www.scichart.com</Description>
9+
<Version>8.10.0.28840</Version>
10+
<FileVersion>8.10.0.28840</FileVersion>
11+
<InformationalVersion>8.10.0.28840</InformationalVersion>
12+
</PropertyGroup>
13+
14+
<!-- Set assembly version -->
15+
<ItemGroup>
16+
<AssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute">
17+
<_Parameter1>$(Version)</_Parameter1>
18+
</AssemblyAttribute>
19+
</ItemGroup>
20+
21+
<!-- Build system integration -->
22+
<PropertyGroup>
23+
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
24+
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
25+
</PropertyGroup>
26+
</Project>

Examples/Directory.Build.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<Import Condition="Exists('CommonVersion.targets')" Project="CommonVersion.targets" />
3+
<PropertyGroup>
4+
<DoNotCopyLocalIfInGac>True</DoNotCopyLocalIfInGac>
5+
</PropertyGroup>
6+
</Project>
130 KB
Loading
-1.92 KB
Loading
149 KB
Loading
2 KB
Loading
1.31 KB
Loading
502 KB
Loading

Examples/SciChart.Examples.Demo.SmokeTests/SciChart.Examples.Demo.SmokeTests.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
<Reference Include="UIAutomationProvider" />
2222
</ItemGroup>
2323

24+
<ItemGroup>
25+
<None Remove="Resources\Charts2D\StockCharts\MarketProfileTradingChart.png" />
26+
<None Remove="Resources\Charts2D\StockCharts\RenkoChart.png" />
27+
<None Remove="Resources\FeaturedApps\PerformanceDemos\OilAndGas.png" />
28+
</ItemGroup>
29+
2430
<ItemGroup>
2531
<PackageReference Include="FlaUI.UIA3" Version="3.2.0" />
2632
<PackageReference Include="NUnit" Version="3.14.0" />
@@ -46,6 +52,8 @@
4652
</ItemGroup>
4753
<ItemGroup>
4854
<EmbeddedResource Include="Resources\Charts2D\ChartAnnotations\AnnotationsAreEasy.png" />
55+
<EmbeddedResource Include="Resources\Charts2D\StockCharts\MarketProfileTradingChart.png" />
56+
<EmbeddedResource Include="Resources\Charts2D\StockCharts\RenkoChart.png" />
4957
<EmbeddedResource Include="Resources\Charts3D\BasicChartTypes\ClosedSurfaceMesh3D.png" />
5058
<EmbeddedResource Include="Resources\Charts3D\BasicChartTypes\SimpleBubble3DChart.png" />
5159
<EmbeddedResource Include="Resources\Charts3D\BasicChartTypes\SimpleCylindroid3DChart.png" />
@@ -69,6 +77,7 @@
6977
</ItemGroup>
7078
<ItemGroup>
7179
<EmbeddedResource Include="Resources\FeaturedApps\PerformanceDemos\FastPalettedScatterCharts.png" />
80+
<EmbeddedResource Include="Resources\FeaturedApps\PerformanceDemos\OilAndGas.png" />
7281
</ItemGroup>
7382
<ItemGroup>
7483
<EmbeddedResource Include="Resources\FeaturedApps\PerformanceDemos\ScatterChartPerformanceDemo.png" />

Examples/SciChart.Examples.Demo.SmokeTests/SmokeTests_ExampleWalkUsingBreadcrumbView.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ public class SmokeTests_ExampleWalkUsingBreadcrumbView : AutomationTestBase
7575

7676

7777
// Featured Apps example groups
78-
private const string Group_Featured_PerformanceDemos = "Performance Demos";
79-
private const string Group_Featured_ScientificCharts = "Scientific Charts";
80-
private const string Group_Featured_MedicalCharts = "Medical Charts";
78+
private const string Group_Featured_PerformanceDemos = "Performance Demos & Showcases";
79+
private const string Group_Featured_ScientificCharts = "Scientific & Medical Charts";
8180
private const string Group_Featured_FinancialCharts = "Financial Charts";
82-
private const string Group_Featured_ParallelCoordinatePlot = "Parallel Coordinate Plot";
8381

8482

8583

@@ -226,6 +224,7 @@ public override string ToString()
226224
new ExampleStartTestCase(Category_2DCharts, Group_2D_StockCharts, "Multi-Pane Stock Charts", "Charts2D/StockCharts/MultiPaneStockChart.png"),
227225
new ExampleStartTestCase(Category_2DCharts, Group_2D_StockCharts, "Realtime Ticking Stock Charts", "Charts2D/StockCharts/RealtimeTickingCharts.png"),
228226
new ExampleStartTestCase(Category_2DCharts, Group_2D_StockCharts, "Using SciStockChart", "Charts2D/StockCharts/UsingSciStockChart.png"),
227+
//new ExampleStartTestCase(Category_2DCharts, Group_2D_StockCharts, "Market Profile Trading Chart", "Charts2D/StockCharts/MarketProfileTradingChart.png"),
229228
// 2D Charts, Export a Chart
230229
new ExampleStartTestCase(Category_2DCharts, Group_2D_ExportAChart, "Export and Screenshot Options in Chart", "Charts2D/ExportCharts/ExportChart.png"),
231230
// 2D Charts, Filters API
@@ -326,22 +325,26 @@ public override string ToString()
326325
// Featured Apps, Performance Demos
327326
// new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_PerformanceDemos, "Fifo 1Billion Points Demo", "FeaturedApps/PerformanceDemos/Fifo1BillionPoints.png"),
328327
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_PerformanceDemos, "Fast Paletted Scatter Charts", "FeaturedApps/PerformanceDemos/FastPalettedScatterCharts.png"),
329-
// new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_PerformanceDemos, "Scatter Chart Performance Demo", "FeaturedApps/PerformanceDemos/ScatterChartPerformanceDemo.png",
328+
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_PerformanceDemos, "Oil & Gas Wells Chart Demo", "FeaturedApps/PerformanceDemos/OilAndGas.png"),
329+
330+
331+
// new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_PerformanceDemos, "Scatter Chart Performance Demo", "FeaturedApps/PerformanceDemos/ScatterChartPerformanceDemo.png",
330332
// (mw) => Thread.Sleep(1500)), // bit of a delay to allow example to show
331333

332334
// Featured Apps, Medical Charts
333-
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_MedicalCharts, "ECG Monitor Demo", "FeaturedApps/MedicalCharts/ECGMonitorDemo.png"),
334-
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_MedicalCharts, "Vital Signs Monitor Demo", "FeaturedApps/MedicalCharts/VitalSignsMonitorDemo.png"),
335+
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_ScientificCharts, "ECG Monitor Demo", "FeaturedApps/MedicalCharts/ECGMonitorDemo.png"),
336+
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_ScientificCharts, "Vital Signs Monitor Demo", "FeaturedApps/MedicalCharts/VitalSignsMonitorDemo.png"),
335337

336338
// Featured Apps, ScientificCharts
337339
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_ScientificCharts, "LIDAR PointCloud 3D Demo", "FeaturedApps/ScientificCharts/LIDARPointCloud3DDemo.png"),
338340

339341
// Featured Apps, Financial Charts
340342
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_FinancialCharts, "Aggregation Filters", "FeaturedApps/FinancialCharts/AggregationFilters.png"),
343+
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_FinancialCharts, "Renko Chart", "Charts2D/StockCharts/RenkoChart.png"),
341344
//new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_FinancialCharts, "SciChart Trader Demo", "FeaturedApps/FinancialCharts/SciChartTraderDemo.png"),
342345

343346
// Featured Apps, Parallel Coordinate Plot
344-
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_ParallelCoordinatePlot, "Parallel Coordinate Plot", "FeaturedApps/ParallelCoordinatePlot/ParallelCoordinatePlot.png")
347+
new ExampleStartTestCase(Category_FeaturedApps, Group_Featured_ScientificCharts, "Parallel Coordinate Plot", "FeaturedApps/ParallelCoordinatePlot/ParallelCoordinatePlot.png")
345348

346349
};
347350

0 commit comments

Comments
 (0)