Skip to content

Commit 8d55936

Browse files
committed
Merge branch 'dev_v2.x' into master
2 parents 3ee3c4f + b28cb5c commit 8d55936

Some content is hidden

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

50 files changed

+2908
-22
lines changed

Examples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"react-router-dom": "^5.2.0",
3838
"react-transition-group": "^4.4.1",
3939
"request": "^2.88.2",
40-
"scichart": "^2.0.2228",
40+
"scichart": "^2.1.2261",
4141
"socket.io": "^3.0.4"
4242
},
4343
"devDependencies": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const FOOTER_LINKS = [{"link":"/javascript-data-animation","text":"JavaScript Data Animation"},{"link":"/javascript-style-animation","text":"JavaScript Style Animation"},{"link":"/javascript-startup-animation","text":"JavaScript Startup Animation"},{"link":"/javascript-band-chart","text":"JavaScript Band Chart"},{"link":"/javascript-spline-band-chart","text":"JavaScript Spline Band Chart"},{"link":"/javascript-digital-band-chart","text":"JavaScript Digital Band Chart"},{"link":"/javascript-fan-chart","text":"JavaScript Fan Chart"},{"link":"/javascript-bubble-chart","text":"JavaScript Bubble Chart"},{"link":"/javascript-candlestick-chart","text":"JavaScript Candlestick Chart"},{"link":"/javascript-ohlc-chart","text":"JavaScript OHLC Chart"},{"link":"/javascript-column-chart","text":"JavaScript Column Chart"},{"link":"/javascript-heatmap-chart","text":"JavaScript Heatmap Chart"},{"link":"/javascript-heatmap-chart-with-contours","text":"JavaScript Contours chart"},{"link":"/javascript-line-chart","text":"JavaScript Line Chart"},{"link":"/javascript-spline-line-chart","text":"JavaScript Spline Line Chart"},{"link":"/javascript-digital-line-chart","text":"JavaScript Digital Line Chart"},{"link":"/javascript-mountain-chart","text":"JavaScript Mountain Chart"},{"link":"/javascript-spline-mountain-chart","text":"Javascript Spline Mountain Chart"},{"link":"/javascript-digital-mountain-chart","text":"JavaScript Digital Mountain Chart"},{"link":"/javascript-scatter-chart","text":"JavaScript Scatter Chart"},{"link":"/javascript-donut-chart","text":"JavaScript Donut Chart"},{"link":"/javascript-pie-chart","text":"JavaScript Pie Chart"},{"link":"/javascript-realtime-mountain-chart","text":"JavaScript Realtime Mountain Chart"},{"link":"/javascript-chart-annotations","text":"JavaScript Chart Annotations"},{"link":"/editable-annotations","text":"JavaScript Chart Editable Annotations"},{"link":"/javascript-stock-chart-buy-sell-markers","text":"Trading Buy Sell Marker Annotations"},{"link":"/javascript-chart-drag-horizontal-threshold","text":"JavaScript Chart Drag Horizontal Threshold"},{"link":"/javascript-realtime-ghosted-traces-chart","text":"Realtime Ghosted Traces"},{"link":"/javascript-chart-performance-load-one-million-points","text":"Load 1 Million Points Performance Demo"},{"link":"/javascript-multi-pane-stock-charts","text":"JavaScript Multi-Pane Stock Charts"},{"link":"/javascript-realtime-ticking-stock-charts","text":"JavaScript Realtime Ticking Stock Charts"},{"link":"/javascript-chart-legends","text":"Chart Legends API"},{"link":"/javascript-chart-with-multiple-x-axis","text":"Multiple X Axes"},{"link":"/javascript-chart-with-secondary-y-axis","text":"Secondary Y Axes"},{"link":"/javascript-vertical-charts","text":"Vertical Charts"},{"link":"/javascript-central-axes","text":"Central Axes"},{"link":"/javascript-vertically-stacked-axes","text":"Vertically Stacked Axes"},{"link":"/javascript-chart-logarithmic-axis","text":"Logarithmic Axis Example"},{"link":"/javascript-multiline-labels","text":"Multi-line and Rotated Text labels"},{"link":"/javascript-image-labels","text":"Image labels"},{"link":"/javascript-rotated-labels","text":"Rotated Labels and Alignment"},{"link":"/javascript-stacked-column-chart","text":"JavaScript Stacked Column Chart"},{"link":"/javascript-stacked-grouped-column-chart-side-by-side","text":"JavaScript Stacked Column Side by Side"},{"link":"/javascript-stacked-mountain-chart","text":"JavaScript Stacked Mountain Chart"},{"link":"/javascript-chart-custom-pointmarkers","text":"JavaScript Point-Markers Chart"},{"link":"/javascript-chart-themes","text":"Using Theme Manager"},{"link":"/javascript-chart-custom-themes","text":"Create a Custom Theme"},{"link":"/javascript-chart-styling-theming-in-code","text":"Styling a JavaScript Chart in Code"},{"link":"/javascript-chart-color-points-individually-with-paletteprovider","text":"Coloring Series per-point using the PaletteProvider"},{"link":"/javascript-dashed-line-chart","text":"Dashed Line Styling"},{"link":"/javascript-chart-transparent-background","text":"Background Image with Transparency"},{"link":"/javascript-chart-hit-test-on-click","text":"Hit-Test API"},{"link":"/javascript-chart-rollovermodifier-tooltips","text":"Using Rollover Modifier Tooltips"},{"link":"/javascript-chart-cursormodifier-crosshairs","text":"Using CursorModifier Crosshairs"},{"link":"/javascript-chart-metadata","text":"PointMetadata API"},{"link":"/javascript-datapoint-selection","text":"Data Point Selection"},{"link":"/javascript-chart-series-selection","text":"Using Series Selection"},{"link":"/javascript-chart-drag-axis-to-scale-pan","text":"Drag Axis to Scale or Pan"},{"link":"/zoom-pan-realtime-javascript-chart","text":"Zoom and Pan a Realtime JavaScript Chart"},{"link":"/zoom-pan-multiple-modifiers","text":"Zoom and Pan with multiple Chart Modifiers"},{"link":"/javascript-overview","text":"Zoom and Pan with Overview Chart"},{"link":"/javascript-percentage-change","text":"Realtime Percentage Change using Filter"},{"link":"/javascript-trend-ma-ratio","text":"Trendline, Moving Average and Ratio Filters"},{"link":"/javascript-custom-filters","text":"Custom Filters"},{"link":"/javascript-3d-bubble-chart","text":"JavaScript 3D Bubble Chart"},{"link":"/javascript-3d-surface-mesh-chart","text":"JavaScript Surface Mesh 3D Chart"},{"link":"/performance/javascript-chart-load-500-series-by-500-points","text":"Load 500 Series x 500 Points Performance Demo"},{"link":"/javascript-chart-realtime-performance-demo","text":"Realtime JavaScript Chart Performance Demo"},{"link":"/javascript-vital-signs-ecg-medical-chart-example","text":"JavaScript Vital Signs ECG/EKG Medical Demo"},{"link":"/javascript-3d-lidar-visualization","text":"LiDAR 3D Point Cloud of Geospatial Data"},{"link":"/javascript-audio-analyzer-fft-example","text":"Audio Analyzer Demo"},{"link":"/javascript-2d-3d-chart-tenor-curves-example","text":"Tenor Curves Demo"},{"link":"/javascript-builder-simple","text":"Simple Chart using Builder API"},{"link":"/javascript-builder-full","text":"Full Chart using Builder API"},{"link":"/javascript-chart-from-json","text":"Chart from JSON"},{"link":"/javascript-shared-data","text":"Reusable Templates using Shared Data"},{"link":"/javascript-custom-types","text":"Custom Types with Builder API"}]
1+
export const FOOTER_LINKS = [{"link":"/javascript-data-animation","text":"JavaScript Data Animation"},{"link":"/javascript-style-animation","text":"JavaScript Style Animation"},{"link":"/javascript-startup-animation","text":"JavaScript Startup Animation"}, {"link":"/javascript-generic-animations","text":"Javascript Generic Animation"},{"link":"/javascript-band-chart","text":"JavaScript Band Chart"},{"link":"/javascript-spline-band-chart","text":"JavaScript Spline Band Chart"},{"link":"/javascript-digital-band-chart","text":"JavaScript Digital Band Chart"},{"link":"/javascript-fan-chart","text":"JavaScript Fan Chart"},{"link":"/javascript-bubble-chart","text":"JavaScript Bubble Chart"},{"link":"/javascript-candlestick-chart","text":"JavaScript Candlestick Chart"},{"link":"/javascript-ohlc-chart","text":"JavaScript OHLC Chart"},{"link":"/javascript-column-chart","text":"JavaScript Column Chart"},{"link":"/javascript-heatmap-chart","text":"JavaScript Heatmap Chart"},{"link":"/javascript-heatmap-chart-with-contours","text":"JavaScript Contours chart"},{"link":"/javascript-line-chart","text":"JavaScript Line Chart"},{"link":"/javascript-spline-line-chart","text":"JavaScript Spline Line Chart"},{"link":"/javascript-digital-line-chart","text":"JavaScript Digital Line Chart"},{"link":"/javascript-mountain-chart","text":"JavaScript Mountain Chart"},{"link":"/javascript-spline-mountain-chart","text":"Javascript Spline Mountain Chart"},{"link":"/javascript-digital-mountain-chart","text":"JavaScript Digital Mountain Chart"},{"link":"/javascript-scatter-chart","text":"JavaScript Scatter Chart"},{"link":"/javascript-donut-chart","text":"JavaScript Donut Chart"},{"link":"/javascript-pie-chart","text":"JavaScript Pie Chart"},{"link":"/javascript-realtime-mountain-chart","text":"JavaScript Realtime Mountain Chart"},{"link":"/javascript-chart-annotations","text":"JavaScript Chart Annotations"},{"link":"/editable-annotations","text":"JavaScript Chart Editable Annotations"},{"link":"/javascript-stock-chart-buy-sell-markers","text":"Trading Buy Sell Marker Annotations"},{"link":"/javascript-chart-drag-horizontal-threshold","text":"JavaScript Chart Drag Horizontal Threshold"},{"link":"/javascript-realtime-ghosted-traces-chart","text":"Realtime Ghosted Traces"},{"link":"/javascript-chart-performance-load-one-million-points","text":"Load 1 Million Points Performance Demo"},{"link":"/javascript-multi-pane-stock-charts","text":"JavaScript Multi-Pane Stock Charts"},{"link":"/javascript-realtime-ticking-stock-charts","text":"JavaScript Realtime Ticking Stock Charts"},{"link":"/javascript-chart-legends","text":"Chart Legends API"},{"link":"/javascript-chart-with-multiple-x-axis","text":"Multiple X Axes"},{"link":"/javascript-chart-with-secondary-y-axis","text":"Secondary Y Axes"},{"link":"/javascript-vertical-charts","text":"Vertical Charts"},{"link":"/javascript-central-axes","text":"Central Axes"},{"link":"/javascript-vertically-stacked-axes","text":"Vertically Stacked Axes"},{"link":"/javascript-chart-logarithmic-axis","text":"Logarithmic Axis Example"},{"link":"/javascript-multiline-labels","text":"Multi-line and Rotated Text labels"},{"link":"/javascript-image-labels","text":"Image labels"},{"link":"/javascript-rotated-labels","text":"Rotated Labels and Alignment"},{"link":"/javascript-stacked-column-chart","text":"JavaScript Stacked Column Chart"},{"link":"/javascript-stacked-grouped-column-chart-side-by-side","text":"JavaScript Stacked Column Side by Side"},{"link":"/javascript-stacked-mountain-chart","text":"JavaScript Stacked Mountain Chart"},{"link":"/javascript-chart-custom-pointmarkers","text":"JavaScript Point-Markers Chart"},{"link":"/javascript-chart-themes","text":"Using Theme Manager"},{"link":"/javascript-chart-custom-themes","text":"Create a Custom Theme"},{"link":"/javascript-chart-styling-theming-in-code","text":"Styling a JavaScript Chart in Code"},{"link":"/javascript-chart-color-points-individually-with-paletteprovider","text":"Coloring Series per-point using the PaletteProvider"},{"link":"/javascript-dashed-line-chart","text":"Dashed Line Styling"},{"link":"/javascript-chart-transparent-background","text":"Background Image with Transparency"},{"link":"/javascript-chart-hit-test-on-click","text":"Hit-Test API"},{"link":"/javascript-chart-rollovermodifier-tooltips","text":"Using Rollover Modifier Tooltips"},{"link":"/javascript-chart-cursormodifier-crosshairs","text":"Using CursorModifier Crosshairs"},{"link":"/javascript-chart-metadata","text":"PointMetadata API"},{"link":"/javascript-datapoint-selection","text":"Data Point Selection"},{"link":"/javascript-chart-series-selection","text":"Using Series Selection"},{"link":"/javascript-chart-drag-axis-to-scale-pan","text":"Drag Axis to Scale or Pan"},{"link":"/zoom-pan-realtime-javascript-chart","text":"Zoom and Pan a Realtime JavaScript Chart"},{"link":"/zoom-pan-multiple-modifiers","text":"Zoom and Pan with multiple Chart Modifiers"},{"link":"/javascript-overview","text":"Zoom and Pan with Overview Chart"},{"link":"/javascript-percentage-change","text":"Realtime Percentage Change using Filter"},{"link":"/javascript-trend-ma-ratio","text":"Trendline, Moving Average and Ratio Filters"},{"link":"/javascript-custom-filters","text":"Custom Filters"},{"link":"/javascript-3d-bubble-chart","text":"JavaScript 3D Bubble Chart"},{"link":"/javascript-3d-surface-mesh-chart","text":"JavaScript Surface Mesh 3D Chart"},{"link":"/performance/javascript-chart-load-500-series-by-500-points","text":"Load 500 Series x 500 Points Performance Demo"},{"link":"/javascript-chart-realtime-performance-demo","text":"Realtime JavaScript Chart Performance Demo"},{"link":"/javascript-vital-signs-ecg-medical-chart-example","text":"JavaScript Vital Signs ECG/EKG Medical Demo"},{"link":"/javascript-3d-lidar-visualization","text":"LiDAR 3D Point Cloud of Geospatial Data"},{"link":"/javascript-audio-analyzer-fft-example","text":"Audio Analyzer Demo"},{"link":"/javascript-2d-3d-chart-tenor-curves-example","text":"Tenor Curves Demo"},{"link":"/javascript-builder-simple","text":"Simple Chart using Builder API"},{"link":"/javascript-builder-full","text":"Full Chart using Builder API"},{"link":"/javascript-chart-from-json","text":"Chart from JSON"},{"link":"/javascript-shared-data","text":"Reusable Templates using Shared Data"},{"link":"/javascript-custom-types","text":"Custom Types with Builder API"}]

