mdt-charts 1.12.5 → 1.12.6

package/lib/engine/features/gridLine/gidLineHelper.d.ts

@@ -1,3 +1,4 @@
+import { AxisScale } from "d3-axis";
 import { Size } from "../../../config/config";
 import { AxisModelOptions, BlockMargin } from "../../../model/model";
 export declare type GridLineType = 'key' | 'value';
@@ -10,4 +11,5 @@ export interface GridLineAttributes {
 export declare class GridLineHelper {
     static getGridLineLength(gridLineType: GridLineType, keyAxis: AxisModelOptions, valueAxis: AxisModelOptions, blockSize: Size, margin: BlockMargin): number;
     static getLineAttributes(axis: AxisModelOptions, lineLength: number): GridLineAttributes;
+    static getKeyLineAttributes(axis: AxisModelOptions, scaleValue: AxisScale<any>): GridLineAttributes;
 }

package/lib/engine/features/gridLine/gidLineHelper.js

@@ -1,3 +1,4 @@
+import { max, min } from "d3-array";
 export class GridLineHelper {
     static getGridLineLength(gridLineType, keyAxis, valueAxis, blockSize, margin) {
         let axis;
@@ -27,4 +28,25 @@ export class GridLineHelper {
             attributes.y2 = lineLength;
         return attributes;
     }
+    static getKeyLineAttributes(axis, scaleValue) {
+        const attributes = {
+            x1: 0,
+            y1: 0,
+            x2: 0,
+            y2: 0
+        };
+        const scaledStart = scaleValue(scaleValue.domain()[0]);
+        const scaledEnd = scaleValue(scaleValue.domain()[1]);
+        const minCoord = min([scaledStart, scaledEnd]) - scaleValue(0);
+        const maxCoord = max([scaledStart, scaledEnd]) - scaleValue(0);
+        if (axis.orient === 'left' || axis.orient === 'right') {
+            attributes.x1 = minCoord;
+            attributes.x2 = maxCoord;
+        }
+        else {
+            attributes.y1 = minCoord;
+            attributes.y2 = maxCoord;
+        }
+        return attributes;
+    }
 }

package/lib/engine/features/gridLine/gridLine.d.ts

@@ -1,11 +1,13 @@
 import { Size } from "../../../config/config";
-import { BlockMargin, GridLineFlag, IAxisModel, ScaleKeyModel } from "../../../model/model";
+import { BlockMargin, GridLineFlag, IAxisModel } from "../../../model/model";
 import { Block } from "../../block/block";
+import { Scales } from "../scale/scale";
 export declare class GridLine {
     private static readonly gridLineClass;
-    static render(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scaleKey: ScaleKeyModel): void;
-    static update(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scaleKey: ScaleKeyModel): void;
+    static render(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scales: Scales): void;
+    static update(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scales: Scales): void;
     private static renderLine;
     private static clear;
     private static removeGridLinesOnAxes;
+    private static rmGridLineOnTick;
 }

package/lib/engine/features/gridLine/gridLine.js

@@ -1,24 +1,20 @@
 import { GridLineHelper } from "./gidLineHelper";
 export class GridLine {
-    static render(block, gridLineFlag, axes, blockSize, margin, scaleKey) {
+    static render(block, gridLineFlag, axes, blockSize, margin, scales) {
         if (gridLineFlag.value) {
             const lineLength = GridLineHelper.getGridLineLength('value', axes.key, axes.value, blockSize, margin);
             const lineAttributes = GridLineHelper.getLineAttributes(axes.value, lineLength);
             this.renderLine(block, axes.value, lineAttributes);
         }
         if (gridLineFlag.key) {
-            const lineLength = GridLineHelper.getGridLineLength('key', axes.key, axes.value, blockSize, margin);
-            const lineAttributes = GridLineHelper.getLineAttributes(axes.key, lineLength);
+            const lineAttributes = GridLineHelper.getKeyLineAttributes(axes.key, scales.value);
             this.renderLine(block, axes.key, lineAttributes);
         }
-        if (scaleKey.type === 'point' && (gridLineFlag.key || gridLineFlag.value))
-            this.removeGridLinesOnAxes(block, axes.key, axes.value, false);
-        else if (gridLineFlag.key || gridLineFlag.value)
-            this.removeGridLinesOnAxes(block, axes.key, axes.value, true);
+        this.removeGridLinesOnAxes(block, axes.key, axes.value, true);
     }
-    static update(block, gridLineFlag, axes, blockSize, margin, scaleKey) {
+    static update(block, gridLineFlag, axes, blockSize, margin, scales) {
         this.clear(block, axes.key.cssClass, axes.value.cssClass);
-        this.render(block, gridLineFlag, axes, blockSize, margin, scaleKey);
+        this.render(block, gridLineFlag, axes, blockSize, margin, scales);
     }
     static renderLine(block, axis, lineAttributes) {
         block
@@ -51,17 +47,20 @@ export class GridLine {
             tickOnValueAxisSelector = ':last-of-type';
         if (keyAxis.orient === 'bottom' || keyAxis.orient === 'right')
             tickOnKeyAxisSelector = ':last-of-type';
-        block.getSvg()
+        const tickOnKey = block.getSvg()
             .select(`.${valueAxis.cssClass}`)
-            .select(`g.tick${tickOnKeyAxisSelector}`)
+            .select(`g.tick${tickOnKeyAxisSelector}`);
+        const tickOnValue = block.getSvg()
+            .select(`.${keyAxis.cssClass}`)
+            .select(`g.tick${tickOnValueAxisSelector}`);
+        // this.rmGridLineOnTick(tickOnKey);
+        // if (!excludeKey)
+        //     this.rmGridLineOnTick(tickOnValue);
+    }
+    static rmGridLineOnTick(tick) {
+        tick
             .select(`.${this.gridLineClass}`)
             .remove();
-        if (!excludeKey)
-            block.getSvg()
-                .select(`.${keyAxis.cssClass}`)
-                .select(`g.tick${tickOnValueAxisSelector}`)
-                .select(`.${this.gridLineClass}`)
-                .remove();
     }
 }
 GridLine.gridLineClass = 'grid-line';

package/lib/engine/intervalNotation/intervalManager.js

@@ -11,7 +11,7 @@ export class IntervalManager {
         block.renderSvg(model.blockCanvas.size);
         const scales = Scale.getScales(options.scale.key, options.scale.value, options.chartSettings.bar);
         Axis.render(block, scales, options.scale, options.axis, model.blockCanvas.size);
-        GridLine.render(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, options.scale.key);
+        GridLine.render(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, scales);
         this.renderCharts(block, options.charts, scales, data, options.data, model.chartBlock.margin, options.axis.key.orient, options.chartSettings);
         Title.render(block, options.title, model.otherComponents.titleBlock, model.blockCanvas.size);
         Legend.render(block, data, options, model);

package/lib/engine/twoDimensionalNotation/twoDimensionalManager.js

@@ -20,7 +20,7 @@ export class TwoDimensionalManager {
         engine.block.scales = scales;
         engine.block.renderSvg(model.blockCanvas.size);
         Axis.render(engine.block, scales, options.scale, options.axis, model.blockCanvas.size);
-        GridLine.render(engine.block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, options.scale.key);
+        GridLine.render(engine.block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, scales);
         this.renderCharts(engine.block, options.charts, scales, engine.data, options.data, model.chartBlock.margin, options.axis.key.orient, options.chartSettings.bar, model.blockCanvas.size);
         engine.block.filterEventManager.registerEventFor2D(scales.key, model.chartBlock.margin, model.blockCanvas.size, options);
         engine.block.filterEventManager.event2DUpdate(options);
@@ -49,7 +49,7 @@ export class TwoDimensionalManager {
         const keyDomainEquality = Helper.checkDomainsEquality(block.scales.key.domain(), scales.key.domain());
         block.scales = scales;
         Axis.update(block, scales, options.scale, options.axis, model.blockCanvas.size, keyDomainEquality);
-        GridLine.update(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, options.scale.key);
+        GridLine.update(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, scales);
         const promises = this.updateCharts(block, options.charts, scales, data, model.options.data, model.chartBlock.margin, options.axis.key.orient, model.blockCanvas.size, options.chartSettings.bar);
         Promise.all(promises)
             .then(() => {

package/lib/model/featuresModel/axisModel.js

@@ -118,7 +118,6 @@ export class AxisModel {
             translateX = getZeroCoordinate() + canvasModel.getMarginSide("left");
             translateY = AxisModel.getAxisTranslateY(AxisType.Key, chartOrientation, axisPosition, canvasModel);
         }
-        console.log(translateX, translateY);
         return {
             translateX,
             translateY

package/lib/model/featuresModel/scaleModel/scaleAxisRecalcer.d.ts

@@ -0,0 +1,20 @@
+import { ScaleLinear, ScaleTime } from "d3-scale";
+import { ChartOrientation, DiscreteAxisOptions } from "../../../config/config";
+import { ScaleValueModel } from "../../model";
+import { CanvasModel } from "../../modelInstance/canvasModel/canvasModel";
+export declare const keyAxisLabelVerticalLog = "keyAxisLabel_vertical_margin_log";
+export declare const keyAxisLabelHorizontalLog = "keyAxisLabel_horizontal_margin_log";
+interface ScaleInfo {
+    scale: ScaleValueModel;
+    scaleFn: ScaleLinear<number, number, never> | ScaleTime<number, number, never>;
+}
+/**
+ * Предназначен для получения нового scaleValue и уменьшения globalMargin, если ось ключей находится где-то внутри chartBlock, а не на его границе
+ */
+export declare class ScaleAxisRecalcer {
+    private generateScaleLinear;
+    constructor(generateScaleLinear: () => ScaleValueModel);
+    recalculateMargin(canvasModel: CanvasModel, chartOrientation: ChartOrientation, keyAxis: DiscreteAxisOptions): void;
+    getScaleValue(): ScaleInfo;
+}
+export {};

package/lib/model/featuresModel/scaleModel/scaleAxisRecalcer.js

@@ -0,0 +1,31 @@
+import { Scale } from "../../../engine/features/scale/scale";
+export const keyAxisLabelVerticalLog = "keyAxisLabel_vertical_margin_log";
+export const keyAxisLabelHorizontalLog = "keyAxisLabel_horizontal_margin_log";
+/**
+ * Предназначен для получения нового scaleValue и уменьшения globalMargin, если ось ключей находится где-то внутри chartBlock, а не на его границе
+ */
+export class ScaleAxisRecalcer {
+    constructor(generateScaleLinear) {
+        this.generateScaleLinear = generateScaleLinear;
+    }
+    recalculateMargin(canvasModel, chartOrientation, keyAxis) {
+        const scaleValue = this.generateScaleLinear();
+        //TODO: rm import from engine
+        const scaleValueFn = Scale.getScaleValue(scaleValue);
+        const coordinateOnChartBlock = (keyAxis.position === "start"
+            ? scaleValueFn(0)
+            : (chartOrientation === "vertical"
+                ? canvasModel.getChartBlockHeight()
+                : canvasModel.getChartBlockWidth()) - scaleValueFn(0));
+        const key = chartOrientation === "vertical" ? keyAxisLabelVerticalLog : keyAxisLabelHorizontalLog;
+        const logInfo = canvasModel.marginService.getDataByKey(key);
+        canvasModel.decreaseMarginSide(logInfo.side, logInfo.byValue - coordinateOnChartBlock < 0 ? logInfo.byValue : coordinateOnChartBlock);
+    }
+    getScaleValue() {
+        const scale = this.generateScaleLinear();
+        return {
+            scale,
+            scaleFn: Scale.getScaleValue(scale)
+        };
+    }
+}

package/lib/model/featuresModel/scaleModel/scaleModel.d.ts

@@ -0,0 +1,19 @@
+import { ScaleKeyModel, ScaleKeyType, ScaleValueModel, ScaleValueType } from "../../model";
+import { AxisPosition, NumberDomain, IntervalChart, MdtChartsTwoDimensionalChart, MdtChartsTwoDimensionalOptions, ChartOrientation, MdtChartsDataSource, MdtChartsDataRow } from "../../../config/config";
+import { CanvasModel } from "../../modelInstance/canvasModel/canvasModel";
+export declare enum ScaleType {
+    Key = 0,
+    Value = 1
+}
+export declare class ScaleModel {
+    static getScaleKey(allowableKeys: string[], orient: ChartOrientation, canvasModel: CanvasModel, charts: MdtChartsTwoDimensionalChart[], barCharts: MdtChartsTwoDimensionalChart[]): ScaleKeyModel;
+    static getScaleLinear(options: MdtChartsTwoDimensionalOptions, data: MdtChartsDataSource, canvasModel: CanvasModel): ScaleValueModel;
+    static getRangePeek(scaleType: ScaleType, chartOrientation: string, canvasModel: CanvasModel): number;
+    static getDateValueDomain(data: MdtChartsDataSource, chart: IntervalChart, keyAxisPosition: AxisPosition, dataSource: string): [Date, Date];
+    static getLinearDomain(configDomain: NumberDomain, data: MdtChartsDataSource, configOptions: MdtChartsTwoDimensionalOptions): [number, number];
+    static getScaleKeyType(charts: MdtChartsTwoDimensionalChart[]): ScaleKeyType;
+    static getScaleValueType(charts: MdtChartsTwoDimensionalChart[] | IntervalChart[]): ScaleValueType;
+    static getElementsAmount(barCharts: MdtChartsTwoDimensionalChart[]): number;
+    static getScaleMaxValue(charts: MdtChartsTwoDimensionalChart[], dataRows: MdtChartsDataRow[]): number;
+    static getScaleMinValue(charts: MdtChartsTwoDimensionalChart[], dataRows: MdtChartsDataRow[]): number;
+}

package/lib/model/featuresModel/scaleModel/scaleModel.js

@@ -0,0 +1,115 @@
+import { ModelHelper } from "../../modelHelper";
+export var ScaleType;
+(function (ScaleType) {
+    ScaleType[ScaleType["Key"] = 0] = "Key";
+    ScaleType[ScaleType["Value"] = 1] = "Value";
+})(ScaleType || (ScaleType = {}));
+export class ScaleModel {
+    static getScaleKey(allowableKeys, orient, canvasModel, charts, barCharts) {
+        return {
+            domain: allowableKeys,
+            range: {
+                start: 0,
+                end: ScaleModel.getRangePeek(ScaleType.Key, orient, canvasModel)
+            },
+            type: ScaleModel.getScaleKeyType(charts),
+            elementsAmount: this.getElementsAmount(barCharts)
+        };
+    }
+    static getScaleLinear(options, data, canvasModel) {
+        return {
+            domain: ScaleModel.getLinearDomain(options.axis.value.domain, data, options),
+            range: {
+                start: 0,
+                end: ScaleModel.getRangePeek(ScaleType.Value, options.orientation, canvasModel)
+            },
+            type: ScaleModel.getScaleValueType(options.charts)
+        };
+    }
+    static getRangePeek(scaleType, chartOrientation, canvasModel) {
+        if (chartOrientation === 'vertical')
+            return scaleType === ScaleType.Key
+                ? canvasModel.getChartBlockWidth()
+                : canvasModel.getChartBlockHeight();
+        return scaleType === ScaleType.Key
+            ? canvasModel.getChartBlockHeight()
+            : canvasModel.getChartBlockWidth();
+    }
+    static getDateValueDomain(data, chart, keyAxisPosition, dataSource) {
+        const minMax = ModelHelper.getMinAndMaxOfIntervalData(data, dataSource, chart);
+        let domainPeekMin = minMax[0];
+        let domainPeekMax = minMax[1];
+        if (keyAxisPosition === 'start')
+            return [domainPeekMin, domainPeekMax];
+        return [domainPeekMax, domainPeekMin];
+    }
+    static getLinearDomain(configDomain, data, configOptions) {
+        let domainPeekMin;
+        let domainPeekMax;
+        if (configDomain.start === -1)
+            domainPeekMin = this.getScaleMinValue(configOptions.charts, data[configOptions.data.dataSource]);
+        else
+            domainPeekMin = configDomain.start;
+        if (configDomain.end === -1)
+            domainPeekMax = this.getScaleMaxValue(configOptions.charts, data[configOptions.data.dataSource]);
+        else
+            domainPeekMax = configDomain.end;
+        if (configOptions.axis.key.position === 'start')
+            return [domainPeekMin, domainPeekMax];
+        return [domainPeekMax, domainPeekMin];
+    }
+    static getScaleKeyType(charts) {
+        if (charts.findIndex((chart) => chart.type === 'bar') === -1)
+            return 'point';
+        return 'band';
+    }
+    static getScaleValueType(charts) {
+        if (charts.findIndex((chart) => chart.type === 'gantt') !== -1)
+            return 'datetime';
+        return 'linear';
+    }
+    static getElementsAmount(barCharts) {
+        if (barCharts.length === 0)
+            return 1;
+        let barsAmount = 0;
+        barCharts.forEach(chart => {
+            if (chart.isSegmented)
+                barsAmount += 1; // Если бар сегментированный, то все valueFields являются частями одного бара
+            else
+                barsAmount += chart.data.valueFields.length;
+        });
+        return barsAmount;
+    }
+    static getScaleMaxValue(charts, dataRows) {
+        let max = 0;
+        charts.forEach(chart => {
+            dataRows.forEach(dataRow => {
+                let sumInRow = 0;
+                chart.data.valueFields.forEach(field => {
+                    if (chart.isSegmented)
+                        sumInRow += dataRow[field.name];
+                    else if (dataRow[field.name] > sumInRow)
+                        sumInRow = dataRow[field.name];
+                });
+                if (max < sumInRow)
+                    max = sumInRow;
+            });
+        });
+        return max;
+    }
+    static getScaleMinValue(charts, dataRows) {
+        let min = 0;
+        charts.forEach(chart => {
+            dataRows.forEach(dataRow => {
+                let sumInRow = 0;
+                chart.data.valueFields.forEach(field => {
+                    if (dataRow[field.name] < sumInRow)
+                        sumInRow = dataRow[field.name];
+                });
+                if (min > sumInRow)
+                    min = sumInRow;
+            });
+        });
+        return min;
+    }
+}

package/lib/model/marginModel.js

@@ -3,6 +3,7 @@ import { DataManagerModel } from "./dataManagerModel/dataManagerModel";
 import { LegendModel } from "./featuresModel/legendModel/legendModel";
 import { AxisType } from "./modelBuilder";
 import { TwoDimensionalModel } from "./notations/twoDimensionalModel";
+import { keyAxisLabelHorizontalLog, keyAxisLabelVerticalLog } from "./featuresModel/scaleModel/scaleAxisRecalcer";
 export const AXIS_HORIZONTAL_LABEL_PADDING = 15;
 export const AXIS_VERTICAL_LABEL_PADDING = 10;
 export class MarginModel {
@@ -28,8 +29,10 @@ export class MarginModel {
             const axisLabelSize = AxisModel.getLabelSize(designerConfig.canvas.axisLabel.maxSize.main, dataScope.allowableKeys);
             const axisConfig = AxisModel.getKeyAxisLabelPosition(modelInstance.canvasModel, dataScope.allowableKeys.length, config.options.axis.key);
             const marginOrient = config.options.axis.key.position === 'end' ? 'bottom' : 'top';
-            if (axisConfig === 'rotated')
-                modelInstance.canvasModel.setMarginSide(marginOrient, modelInstance.canvasModel.getMarginSide(marginOrient) + (axisLabelSize.width - axisLabelSize.height));
+            if (axisConfig === 'rotated') {
+                modelInstance.canvasModel.decreaseMarginSide(marginOrient, axisLabelSize.height);
+                modelInstance.canvasModel.increaseMarginSide(marginOrient, axisLabelSize.width, keyAxisLabelVerticalLog);
+            }
         }
     }
     static getHorizontalMarginByAxisLabels(labelsMaxWidth, axis, data, options) {
@@ -48,7 +51,7 @@ export class MarginModel {
         const valueAxisOrient = AxisModel.getAxisOrient(AxisType.Value, orientation, axis.value.position);
         if ((keyAxisOrient === 'bottom' || keyAxisOrient === 'top')) {
             if (axis.key.visibility)
-                canvasModel.increaseMarginSide(keyAxisOrient, labelSize.height + AXIS_HORIZONTAL_LABEL_PADDING);
+                canvasModel.increaseMarginSide(keyAxisOrient, labelSize.height + AXIS_HORIZONTAL_LABEL_PADDING, keyAxisLabelVerticalLog);
         }
         else if (axis.value.visibility)
             canvasModel.increaseMarginSide(valueAxisOrient, labelSize.height + AXIS_HORIZONTAL_LABEL_PADDING);
@@ -57,7 +60,7 @@ export class MarginModel {
         const keyAxisOrient = AxisModel.getAxisOrient(AxisType.Key, orientation, axis.key.position);
         const valueAxisOrient = AxisModel.getAxisOrient(AxisType.Value, orientation, axis.value.position);
         if ((keyAxisOrient === 'left' || keyAxisOrient === 'right') && isShow && axis.key.visibility) {
-            canvasModel.increaseMarginSide(keyAxisOrient, labelSize.width + AXIS_VERTICAL_LABEL_PADDING);
+            canvasModel.increaseMarginSide(keyAxisOrient, labelSize.width + AXIS_VERTICAL_LABEL_PADDING, keyAxisLabelHorizontalLog);
         }
         else if ((valueAxisOrient === 'left' || valueAxisOrient === 'right') && axis.value.visibility) {
             canvasModel.increaseMarginSide(valueAxisOrient, labelSize.width + AXIS_VERTICAL_LABEL_PADDING);

package/lib/model/modelInstance/canvasModel/canvasModel.d.ts

@@ -1,11 +1,13 @@
 import { Size } from "../../../config/config";
 import { BlockMargin } from "../../model";
 import { LegendCanvasModelInstance } from "./legendCanvasModel";
+import { MarginModelService } from "./marginModelService";
 import { TitleCanvasModel } from "./titleCanvas";
-declare type MarginSide = keyof BlockMargin;
+export declare type MarginSide = keyof BlockMargin;
 export declare class CanvasModel {
     titleCanvas: TitleCanvasModel;
     legendCanvas: LegendCanvasModelInstance;
+    marginService: MarginModelService;
     private blockSize;
     private margin;
     constructor();
@@ -13,12 +15,11 @@ export declare class CanvasModel {
     getMargin(): BlockMargin;
     getMarginSide(side: MarginSide): number;
     setMarginSide(side: MarginSide, size: number): void;
-    increaseMarginSide(side: MarginSide, byValue: number): void;
-    descreaseMarginSide(side: MarginSide, byValue: number): void;
+    increaseMarginSide(side: MarginSide, byValue: number, key?: string): void;
+    decreaseMarginSide(side: MarginSide, byValue: number): void;
     roundMargin(): void;
     initBlockSize(blockSize: Size): void;
     getBlockSize(): Size;
     getChartBlockWidth(): number;
     getChartBlockHeight(): number;
 }
-export {};

package/lib/model/modelInstance/canvasModel/canvasModel.js

@@ -1,9 +1,11 @@
 import { LegendCanvasModelInstance } from "./legendCanvasModel";
+import { MarginModelService } from "./marginModelService";
 import { TitleCanvasModel } from "./titleCanvas";
 export class CanvasModel {
     constructor() {
         this.titleCanvas = new TitleCanvasModel();
         this.legendCanvas = new LegendCanvasModelInstance();
+        this.marginService = new MarginModelService();
     }
     initMargin(margin) {
         this.margin = margin;
@@ -17,10 +19,12 @@ export class CanvasModel {
     setMarginSide(side, size) {
         this.margin[side] = size;
     }
-    increaseMarginSide(side, byValue) {
+    increaseMarginSide(side, byValue, key) {
         this.margin[side] += byValue;
+        if (key)
+            this.marginService.appendLog(key, side, byValue);
     }
-    descreaseMarginSide(side, byValue) {
+    decreaseMarginSide(side, byValue) {
         this.margin[side] -= byValue;
     }
     roundMargin() {

package/lib/model/modelInstance/canvasModel/marginModelService.d.ts

@@ -0,0 +1,11 @@
+import { MarginSide } from "./canvasModel";
+export interface MarginLogData {
+    side: MarginSide;
+    byValue: number;
+}
+export declare class MarginModelService {
+    private log;
+    appendLog(key: string, side: MarginSide, byValue: number): void;
+    getDataByKey(key: string): MarginLogData;
+    private findLogByKey;
+}

package/lib/model/modelInstance/canvasModel/marginModelService.js

@@ -0,0 +1,26 @@
+export class MarginModelService {
+    constructor() {
+        this.log = [];
+    }
+    appendLog(key, side, byValue) {
+        const log = this.findLogByKey(key);
+        if (log) {
+            log.data = { side, byValue };
+            return;
+        }
+        this.log.push({
+            key,
+            data: {
+                side,
+                byValue
+            }
+        });
+    }
+    getDataByKey(key) {
+        var _a;
+        return (_a = this.findLogByKey(key)) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    findLogByKey(key) {
+        return this.log.find(l => l.key === key);
+    }
+}

package/lib/model/notations/intervalModel.js

@@ -2,7 +2,7 @@ import { AxisModel } from "../featuresModel/axisModel";
 import { ChartStyleModelService } from "../chartStyleModel/chartStyleModel";
 import { DataManagerModel } from "../dataManagerModel/dataManagerModel";
 import { AxisType } from "../modelBuilder";
-import { ScaleModel, ScaleType } from "../featuresModel/scaleModel";
+import { ScaleModel, ScaleType } from "../featuresModel/scaleModel/scaleModel";
 import { TwoDimensionalModel } from "./twoDimensionalModel";
 export class IntervalModel {
     static getOptions(config, designerConfig, margin, dataScope, data, modelInstance) {

package/lib/model/notations/twoDimensionalModel.js

@@ -1,27 +1,25 @@
-import { Scale } from "../../engine/features/scale/scale";
 import { ChartStyleModelService } from "../chartStyleModel/chartStyleModel";
 import { TwoDimensionalChartStyleModel } from "../chartStyleModel/TwoDimensionalChartStyleModel";
 import { AxisModel } from "../featuresModel/axisModel";
-import { ScaleModel } from "../featuresModel/scaleModel";
+import { ScaleAxisRecalcer } from "../featuresModel/scaleModel/scaleAxisRecalcer";
+import { ScaleModel } from "../featuresModel/scaleModel/scaleModel";
 export class TwoDimensionalModel {
     static getOptions(options, designerConfig, data, modelInstance) {
         const canvasModel = modelInstance.canvasModel;
-        const scaleKey = ScaleModel.getScaleKey(modelInstance.dataModel.getAllowableKeys(), options.orientation, canvasModel, options.charts, this.getChartsByType(options.charts, 'bar'));
-        const scaleValue = ScaleModel.getScaleLinear(options, data, canvasModel);
-        const chartSettings = this.getChartsSettings(designerConfig.canvas.chartOptions.bar);
-        //TODO: rm import from engine
-        const scaleValueFn = Scale.getScaleValue(scaleValue);
+        const scaleMarginRecalcer = new ScaleAxisRecalcer(() => ScaleModel.getScaleLinear(options, data, canvasModel));
+        scaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
+        const scaleValueInfo = scaleMarginRecalcer.getScaleValue();
         return {
             legend: canvasModel.legendCanvas.getModel(),
             title: options.title,
             selectable: !!options.selectable,
             orient: options.orientation,
             scale: {
-                key: scaleKey,
-                value: scaleValue
+                key: ScaleModel.getScaleKey(modelInstance.dataModel.getAllowableKeys(), options.orientation, canvasModel, options.charts, this.getChartsByType(options.charts, 'bar')),
+                value: scaleValueInfo.scale
             },
             axis: {
-                key: AxisModel.getKeyAxis(options, data, designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip, () => scaleValueFn(0)),
+                key: AxisModel.getKeyAxis(options, data, designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip, () => scaleValueInfo.scaleFn(0)),
                 value: AxisModel.getValueAxis(options.orientation, options.axis.value, designerConfig.canvas.axisLabel, canvasModel)
             },
             type: options.type,
@@ -29,7 +27,7 @@ export class TwoDimensionalModel {
             charts: this.getChartsModel(options.charts, options.orientation, designerConfig.chartStyle),
             additionalElements: this.getAdditionalElements(options),
             tooltip: options.tooltip,
-            chartSettings
+            chartSettings: this.getChartsSettings(designerConfig.canvas.chartOptions.bar)
         };
     }
     static getChartsEmbeddedLabelsFlag(charts, chartOrientation) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdt-charts",
-  "version": "1.12.5",
+  "version": "1.12.6",
   "description": "",
   "main": "lib/main.js",
   "scripts": {