scichart 2.0.0-alpha.1930 → 2.0.0-alpha.1991
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Builder/buildAxis.d.ts +3 -3
- package/Builder/buildDataSeries.d.ts +44 -4
- package/Builder/buildDataSeries.js +66 -0
- package/Builder/buildSeries.d.ts +7 -5
- package/Builder/buildSeries.js +3 -4
- package/Builder/buildSurface.d.ts +14 -6
- package/Builder/buildSurface.js +13 -8
- package/Builder/chartBuilder.d.ts +14 -8
- package/Builder/chartBuilder.js +6 -6
- package/Charting/ChartModifiers/ChartModifierBase.d.ts +37 -81
- package/Charting/ChartModifiers/ChartModifierBase.js +28 -73
- package/Charting/ChartModifiers/ChartModifierBase2D.d.ts +5 -1
- package/Charting/ChartModifiers/ChartModifierBase2D.js +6 -17
- package/Charting/ChartModifiers/CursorModifier.d.ts +4 -2
- package/Charting/ChartModifiers/CursorModifier.js +1 -1
- package/Charting/ChartModifiers/DataPointSelectionModifier.d.ts +3 -1
- package/Charting/ChartModifiers/DataPointSelectionModifier.js +62 -27
- package/Charting/ChartModifiers/LegendModifier.d.ts +5 -1
- package/Charting/ChartModifiers/LegendModifier.js +2 -1
- package/Charting/ChartModifiers/MouseWheelZoomModifier.d.ts +1 -1
- package/Charting/ChartModifiers/PinchZoomModifier.d.ts +1 -1
- package/Charting/ChartModifiers/RolloverModifier.d.ts +1 -1
- package/Charting/ChartModifiers/RolloverModifier.js +44 -58
- package/Charting/ChartModifiers/RubberBandXyZoomModifier.d.ts +1 -1
- package/Charting/ChartModifiers/SeriesSelectionModifier.d.ts +15 -7
- package/Charting/ChartModifiers/SeriesSelectionModifier.js +10 -10
- package/Charting/ChartModifiers/XAxisDragModifier.d.ts +1 -1
- package/Charting/ChartModifiers/YAxisDragModifier.d.ts +1 -1
- package/Charting/ChartModifiers/ZoomExtentsModifier.d.ts +14 -1
- package/Charting/ChartModifiers/ZoomExtentsModifier.js +16 -4
- package/Charting/Drawing/BrushCache.js +6 -8
- package/Charting/Drawing/Pen2DCache.d.ts +4 -6
- package/Charting/Drawing/Pen2DCache.js +14 -11
- package/Charting/Drawing/WebGlPen.d.ts +2 -1
- package/Charting/Drawing/WebGlPen.js +3 -2
- package/Charting/LayoutManager/BottomAlignedOuterAxisLayoutStrategy.js +1 -1
- package/Charting/LayoutManager/BottomAlignedOuterHorizontallyStackedAxisLayoutStrategy.js +3 -2
- package/Charting/LayoutManager/LeftAlignedOuterAxisLayoutStrategy.js +1 -1
- package/Charting/LayoutManager/LeftAlignedOuterVerticallyStackedAxisLayoutStrategy.js +3 -2
- package/Charting/LayoutManager/RightAlignedOuterAxisLayoutStrategy.js +1 -1
- package/Charting/LayoutManager/RightAlignedOuterVerticallyStackedAxisLayoutStrategy.js +3 -2
- package/Charting/LayoutManager/TopAlignedOuterAxisLayoutStrategy.js +1 -1
- package/Charting/LayoutManager/TopAlignedOuterHorizontallyStackedAxisLayoutStrategy.js +3 -2
- package/Charting/Model/BaseDataSeries.d.ts +64 -52
- package/Charting/Model/BaseDataSeries.js +158 -84
- package/Charting/Model/BaseHeatmapDataSeries.d.ts +2 -2
- package/Charting/Model/DataPointSelectionPaletteProvider.d.ts +22 -10
- package/Charting/Model/DataPointSelectionPaletteProvider.js +35 -5
- package/Charting/Model/Filters/OhlcScaleOffsetFilter.d.ts +106 -0
- package/Charting/Model/Filters/OhlcScaleOffsetFilter.js +21 -0
- package/Charting/Model/Filters/XyLinearTrendFilter.d.ts +112 -1
- package/Charting/Model/Filters/XyLinearTrendFilter.js +21 -0
- package/Charting/Model/Filters/XyMovingAverageFilter.d.ts +110 -1
- package/Charting/Model/Filters/XyMovingAverageFilter.js +21 -0
- package/Charting/Model/Filters/XyRatioFilter.d.ts +111 -2
- package/Charting/Model/Filters/XyRatioFilter.js +34 -3
- package/Charting/Model/Filters/XyScaleOffsetFilter.d.ts +112 -1
- package/Charting/Model/Filters/XyScaleOffsetFilter.js +21 -0
- package/Charting/Model/Filters/XyyScaleOffsetFilter.d.ts +116 -0
- package/Charting/Model/Filters/XyyScaleOffsetFilter.js +21 -0
- package/Charting/Model/Filters/XyzScaleOffsetFilter.d.ts +116 -0
- package/Charting/Model/Filters/XyzScaleOffsetFilter.js +21 -0
- package/Charting/Model/IDataSeries.d.ts +18 -3
- package/Charting/Model/IDataSeries.js +12 -1
- package/Charting/Model/IPaletteProvider.d.ts +8 -8
- package/Charting/Model/OhlcDataSeries.d.ts +39 -10
- package/Charting/Model/OhlcDataSeries.js +106 -19
- package/Charting/Model/UniformHeatmapDataSeries.d.ts +2 -2
- package/Charting/Model/XyyDataSeries.d.ts +21 -12
- package/Charting/Model/XyyDataSeries.js +70 -16
- package/Charting/Model/XyzDataSeries.d.ts +20 -5
- package/Charting/Model/XyzDataSeries.js +63 -7
- package/Charting/Numerics/TickProviders/LogarithmicTickProvider.d.ts +24 -0
- package/Charting/Numerics/TickProviders/LogarithmicTickProvider.js +26 -4
- package/Charting/Services/SciChartRenderer.js +4 -2
- package/Charting/Visuals/Annotations/AnnotationBase.d.ts +7 -21
- package/Charting/Visuals/Annotations/AnnotationBase.js +28 -42
- package/Charting/Visuals/Annotations/AxisMarkerAnnotation.d.ts +1 -1
- package/Charting/Visuals/Annotations/AxisMarkerAnnotation.js +2 -4
- package/Charting/Visuals/Annotations/BoxAnnotation.d.ts +1 -1
- package/Charting/Visuals/Annotations/BoxAnnotation.js +3 -2
- package/Charting/Visuals/Annotations/CustomAnnotation.d.ts +1 -1
- package/Charting/Visuals/Annotations/CustomAnnotation.js +2 -2
- package/Charting/Visuals/Annotations/HorizontalLineAnnotation.js +0 -3
- package/Charting/Visuals/Annotations/IAnnotation.d.ts +4 -0
- package/Charting/Visuals/Annotations/LineAnnotation.d.ts +1 -1
- package/Charting/Visuals/Annotations/LineAnnotation.js +2 -4
- package/Charting/Visuals/Annotations/OverviewCustomResizableAnnotation.js +3 -2
- package/Charting/Visuals/Annotations/RolloverTooltipSvgAnnotation.js +1 -1
- package/Charting/Visuals/Annotations/SvgAnnotationBase.d.ts +1 -1
- package/Charting/Visuals/Annotations/SvgAnnotationBase.js +3 -2
- package/Charting/Visuals/Annotations/TextAnnotation.d.ts +1 -1
- package/Charting/Visuals/Annotations/TextAnnotation.js +1 -1
- package/Charting/Visuals/Annotations/VerticalLineAnnotation.js +0 -3
- package/Charting/Visuals/Annotations/annotationHelpers.d.ts +21 -0
- package/Charting/Visuals/Annotations/annotationHelpers.js +19 -0
- package/Charting/Visuals/Axis/AxisBase2D.d.ts +21 -0
- package/Charting/Visuals/Axis/AxisBase2D.js +81 -14
- package/Charting/Visuals/Axis/AxisCore.d.ts +5 -5
- package/Charting/Visuals/Axis/AxisCore.js +50 -55
- package/Charting/Visuals/Axis/AxisRenderer.js +1 -1
- package/Charting/Visuals/Axis/IAxisCoreOptions.d.ts +13 -0
- package/Charting/Visuals/Axis/LabelProvider/LabelProvider.d.ts +1 -1
- package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.d.ts +3 -2
- package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.js +13 -0
- package/Charting/Visuals/Axis/LabelProvider/TextLabelProvider.d.ts +1 -1
- package/Charting/Visuals/Axis/LogarithmicAxis.d.ts +53 -0
- package/Charting/Visuals/Axis/LogarithmicAxis.js +107 -3
- package/Charting/Visuals/Axis/constants.d.ts +2 -1
- package/Charting/Visuals/Axis/constants.js +1 -0
- package/Charting/Visuals/Legend/SciChartLegend.js +1 -1
- package/Charting/Visuals/Legend/SciChartLegendBase.d.ts +11 -0
- package/Charting/Visuals/Legend/SciChartLegendBase.js +45 -16
- package/Charting/Visuals/PointMarkers/IPointMarker.d.ts +4 -0
- package/Charting/Visuals/RenderableSeries/Animations/BaseAnimation.d.ts +1 -1
- package/Charting/Visuals/RenderableSeries/Animations/ScaleAnimation.d.ts +1 -1
- package/Charting/Visuals/RenderableSeries/Animations/WaveAnimation.d.ts +1 -1
- package/Charting/Visuals/RenderableSeries/Animations/animationHelpers.d.ts +9 -2
- package/Charting/Visuals/RenderableSeries/Animations/animationHelpers.js +65 -4
- package/Charting/Visuals/RenderableSeries/BaseBandRenderableSeries.d.ts +0 -11
- package/Charting/Visuals/RenderableSeries/BaseBandRenderableSeries.js +0 -29
- package/Charting/Visuals/RenderableSeries/BaseMountainRenderableSeries.js +1 -1
- package/Charting/Visuals/RenderableSeries/BaseOhlcRenderableSeries.d.ts +0 -37
- package/Charting/Visuals/RenderableSeries/BaseOhlcRenderableSeries.js +0 -120
- package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.d.ts +4 -24
- package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.js +65 -91
- package/Charting/Visuals/RenderableSeries/BaseStackedCollection.d.ts +26 -2
- package/Charting/Visuals/RenderableSeries/BaseStackedCollection.js +55 -3
- package/Charting/Visuals/RenderableSeries/BaseStackedRenderableSeries.js +3 -1
- package/Charting/Visuals/RenderableSeries/DrawingProviders/BandSeriesDrawingProvider.js +1 -1
- package/Charting/Visuals/RenderableSeries/DrawingProviders/BaseSeriesDrawingProvider.d.ts +7 -1
- package/Charting/Visuals/RenderableSeries/DrawingProviders/BaseSeriesDrawingProvider.js +66 -64
- package/Charting/Visuals/RenderableSeries/DrawingProviders/BubbleSeriesDrawingProvider.d.ts +7 -0
- package/Charting/Visuals/RenderableSeries/DrawingProviders/BubbleSeriesDrawingProvider.js +12 -0
- package/Charting/Visuals/RenderableSeries/DrawingProviders/MountainSeriesDrawingProvider.d.ts +2 -1
- package/Charting/Visuals/RenderableSeries/DrawingProviders/MountainSeriesDrawingProvider.js +6 -6
- package/Charting/Visuals/RenderableSeries/DrawingProviders/PointMarkerDrawingProvider.d.ts +6 -0
- package/Charting/Visuals/RenderableSeries/DrawingProviders/PointMarkerDrawingProvider.js +12 -0
- package/Charting/Visuals/RenderableSeries/FastBandRenderableSeries.d.ts +0 -6
- package/Charting/Visuals/RenderableSeries/FastBandRenderableSeries.js +0 -42
- package/Charting/Visuals/RenderableSeries/FastBubbleRenderableSeries.d.ts +0 -17
- package/Charting/Visuals/RenderableSeries/FastBubbleRenderableSeries.js +0 -71
- package/Charting/Visuals/RenderableSeries/FastCandlestickRenderableSeries.js +1 -1
- package/Charting/Visuals/RenderableSeries/FastOhlcRenderableSeries.js +1 -1
- package/Charting/Visuals/RenderableSeries/HitTest/BaseHitTestProvider.d.ts +4 -0
- package/Charting/Visuals/RenderableSeries/HitTest/BaseHitTestProvider.js +7 -0
- package/Charting/Visuals/RenderableSeries/HitTest/BubbleSeriesHitTestProvider.js +2 -1
- package/Charting/Visuals/RenderableSeries/HitTest/ColumnSeriesHitTestProvider.d.ts +4 -0
- package/Charting/Visuals/RenderableSeries/HitTest/ColumnSeriesHitTestProvider.js +7 -0
- package/Charting/Visuals/RenderableSeries/HitTest/IHitTestProvider.d.ts +13 -0
- package/Charting/Visuals/RenderableSeries/HitTest/OhlcSeriesHitTestProvider.d.ts +4 -0
- package/Charting/Visuals/RenderableSeries/HitTest/OhlcSeriesHitTestProvider.js +7 -0
- package/Charting/Visuals/RenderableSeries/HitTest/StackedColumnSeriesHitTestProvider.d.ts +4 -0
- package/Charting/Visuals/RenderableSeries/HitTest/StackedColumnSeriesHitTestProvider.js +7 -0
- package/Charting/Visuals/RenderableSeries/IBaseRenderableSeriesOptions.d.ts +17 -5
- package/Charting/Visuals/RenderableSeries/IRenderableSeries.d.ts +2 -2
- package/Charting/Visuals/RenderableSeries/SplineBandRenderableSeries.d.ts +3 -0
- package/Charting/Visuals/RenderableSeries/SplineBandRenderableSeries.js +10 -32
- package/Charting/Visuals/RenderableSeries/SplineLineRenderableSeries.d.ts +4 -0
- package/Charting/Visuals/RenderableSeries/SplineLineRenderableSeries.js +11 -21
- package/Charting/Visuals/RenderableSeries/SplineMountainRenderableSeries.d.ts +3 -0
- package/Charting/Visuals/RenderableSeries/SplineMountainRenderableSeries.js +10 -21
- package/Charting/Visuals/RenderableSeries/StackedColumnCollection.d.ts +18 -5
- package/Charting/Visuals/RenderableSeries/StackedColumnCollection.js +16 -35
- package/Charting/Visuals/RenderableSeries/StackedColumnRenderableSeries.js +4 -5
- package/Charting/Visuals/RenderableSeries/StackedMountainCollection.d.ts +2 -5
- package/Charting/Visuals/RenderableSeries/StackedMountainCollection.js +2 -35
- package/Charting/Visuals/RenderableSeries/StackedMountainRenderableSeries.js +3 -1
- package/Charting/Visuals/SciChartOverview.d.ts +1 -1
- package/Charting/Visuals/SciChartOverview.js +1 -1
- package/Charting/Visuals/SciChartPieSurface/PieSegment/PieSegment.d.ts +3 -1
- package/Charting/Visuals/SciChartPieSurface/PieSegment/PieSegment.js +9 -8
- package/Charting/Visuals/SciChartSurface.d.ts +20 -3
- package/Charting/Visuals/SciChartSurface.js +36 -8
- package/Charting/Visuals/SciChartSurfaceBase.d.ts +3 -3
- package/Charting/Visuals/SciChartSurfaceBase.js +2 -6
- package/Charting/Visuals/TextureManager/DpiHelper.d.ts +1 -1
- package/Charting/Visuals/TextureManager/DpiHelper.js +5 -3
- package/Charting/Visuals/TextureManager/TextureManager.d.ts +7 -1
- package/Charting/Visuals/TextureManager/TextureManager.js +14 -7
- package/Charting/Visuals/licenseManager2D.js +35 -28
- package/Charting/Visuals/loader.d.ts +3 -0
- package/Charting/Visuals/loader.js +3 -0
- package/Charting3D/Visuals/Primitives/BaseSceneEntity3D.d.ts +21 -45
- package/Charting3D/Visuals/Primitives/BaseSceneEntity3D.js +15 -36
- package/Charting3D/Visuals/RenderableSeries/BaseRenderableSeries3D.d.ts +35 -73
- package/Charting3D/Visuals/RenderableSeries/BaseRenderableSeries3D.js +25 -66
- package/Charting3D/Visuals/SciChart3DRenderer.js +1 -1
- package/Charting3D/Visuals/SciChart3DSurface.d.ts +13 -1
- package/Charting3D/Visuals/SciChart3DSurface.js +13 -1
- package/Core/ObservableArray.d.ts +8 -1
- package/Core/ObservableArray.js +7 -0
- package/_wasm/scichart.browser.js +1 -1
- package/_wasm/scichart2d.js +95 -95
- package/_wasm/scichart2d.wasm +0 -0
- package/_wasm/scichart3d.js +1 -1
- package/_wasm/scichart3d.wasm +0 -0
- package/package.json +1 -1
- package/types/AnchorPoint.d.ts +0 -3
- package/types/AnchorPoint.js +0 -3
- package/types/BaseType.d.ts +3 -1
- package/types/BaseType.js +2 -0
- package/types/DataFilterType.d.ts +9 -0
- package/types/DataFilterType.js +13 -0
- package/types/HelperTypes.d.ts +5 -0
- package/types/HelperTypes.js +2 -0
- package/types/SeriesType.d.ts +17 -17
- package/types/SeriesType.js +17 -17
- package/utils/font.d.ts +8 -0
- package/utils/font.js +15 -0
- package/utils/imageUtil.d.ts +6 -0
- package/utils/imageUtil.js +11 -1
|
@@ -128,7 +128,7 @@ export declare class RubberBandXyZoomModifier extends ChartModifierBase2D {
|
|
|
128
128
|
set fill(value: string);
|
|
129
129
|
toJSON(): {
|
|
130
130
|
type: string;
|
|
131
|
-
options: IChartModifierBaseOptions
|
|
131
|
+
options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
|
|
132
132
|
};
|
|
133
133
|
/**
|
|
134
134
|
* Performs the zoom operation on the parent Surface, using the mouse points from & to, which
|
|
@@ -1,10 +1,18 @@
|
|
|
1
|
+
import { EventHandler } from "../../Core/EventHandler";
|
|
2
|
+
import { EChart2DModifierType } from "../../types/ChartModifierType";
|
|
1
3
|
import { HoveredChangedArgs } from "../Visuals/RenderableSeries/HoveredChangedArgs";
|
|
2
|
-
import { ChartModifierBase2D, IChartModifierBaseOptions } from "./ChartModifierBase2D";
|
|
3
|
-
import { ModifierMouseArgs } from "./ModifierMouseArgs";
|
|
4
4
|
import { IRenderableSeries } from "../Visuals/RenderableSeries/IRenderableSeries";
|
|
5
|
-
import { EventHandler } from "../../Core/EventHandler";
|
|
6
5
|
import { SelectionChangedArgs } from "../Visuals/RenderableSeries/SelectionChangedArgs";
|
|
7
|
-
import {
|
|
6
|
+
import { ChartModifierBase2D, IChartModifierBaseOptions } from "./ChartModifierBase2D";
|
|
7
|
+
import { ModifierMouseArgs } from "./ModifierMouseArgs";
|
|
8
|
+
/**
|
|
9
|
+
* The type of the {@link ISeriesSelectionModifierOptions.onSelectionChanged } callback function
|
|
10
|
+
*/
|
|
11
|
+
export declare type TSelectionChangedCallback = (args: SelectionChangedArgs) => void;
|
|
12
|
+
/**
|
|
13
|
+
* The type of the {@link ISeriesSelectionModifierOptions.onHoverChanged } callback function
|
|
14
|
+
*/
|
|
15
|
+
export declare type THoveredChangedCallback = (args: HoveredChangedArgs) => void;
|
|
8
16
|
export interface ISeriesSelectionModifierOptions extends IChartModifierBaseOptions {
|
|
9
17
|
/**
|
|
10
18
|
* A hit-test radius in pixels used when selecting series. Defaults to 7
|
|
@@ -25,12 +33,12 @@ export interface ISeriesSelectionModifierOptions extends IChartModifierBaseOptio
|
|
|
25
33
|
* Optional callback for when any series is selected or deselected
|
|
26
34
|
* @param arg Argument of
|
|
27
35
|
*/
|
|
28
|
-
onSelectionChanged?:
|
|
36
|
+
onSelectionChanged?: TSelectionChangedCallback | string;
|
|
29
37
|
/**
|
|
30
38
|
* Optional callback for when any series is hovered or unhovered
|
|
31
39
|
* @param arg
|
|
32
40
|
*/
|
|
33
|
-
onHoverChanged?:
|
|
41
|
+
onHoverChanged?: THoveredChangedCallback | string;
|
|
34
42
|
}
|
|
35
43
|
export declare class SeriesSelectionModifier extends ChartModifierBase2D {
|
|
36
44
|
readonly type = EChart2DModifierType.SeriesSelection;
|
|
@@ -114,7 +122,7 @@ export declare class SeriesSelectionModifier extends ChartModifierBase2D {
|
|
|
114
122
|
modifierMouseUp(args: ModifierMouseArgs): void;
|
|
115
123
|
toJSON(): {
|
|
116
124
|
type: string;
|
|
117
|
-
options: IChartModifierBaseOptions
|
|
125
|
+
options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
|
|
118
126
|
};
|
|
119
127
|
/**
|
|
120
128
|
* This function called when the user sets series.isSelected = true elsewhere in code and we want to sync the modifier
|
|
@@ -14,14 +14,16 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
})();
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.SeriesSelectionModifier = void 0;
|
|
17
|
+
var classFactory_1 = require("../../Builder/classFactory");
|
|
18
|
+
var EventHandler_1 = require("../../Core/EventHandler");
|
|
19
|
+
var BaseType_1 = require("../../types/BaseType");
|
|
20
|
+
var ChartModifierType_1 = require("../../types/ChartModifierType");
|
|
21
|
+
var array_1 = require("../../utils/array");
|
|
17
22
|
var BaseHitTestProvider_1 = require("../Visuals/RenderableSeries/HitTest/BaseHitTestProvider");
|
|
18
23
|
var HoveredChangedArgs_1 = require("../Visuals/RenderableSeries/HoveredChangedArgs");
|
|
24
|
+
var SelectionChangedArgs_1 = require("../Visuals/RenderableSeries/SelectionChangedArgs");
|
|
19
25
|
var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
|
|
20
26
|
var constants_1 = require("./constants");
|
|
21
|
-
var EventHandler_1 = require("../../Core/EventHandler");
|
|
22
|
-
var SelectionChangedArgs_1 = require("../Visuals/RenderableSeries/SelectionChangedArgs");
|
|
23
|
-
var array_1 = require("../../utils/array");
|
|
24
|
-
var ChartModifierType_1 = require("../../types/ChartModifierType");
|
|
25
27
|
var SeriesSelectionModifier = /** @class */ (function (_super) {
|
|
26
28
|
__extends(SeriesSelectionModifier, _super);
|
|
27
29
|
/**
|
|
@@ -58,22 +60,20 @@ var SeriesSelectionModifier = /** @class */ (function (_super) {
|
|
|
58
60
|
if (options === null || options === void 0 ? void 0 : options.onSelectionChanged) {
|
|
59
61
|
if (typeof options.onSelectionChanged === "string") {
|
|
60
62
|
_this.typeMap.set("onSelectionChanged", options.onSelectionChanged);
|
|
61
|
-
|
|
62
|
-
_this.selectionChanged.subscribe(
|
|
63
|
+
var onSelectionChangedCallback = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onSelectionChanged);
|
|
64
|
+
_this.selectionChanged.subscribe(onSelectionChangedCallback);
|
|
63
65
|
}
|
|
64
66
|
else {
|
|
65
|
-
//@ts-ignore
|
|
66
67
|
_this.selectionChanged.subscribe(options.onSelectionChanged);
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
if (options === null || options === void 0 ? void 0 : options.onHoverChanged) {
|
|
70
71
|
if (typeof options.onHoverChanged === "string") {
|
|
71
72
|
_this.typeMap.set("onHoverChanged", options.onHoverChanged);
|
|
72
|
-
|
|
73
|
-
_this.hoverChanged.subscribe(
|
|
73
|
+
var onHoverChangedCallback = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onHoverChanged);
|
|
74
|
+
_this.hoverChanged.subscribe(onHoverChangedCallback);
|
|
74
75
|
}
|
|
75
76
|
else {
|
|
76
|
-
//@ts-ignore
|
|
77
77
|
_this.hoverChanged.subscribe(options.onHoverChanged);
|
|
78
78
|
}
|
|
79
79
|
}
|
|
@@ -69,7 +69,7 @@ export declare class XAxisDragModifier extends ChartModifierBase2D {
|
|
|
69
69
|
modifierMouseUp(args: ModifierMouseArgs): void;
|
|
70
70
|
toJSON(): {
|
|
71
71
|
type: string;
|
|
72
|
-
options: IChartModifierBaseOptions
|
|
72
|
+
options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
|
|
73
73
|
};
|
|
74
74
|
private updateCursor;
|
|
75
75
|
private doPanning;
|
|
@@ -70,7 +70,7 @@ export declare class YAxisDragModifier extends ChartModifierBase2D implements II
|
|
|
70
70
|
modifierMouseUp(args: ModifierMouseArgs): void;
|
|
71
71
|
toJSON(): {
|
|
72
72
|
type: string;
|
|
73
|
-
options: IChartModifierBaseOptions
|
|
73
|
+
options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
|
|
74
74
|
};
|
|
75
75
|
private updateCursor;
|
|
76
76
|
private doPanning;
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { TEasing } from "../../Core/Animations/EasingFunctions";
|
|
2
2
|
import { EChart2DModifierType } from "../../types/ChartModifierType";
|
|
3
|
+
import { SciChartSurface } from "../Visuals/SciChartSurface";
|
|
3
4
|
import { ChartModifierBase2D, IChartModifierBaseOptions } from "./ChartModifierBase2D";
|
|
4
5
|
import { ModifierMouseArgs } from "./ModifierMouseArgs";
|
|
6
|
+
/**
|
|
7
|
+
* A function to execute when zoomExtents is activated. If this exists and returns false, the builtin behaviour is ignored;
|
|
8
|
+
*/
|
|
9
|
+
export declare type TZoomExtentsCallback = (sciChartSurface: SciChartSurface) => boolean;
|
|
5
10
|
/**
|
|
6
11
|
* Optional parameters used to configure a {@link ZoomExtentsModifier} at construct time
|
|
7
12
|
*/
|
|
@@ -18,6 +23,10 @@ export interface IZoomExtentsModifierOptions extends IChartModifierBaseOptions {
|
|
|
18
23
|
* Defines the easing function for animation. See {@link TEasing} for a range of functions
|
|
19
24
|
*/
|
|
20
25
|
easingFunction?: TEasing | string;
|
|
26
|
+
/**
|
|
27
|
+
* A function to execute when zoomExtents is activated. If this exists and returns false, the builtin behaviour is ignored;
|
|
28
|
+
*/
|
|
29
|
+
onZoomExtents?: TZoomExtentsCallback | string;
|
|
21
30
|
}
|
|
22
31
|
/**
|
|
23
32
|
* The ZoomExtentsModifier provides double-tap or double-click to zoom-to-fit (Zoom Extents) behavior
|
|
@@ -49,6 +58,10 @@ export declare class ZoomExtentsModifier extends ChartModifierBase2D {
|
|
|
49
58
|
* Defines the easing function for animation. See {@link TEasing} for a range of functions
|
|
50
59
|
*/
|
|
51
60
|
easingFunction: TEasing;
|
|
61
|
+
/**
|
|
62
|
+
* A function to execute when zoomExtents is activated. If this exists and returns false, the builtin behaviour is ignored;
|
|
63
|
+
*/
|
|
64
|
+
onZoomExtents?: (sciChartSurface: SciChartSurface) => boolean;
|
|
52
65
|
constructor(options?: IZoomExtentsModifierOptions);
|
|
53
66
|
/**
|
|
54
67
|
* @inheritDoc
|
|
@@ -56,6 +69,6 @@ export declare class ZoomExtentsModifier extends ChartModifierBase2D {
|
|
|
56
69
|
modifierDoubleClick(args: ModifierMouseArgs): void;
|
|
57
70
|
toJSON(): {
|
|
58
71
|
type: string;
|
|
59
|
-
options: IChartModifierBaseOptions
|
|
72
|
+
options: Required<Pick<IChartModifierBaseOptions, "id" | "xAxisId" | "yAxisId" | "executeOn" | "xyDirection" | "modifierGroup">>;
|
|
60
73
|
};
|
|
61
74
|
}
|
|
@@ -14,7 +14,9 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
})();
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.ZoomExtentsModifier = void 0;
|
|
17
|
+
var classFactory_1 = require("../../Builder/classFactory");
|
|
17
18
|
var EasingFunctions_1 = require("../../Core/Animations/EasingFunctions");
|
|
19
|
+
var BaseType_1 = require("../../types/BaseType");
|
|
18
20
|
var ChartModifierType_1 = require("../../types/ChartModifierType");
|
|
19
21
|
var ZoomState_1 = require("../../types/ZoomState");
|
|
20
22
|
var ChartModifierBase2D_1 = require("./ChartModifierBase2D");
|
|
@@ -58,6 +60,13 @@ var ZoomExtentsModifier = /** @class */ (function (_super) {
|
|
|
58
60
|
options.easingFunction = EasingFunctions_1.easing[options.easingFunction];
|
|
59
61
|
}
|
|
60
62
|
_this.easingFunction = (_c = options === null || options === void 0 ? void 0 : options.easingFunction) !== null && _c !== void 0 ? _c : EasingFunctions_1.easing.outExpo;
|
|
63
|
+
if (options === null || options === void 0 ? void 0 : options.onZoomExtents) {
|
|
64
|
+
if (typeof options.onZoomExtents === "string") {
|
|
65
|
+
_this.typeMap.set("onZoomExtents", options.onZoomExtents);
|
|
66
|
+
options.onZoomExtents = classFactory_1.getFunction(BaseType_1.EBaseType.OptionFunction, options.onZoomExtents);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
_this.onZoomExtents = options === null || options === void 0 ? void 0 : options.onZoomExtents;
|
|
61
70
|
return _this;
|
|
62
71
|
}
|
|
63
72
|
/**
|
|
@@ -66,9 +75,11 @@ var ZoomExtentsModifier = /** @class */ (function (_super) {
|
|
|
66
75
|
ZoomExtentsModifier.prototype.modifierDoubleClick = function (args) {
|
|
67
76
|
var scs = this.parentSurface;
|
|
68
77
|
if (scs !== undefined) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
78
|
+
if (!this.onZoomExtents || this.onZoomExtents(scs)) {
|
|
79
|
+
var animationDuration = this.isAnimated ? this.animationDuration : 0;
|
|
80
|
+
scs.zoomExtents(animationDuration, this.easingFunction, function () { return scs.setZoomState(ZoomState_1.EZoomState.AtExtents); });
|
|
81
|
+
args.handled = true;
|
|
82
|
+
}
|
|
72
83
|
}
|
|
73
84
|
};
|
|
74
85
|
ZoomExtentsModifier.prototype.toJSON = function () {
|
|
@@ -76,7 +87,8 @@ var ZoomExtentsModifier = /** @class */ (function (_super) {
|
|
|
76
87
|
var options = {
|
|
77
88
|
animationDuration: this.animationDuration,
|
|
78
89
|
easingFunction: this.easingFunction.name,
|
|
79
|
-
isAnimated: this.isAnimated
|
|
90
|
+
isAnimated: this.isAnimated,
|
|
91
|
+
onZoomExtents: this.typeMap.get("onZoomExtents")
|
|
80
92
|
};
|
|
81
93
|
Object.assign(json.options, options);
|
|
82
94
|
return json;
|
|
@@ -47,20 +47,18 @@ var BrushCache = /** @class */ (function (_super) {
|
|
|
47
47
|
* @param fillLinearGradient
|
|
48
48
|
*/
|
|
49
49
|
BrushCache.prototype.create = function (fill, opacity, fillLinearGradient) {
|
|
50
|
-
if (this.cachedEntity
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
if (this.cachedEntity &&
|
|
51
|
+
fill === this.fill &&
|
|
52
|
+
opacity === this.opacity &&
|
|
53
|
+
fillLinearGradient === this.fillLinearGradient) {
|
|
54
54
|
return this.cachedEntity;
|
|
55
55
|
}
|
|
56
56
|
this.invalidateCache();
|
|
57
57
|
this.fill = fill;
|
|
58
58
|
this.opacity = opacity;
|
|
59
59
|
this.fillLinearGradient = fillLinearGradient;
|
|
60
|
-
var brush = fillLinearGradient
|
|
61
|
-
|
|
62
|
-
: this.createSolidBrush(fill, opacity);
|
|
63
|
-
return this.cachedEntity = new WebGlBrush_1.WebGlBrush(brush);
|
|
60
|
+
var brush = fillLinearGradient ? this.createGradientBrush() : this.createSolidBrush(fill, opacity);
|
|
61
|
+
return (this.cachedEntity = new WebGlBrush_1.WebGlBrush(brush));
|
|
64
62
|
};
|
|
65
63
|
BrushCache.prototype.invalidateCache = function () {
|
|
66
64
|
_super.prototype.invalidateCache.call(this);
|
|
@@ -32,16 +32,14 @@ export declare class Pen2DCache extends BaseCache<WebGlPen> {
|
|
|
32
32
|
private stroke;
|
|
33
33
|
private opacity;
|
|
34
34
|
private strokeThickness;
|
|
35
|
+
private adjustedStrokeThickness;
|
|
35
36
|
private strokeDashArray;
|
|
37
|
+
private adjustedStrokeDashArray;
|
|
36
38
|
private antiAliased;
|
|
37
39
|
get value(): WebGlPen;
|
|
38
40
|
/**
|
|
39
|
-
* Creates or fetches a new pen with the specified color string,
|
|
40
|
-
* @param
|
|
41
|
-
* @param strokeThickness
|
|
42
|
-
* @param strokeDashArray
|
|
43
|
-
* @param antiAliased
|
|
44
|
-
* @param opacity
|
|
41
|
+
* Creates or fetches a new pen with the specified color string, stroke thickness and antialiased property
|
|
42
|
+
* @param options
|
|
45
43
|
*/
|
|
46
44
|
create(options: IPenOptions): WebGlPen;
|
|
47
45
|
}
|
|
@@ -17,6 +17,7 @@ exports.createPenInCache = exports.getScrtPenFromCache = exports.getWebGlPenFrom
|
|
|
17
17
|
var Deleter_1 = require("../../Core/Deleter");
|
|
18
18
|
var Guard_1 = require("../../Core/Guard");
|
|
19
19
|
var array_1 = require("../../utils/array");
|
|
20
|
+
var parseColor_1 = require("../../utils/parseColor");
|
|
20
21
|
var createPen_1 = require("../Visuals/Helpers/createPen");
|
|
21
22
|
var DpiHelper_1 = require("../Visuals/TextureManager/DpiHelper");
|
|
22
23
|
var BaseCache_1 = require("./BaseCache");
|
|
@@ -48,26 +49,26 @@ var Pen2DCache = /** @class */ (function (_super) {
|
|
|
48
49
|
configurable: true
|
|
49
50
|
});
|
|
50
51
|
/**
|
|
51
|
-
* Creates or fetches a new pen with the specified color string,
|
|
52
|
-
* @param
|
|
53
|
-
* @param strokeThickness
|
|
54
|
-
* @param strokeDashArray
|
|
55
|
-
* @param antiAliased
|
|
56
|
-
* @param opacity
|
|
52
|
+
* Creates or fetches a new pen with the specified color string, stroke thickness and antialiased property
|
|
53
|
+
* @param options
|
|
57
54
|
*/
|
|
58
55
|
Pen2DCache.prototype.create = function (options) {
|
|
59
56
|
var stroke = options.stroke, _a = options.strokeThickness, strokeThickness = _a === void 0 ? 1 : _a, strokeDashArray = options.strokeDashArray, _b = options.antiAliased, antiAliased = _b === void 0 ? true : _b, _c = options.opacity, opacity = _c === void 0 ? 1 : _c;
|
|
57
|
+
var _d = DpiHelper_1.DpiHelper.adjustStrokeSize({ strokeThickness: strokeThickness, strokeDashArray: strokeDashArray }), adjustedStrokeThickness = _d.strokeThickness, adjustedStrokeDashArray = _d.strokeDashArray;
|
|
60
58
|
// Return pen from cache
|
|
61
59
|
if (this.cachedEntity &&
|
|
62
60
|
stroke === this.stroke &&
|
|
63
|
-
|
|
61
|
+
adjustedStrokeThickness === this.adjustedStrokeThickness &&
|
|
64
62
|
antiAliased === this.antiAliased &&
|
|
65
|
-
array_1.areArraysEqual(
|
|
63
|
+
array_1.areArraysEqual(adjustedStrokeDashArray, this.adjustedStrokeDashArray)) {
|
|
66
64
|
// optimization for opacity updates
|
|
67
65
|
if (opacity !== this.opacity) {
|
|
68
66
|
this.opacity = opacity;
|
|
69
67
|
this.cachedEntity.setOpacity(opacity);
|
|
70
68
|
}
|
|
69
|
+
// ensure that original stroke size is cached
|
|
70
|
+
this.strokeThickness = strokeThickness;
|
|
71
|
+
this.strokeDashArray = strokeDashArray;
|
|
71
72
|
return this.cachedEntity;
|
|
72
73
|
}
|
|
73
74
|
// Create new pen
|
|
@@ -76,9 +77,11 @@ var Pen2DCache = /** @class */ (function (_super) {
|
|
|
76
77
|
this.opacity = opacity;
|
|
77
78
|
this.antiAliased = antiAliased;
|
|
78
79
|
this.strokeThickness = strokeThickness;
|
|
80
|
+
this.adjustedStrokeThickness = adjustedStrokeThickness;
|
|
79
81
|
this.strokeDashArray = strokeDashArray;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
+
this.adjustedStrokeDashArray = adjustedStrokeDashArray;
|
|
83
|
+
var scrtPen = createPen_1.createSCRTPen(this.webAssemblyContext, stroke, adjustedStrokeThickness, opacity, adjustedStrokeDashArray, antiAliased);
|
|
84
|
+
return (this.cachedEntity = new WebGlPen_1.WebGlPen(scrtPen, parseColor_1.parseColorToUIntArgb(stroke)));
|
|
82
85
|
};
|
|
83
86
|
return Pen2DCache;
|
|
84
87
|
}(BaseCache_1.BaseCache));
|
|
@@ -116,7 +119,7 @@ exports.createPenInCache = function (penCache, stroke, strokeThickness, opacity,
|
|
|
116
119
|
Guard_1.Guard.notNull(penCache, "penCache");
|
|
117
120
|
var cachedPen = penCache.create({
|
|
118
121
|
stroke: stroke,
|
|
119
|
-
strokeThickness: strokeThickness
|
|
122
|
+
strokeThickness: strokeThickness,
|
|
120
123
|
opacity: opacity,
|
|
121
124
|
strokeDashArray: strokeDashArray
|
|
122
125
|
});
|
|
@@ -10,8 +10,9 @@ export declare class WebGlPen implements IPen2D {
|
|
|
10
10
|
/**
|
|
11
11
|
* Creates an instance of WebGlPen
|
|
12
12
|
* @param scrtPen the inner {@link SCRTPen} which can be passed to SciChart's WebAssembly WebGL engine
|
|
13
|
+
* @param originalColor the original color which is used to change the opacity
|
|
13
14
|
*/
|
|
14
|
-
constructor(scrtPen: SCRTPen);
|
|
15
|
+
constructor(scrtPen: SCRTPen, originalColor?: number);
|
|
15
16
|
/**
|
|
16
17
|
* the inner {@link SCRTPen} which can be passed to SciChart's WebAssembly WebGL engine
|
|
17
18
|
*/
|
|
@@ -12,10 +12,11 @@ var WebGlPen = /** @class */ (function () {
|
|
|
12
12
|
/**
|
|
13
13
|
* Creates an instance of WebGlPen
|
|
14
14
|
* @param scrtPen the inner {@link SCRTPen} which can be passed to SciChart's WebAssembly WebGL engine
|
|
15
|
+
* @param originalColor the original color which is used to change the opacity
|
|
15
16
|
*/
|
|
16
|
-
function WebGlPen(scrtPen) {
|
|
17
|
+
function WebGlPen(scrtPen, originalColor) {
|
|
17
18
|
this.scrtPenProperty = scrtPen;
|
|
18
|
-
this.originalColor = scrtPen === null || scrtPen === void 0 ? void 0 : scrtPen.m_uiColor;
|
|
19
|
+
this.originalColor = originalColor !== null && originalColor !== void 0 ? originalColor : scrtPen === null || scrtPen === void 0 ? void 0 : scrtPen.m_uiColor;
|
|
19
20
|
}
|
|
20
21
|
Object.defineProperty(WebGlPen.prototype, "scrtPen", {
|
|
21
22
|
/**
|
|
@@ -28,7 +28,7 @@ var BottomAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
|
|
|
28
28
|
}
|
|
29
29
|
BottomAlignedOuterAxisLayoutStrategy.prototype.measureAxes = function (sciChartSurface, chartLayoutState, axes) {
|
|
30
30
|
var _a, _b;
|
|
31
|
-
var requiredSize = (_b = (_a = sciChartSurface.
|
|
31
|
+
var requiredSize = (_b = (_a = sciChartSurface.adjustedPadding) === null || _a === void 0 ? void 0 : _a.bottom) !== null && _b !== void 0 ? _b : 0;
|
|
32
32
|
requiredSize += sciChartSurface.bottomViewportBorder + sciChartSurface.bottomCanvasBorder;
|
|
33
33
|
axes.forEach(function (axis) {
|
|
34
34
|
axis.measure();
|
|
@@ -39,8 +39,8 @@ var BottomAlignedOuterHorizontallyStackedAxisLayoutStrategy = /** @class */ (fun
|
|
|
39
39
|
var firstStackedAxis = axes[0];
|
|
40
40
|
var lastStackedAxis = axes[axes.length - 1];
|
|
41
41
|
AxisLayoutHelpers_1.updateLeftAndRightChartLayoutState(chartLayoutState, firstStackedAxis === null || firstStackedAxis === void 0 ? void 0 : firstStackedAxis.axisLayoutState.additionalLeftSize, lastStackedAxis === null || lastStackedAxis === void 0 ? void 0 : lastStackedAxis.axisLayoutState.additionalRightSize);
|
|
42
|
-
var bottomViewportBorder = sciChartSurface.bottomViewportBorder, bottomCanvasBorder = sciChartSurface.bottomCanvasBorder,
|
|
43
|
-
requiredSize += (_a = bottomViewportBorder + bottomCanvasBorder + (
|
|
42
|
+
var bottomViewportBorder = sciChartSurface.bottomViewportBorder, bottomCanvasBorder = sciChartSurface.bottomCanvasBorder, adjustedPadding = sciChartSurface.adjustedPadding;
|
|
43
|
+
requiredSize += (_a = bottomViewportBorder + bottomCanvasBorder + (adjustedPadding === null || adjustedPadding === void 0 ? void 0 : adjustedPadding.bottom)) !== null && _a !== void 0 ? _a : 0;
|
|
44
44
|
chartLayoutState.bottomOuterAreaSize = Math.max(chartLayoutState.bottomOuterAreaSize, requiredSize);
|
|
45
45
|
};
|
|
46
46
|
BottomAlignedOuterHorizontallyStackedAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
|
|
@@ -57,6 +57,7 @@ var BottomAlignedOuterHorizontallyStackedAxisLayoutStrategy = /** @class */ (fun
|
|
|
57
57
|
leftOffset += additionalLeftSize;
|
|
58
58
|
axis.offset = leftOffset - left;
|
|
59
59
|
axis.axisLength = rightOffset - leftOffset;
|
|
60
|
+
axis.isStackedAxis = true;
|
|
60
61
|
axis.isPrimaryAxis = true;
|
|
61
62
|
axis.viewRect = Rect_1.Rect.createWithCoords(leftOffset, topOffset, rightOffset, bottomOffset);
|
|
62
63
|
leftOffset = rightOffset + additionalRightSize;
|
|
@@ -29,7 +29,7 @@ var LeftAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
|
|
|
29
29
|
}
|
|
30
30
|
LeftAlignedOuterAxisLayoutStrategy.prototype.measureAxes = function (sciChartSurface, chartLayoutState, axes) {
|
|
31
31
|
var _a, _b;
|
|
32
|
-
var requiredSize = (_b = (_a = sciChartSurface.
|
|
32
|
+
var requiredSize = (_b = (_a = sciChartSurface.adjustedPadding) === null || _a === void 0 ? void 0 : _a.left) !== null && _b !== void 0 ? _b : 0;
|
|
33
33
|
requiredSize += sciChartSurface.leftViewportBorder + sciChartSurface.leftCanvasBorder;
|
|
34
34
|
axes.forEach(function (axis) {
|
|
35
35
|
axis.measure();
|
|
@@ -39,8 +39,8 @@ var LeftAlignedOuterVerticallyStackedAxisLayoutStrategy = /** @class */ (functio
|
|
|
39
39
|
var firstStackedAxis = axes[0];
|
|
40
40
|
var lastStackedAxis = axes[axes.length - 1];
|
|
41
41
|
AxisLayoutHelpers_1.updateTopAndBottomChartLayoutState(chartLayoutState, firstStackedAxis === null || firstStackedAxis === void 0 ? void 0 : firstStackedAxis.axisLayoutState.additionalTopSize, lastStackedAxis === null || lastStackedAxis === void 0 ? void 0 : lastStackedAxis.axisLayoutState.additionalBottomSize);
|
|
42
|
-
var leftViewportBorder = sciChartSurface.leftViewportBorder, leftCanvasBorder = sciChartSurface.leftCanvasBorder,
|
|
43
|
-
requiredSize += (_a = leftViewportBorder + leftCanvasBorder + (
|
|
42
|
+
var leftViewportBorder = sciChartSurface.leftViewportBorder, leftCanvasBorder = sciChartSurface.leftCanvasBorder, adjustedPadding = sciChartSurface.adjustedPadding;
|
|
43
|
+
requiredSize += (_a = leftViewportBorder + leftCanvasBorder + (adjustedPadding === null || adjustedPadding === void 0 ? void 0 : adjustedPadding.left)) !== null && _a !== void 0 ? _a : 0;
|
|
44
44
|
chartLayoutState.leftOuterAreaSize = Math.max(chartLayoutState.leftOuterAreaSize, requiredSize);
|
|
45
45
|
};
|
|
46
46
|
LeftAlignedOuterVerticallyStackedAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
|
|
@@ -57,6 +57,7 @@ var LeftAlignedOuterVerticallyStackedAxisLayoutStrategy = /** @class */ (functio
|
|
|
57
57
|
topOffset += additionalTopSize;
|
|
58
58
|
axis.offset = topOffset - top;
|
|
59
59
|
axis.axisLength = bottomOffset - topOffset;
|
|
60
|
+
axis.isStackedAxis = true;
|
|
60
61
|
axis.isPrimaryAxis = true;
|
|
61
62
|
axis.viewRect = Rect_1.Rect.createWithCoords(leftOffset, topOffset, rightOffset, bottomOffset);
|
|
62
63
|
topOffset = bottomOffset + additionalBottomSize;
|
|
@@ -28,7 +28,7 @@ var RightAlignedOuterAxisLayoutStrategy = /** @class */ (function (_super) {
|
|
|
28
28
|
}
|
|
29
29
|
RightAlignedOuterAxisLayoutStrategy.prototype.measureAxes = function (sciChartSurface, chartLayoutState, axes) {
|
|
30
30
|
var _a, _b;
|
|
31
|
-
var requiredSize = (_b = (_a = sciChartSurface.
|
|
31
|
+
var requiredSize = (_b = (_a = sciChartSurface.adjustedPadding) === null || _a === void 0 ? void 0 : _a.right) !== null && _b !== void 0 ? _b : 0;
|
|
32
32
|
requiredSize += sciChartSurface.rightViewportBorder + sciChartSurface.rightCanvasBorder;
|
|
33
33
|
axes.forEach(function (axis) {
|
|
34
34
|
axis.measure();
|
|
@@ -39,8 +39,8 @@ var RightAlignedOuterVerticallyStackedAxisLayoutStrategy = /** @class */ (functi
|
|
|
39
39
|
var firstStackedAxis = axes[0];
|
|
40
40
|
var lastStackedAxis = axes[axes.length - 1];
|
|
41
41
|
AxisLayoutHelpers_1.updateTopAndBottomChartLayoutState(chartLayoutState, firstStackedAxis === null || firstStackedAxis === void 0 ? void 0 : firstStackedAxis.axisLayoutState.additionalTopSize, lastStackedAxis === null || lastStackedAxis === void 0 ? void 0 : lastStackedAxis.axisLayoutState.additionalBottomSize);
|
|
42
|
-
var rightViewportBorder = sciChartSurface.rightViewportBorder, rightCanvasBorder = sciChartSurface.rightCanvasBorder,
|
|
43
|
-
requiredSize += (_a = rightViewportBorder + rightCanvasBorder + (
|
|
42
|
+
var rightViewportBorder = sciChartSurface.rightViewportBorder, rightCanvasBorder = sciChartSurface.rightCanvasBorder, adjustedPadding = sciChartSurface.adjustedPadding;
|
|
43
|
+
requiredSize += (_a = rightViewportBorder + rightCanvasBorder + (adjustedPadding === null || adjustedPadding === void 0 ? void 0 : adjustedPadding.right)) !== null && _a !== void 0 ? _a : 0;
|
|
44
44
|
chartLayoutState.rightOuterAreaSize = Math.max(chartLayoutState.rightOuterAreaSize, requiredSize);
|
|
45
45
|
};
|
|
46
46
|
RightAlignedOuterVerticallyStackedAxisLayoutStrategy.prototype.layoutAxes = function (left, top, right, bottom, axes) {
|
|
@@ -57,6 +57,7 @@ var RightAlignedOuterVerticallyStackedAxisLayoutStrategy = /** @class */ (functi
|
|
|
57
57
|
topOffset += additionalTopSize;
|
|
58
58
|
axis.offset = topOffset - top;
|
|
59
59
|
axis.axisLength = bottomOffset - topOffset;
|
|
60
|
+
axis.isStackedAxis = true;
|
|
60
61
|
axis.isPrimaryAxis = true;
|
|
61
62
|
axis.viewRect = Rect_1.Rect.createWithCoords(leftOffset, topOffset, rightOffset, bottomOffset);
|
|
62
63
|
topOffset = bottomOffset + additionalBottomSize;
|