Examples/src/components/AppRouter/examplePages.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import { styleAnimationExampleInfo } from "../Examples/Charts2D/Animations/Style
7777
import { startupAnimationExampleInfo } from "../Examples/Charts2D/Animations/StartupAnimation/exampleInfo";
7878
import { dataPointSelectionExampleInfo } from "../Examples/Charts2D/TooltipsAndHittest/DatapointSelection/exampleInfo";
7979
import { overviewExampleInfo } from "../Examples/Charts2D/ZoomingAndPanning/OverviewModifier/exampleInfo";
80+
import { genericAnimationExampleInfo } from "../Examples/Charts2D/Animations/GenericAnimation/exampleInfo";
8081

8182

8283
export type TExampleInfo = {
@@ -115,6 +116,10 @@ export const EXAMPLES_PAGES = asRecord({
115116
id: "chart2D_Animations_StartupAnimation",
116117
...startupAnimationExampleInfo
117118
},
119+
chart2D_Animations_GenericAnimation: {
120+
id: "chart2D_Animations_GenericAnimation",
121+
...genericAnimationExampleInfo
122+
},
118123
chart2D_basicCharts_BandSeriesChart: {
119124
id: "chart2D_basicCharts_BandSeriesChart",
120125
...bandSeriesChartExampleInfo

Examples/src/components/AppRouter/examples.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import RealtimeMountainChart from "../Examples/Charts2D/BasicChartTypes/RealTime
2222
import DataAnimation from "../Examples/Charts2D/Animations/DataAnimation";
2323
import StyleAnimation from "../Examples/Charts2D/Animations/StyleAnimation";
2424
import StartupAnimation from "../Examples/Charts2D/Animations/StartupAnimation";
25+
import GenericAnimations from "../Examples/Charts2D/Animations/GenericAnimation";
2526

2627
import AnnotationsAreEasy from "../Examples/Charts2D/ChartAnnotations/AnnotationsAreEasy";
2728
import EditableAnnotaions from "../Examples/Charts2D/ChartAnnotations/EditableAnnotations";
@@ -211,7 +212,8 @@ export const MENU_ITEMS_2D: TMenuItem[] = [
211212
submenu: [
212213
EXAMPLES_PAGES.chart2D_Animations_DataAnimation,
213214
EXAMPLES_PAGES.chart2D_Animations_StyleAnimation,
214-
EXAMPLES_PAGES.chart2D_Animations_StartupAnimation
215+
EXAMPLES_PAGES.chart2D_Animations_StartupAnimation,
216+
EXAMPLES_PAGES.chart2D_Animations_GenericAnimation
215217
]
216218
}
217219
];
@@ -269,7 +271,8 @@ export const MENU_ITEMS_WHATSNEW: TMenuItem[] = [
269271
submenu: [
270272
EXAMPLES_PAGES.chart2D_Animations_DataAnimation,
271273
EXAMPLES_PAGES.chart2D_Animations_StyleAnimation,
272-
EXAMPLES_PAGES.chart2D_Animations_StartupAnimation
274+
EXAMPLES_PAGES.chart2D_Animations_StartupAnimation,
275+
EXAMPLES_PAGES.chart2D_Animations_GenericAnimation
273276
]
274277
},
275278
{
@@ -368,6 +371,8 @@ export const getExampleComponent = (exampleId: string): (() => JSX.Element) => {
368371
return StyleAnimation;
369372
case EXAMPLES_PAGES.chart2D_Animations_StartupAnimation.id:
370373
return StartupAnimation;
374+
case EXAMPLES_PAGES.chart2D_Animations_GenericAnimation.id:
375+
return GenericAnimations;
371376
case EXAMPLES_PAGES.chart2D_basicCharts_BandSeriesChart.id:
372377
return BandSeriesChart;
373378
case EXAMPLES_PAGES.chart2D_basicCharts_SplineBandChart.id:

Examples/src/components/Examples/Charts2D/Animations/DataAnimation/exampleInfo.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ const seeAlso: GalleryItem[] = [
4848
title: ExampleStrings.titleStartupAnimation,
4949
seoTitle: ExampleStrings.urlTitleStartupAnimation,
5050
examplePath: ExampleStrings.urlStartupAnimation
51+
},
52+
{
53+
imgPath: ExampleStrings.imgGenericAnimation,
54+
title: ExampleStrings.titleGenericAnimation,
55+
seoTitle: ExampleStrings.urlTitleGenericAnimation,
56+
examplePath: ExampleStrings.urlGenericAnimation
5157
}
5258
]
5359
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const githubUrl = "/components/Examples/Charts2D/Animations/GenericAnimation/index.tsx";

0 commit comments

Comments
 (0)