@flexem/fc-gui 3.0.0-alpha.91 → 3.0.0-alpha.93

package/src/model/shared/rotation/rotation-observer-model.ts

@@ -1,5 +0,0 @@
-import { EventEmitter } from '@angular/core';
-
-export interface RotationObserverModel {
-    readonly rotationValueChanged: EventEmitter<number>;
-}

package/src/model/shared/rotation/rotation-observer.ts

@@ -1,32 +0,0 @@
-import { RotationObserverModel } from './rotation-observer-model';
-import { RotationModel } from './rotation-model';
-import { VariableCommunicator, VariableValue, VariableStateEnum } from '../../../communication';
-import { EventEmitter } from '@angular/core';
-import { VariableUtil } from '../../../utils/variable-util';
-import { VariableDefinition } from '../../../communication/variable/variable-definition';
-import { VariableStore } from '../../../config';
-
-export class RotationObserver implements RotationObserverModel {
-
-    readonly rotationValueChanged: EventEmitter<number> = new EventEmitter<number>();
-
-    private currentValue: VariableValue;
-
-    constructor(rotationModel: RotationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, private readonly signalRAppId: string) {
-        if (!rotationModel.variableName) { return; }
-        const variable = new VariableDefinition(rotationModel.variableName, rotationModel.variableGroupName,
-            rotationModel.dataSourceCode, rotationModel.variableVersion);
-        const variableName = VariableUtil.getConvertedVariableName(variableStore, variable);
-        if (!variableName) { return; }
-        variableCommunicator.subscribeVariableState(variableName).subscribe(variableValue => {
-            if (variableValue.state === VariableStateEnum.Normal) {
-                variableCommunicator.openVariable(variableName, this.signalRAppId).subscribe(value => {
-                    if (value.state === VariableStateEnum.DataNormal) {
-                        this.currentValue = value;
-                        this.rotationValueChanged.emit(this.currentValue.value);
-                    }
-                });
-            }
-        });
-    }
-}

package/src/model/shared/scale/scale-mark.model.ts

@@ -1,7 +0,0 @@
-import { Font } from '../text/font';
-
-export interface ScaleMarkModel {
-    readonly integerDigits: number;
-    readonly fractionDigits: number;
-    readonly font: Font;
-}

package/src/model/shared/scale/scale-model.ts

@@ -1,25 +0,0 @@
-import { ScaleMarkModel } from './scale-mark.model';
-
-export interface ScaleModel {
-    /**
-     *主刻度等分数
-     *
-     * @type {number}
-     * @memberof ScaleModel
-     */
-    readonly masterDivider: number;
-
-    /**
-     *次刻度等分数
-     *
-     * {number}
-     * ScaleModel
-     */
-    readonly slaveDivider: number;
-
-    readonly stroke: string;
-
-    readonly showScaleMark: boolean;
-
-    readonly scaleMarkModel?: ScaleMarkModel;
-}

package/src/model/shared/size.model.ts

@@ -1,17 +0,0 @@
-export class Size {
-    width: number;
-    height: number;
-
-    constructor(w?: number, h?: number) {
-        this.width = w ? w : 0;
-        this.height = h ? h : 0;
-    }
-
-    isReal(): Boolean {
-        return isFinite(this.width) && isFinite(this.height);
-    }
-
-    toString(): string {
-        return `Size(${this.width} ${this.height})`;
-    }
-}

package/src/model/shared/state/state.ts

@@ -1,8 +0,0 @@
-export enum State {
-    Normal = 0, // 正常
-    Offline = 1, // 离线
-    Unbind = 2, // 未绑定
-    Abnormal = 3, // 数据异常
-    Loading = 4, // 加载中
-    Disable = 9, // 禁用
-}

package/src/model/shared/text/text.ts

@@ -1,6 +0,0 @@
-import { Font } from './font';
-
-export interface Text {
-    content: string;
-    font: Font;
-}

package/src/model/shared/translation/translation-behavior-model.ts

@@ -1,5 +0,0 @@
-import { EventEmitter } from '@angular/core';
-
-export interface TranslationBehaviorModel {
-    readonly doTranslation: EventEmitter<number>;
-}

package/src/model/shared/translation/translation-behavior.ts

@@ -1,71 +0,0 @@
-import { EventEmitter } from '@angular/core';
-
-import { TranslationObserver } from './translation-observer';
-import { TranslationDirectionType } from './translation-direction-type';
-import { TranslationModel } from './translation-model';
-import { VariableCommunicator } from '../../../communication';
-import { TranslationBehaviorModel } from './translation-behavior-model';
-import { Point } from '../point.model';
-import { VariableStore } from '../../../config';
-
-export class TranslationBehavior implements TranslationBehaviorModel {
-    readonly doTranslation: EventEmitter<number> = new EventEmitter<number>();
-
-    constructor(translationModel: TranslationModel,
-        variableCommunicator: VariableCommunicator,
-        variableStore: VariableStore,
-        translationDirection: TranslationDirectionType,
-        location: Point,
-        signalRAppId: string) {
-        if (translationDirection === TranslationDirectionType.Horizontal) {
-            const horizontalTranslation = new TranslationObserver(translationModel, variableCommunicator, variableStore, signalRAppId);
-            horizontalTranslation.translationValueChanged.subscribe(inputValue => {
-                const currentLocation = this.getTranslationValue(translationModel, (+inputValue), location.x);
-                this.doTranslation.emit(currentLocation);
-            });
-        }
-        if (translationDirection === TranslationDirectionType.Vertical) {
-            const verticalTranslation = new TranslationObserver(translationModel, variableCommunicator, variableStore, signalRAppId);
-            verticalTranslation.translationValueChanged.subscribe(inputValue => {
-                const currentLocation = this.getTranslationValue(translationModel, (+inputValue), location.y);
-                this.doTranslation.emit(currentLocation);
-            });
-        }
-    }
-
-    private getTranslationValue(translationModel: TranslationModel, inputValue: any, locationValue: number): number {
-        let newLocation: number;
-        if (translationModel.isProportion === true) {
-            const proportion = (translationModel.maxCoordinate - translationModel.minCoordinate) /
-                (translationModel.maxProportionScale - translationModel.minProportionScale);
-            if (translationModel.isReverseProportion === true) {
-                const actualLocation = locationValue + translationModel.maxCoordinate;
-                if ((+inputValue) > translationModel.maxProportionScale) {
-                    newLocation = locationValue + translationModel.minCoordinate;
-                } else if ((+inputValue) < translationModel.minProportionScale) {
-                    newLocation = actualLocation;
-                } else {
-                    newLocation = actualLocation - (+inputValue - translationModel.minProportionScale) * proportion;
-                }
-            } else {
-                if ((+inputValue) > translationModel.maxProportionScale) {
-                    newLocation = translationModel.maxCoordinate + locationValue;
-                } else if ((+inputValue) < translationModel.minProportionScale) {
-                    newLocation = translationModel.minCoordinate + locationValue;
-                } else {
-                    newLocation = locationValue + translationModel.minCoordinate +
-                        (inputValue - translationModel.minProportionScale) * proportion;
-                }
-            }
-        } else {
-            newLocation = inputValue + locationValue;
-        }
-        if (newLocation > translationModel.maxCoordinate + locationValue) {
-            newLocation = translationModel.maxCoordinate + locationValue;
-        }
-        if (newLocation < translationModel.minCoordinate + locationValue) {
-            newLocation = translationModel.minCoordinate + locationValue;
-        }
-        return newLocation;
-    }
-}

package/src/model/shared/translation/translation-direction-type.ts

@@ -1,4 +0,0 @@
-export enum TranslationDirectionType {
-    Horizontal,
-    Vertical
-}

package/src/model/shared/translation/translation-observer-model.ts

@@ -1,5 +0,0 @@
-import { EventEmitter } from '@angular/core';
-
-export interface TranslationObserverModel {
-    readonly translationValueChanged: EventEmitter<number>;
-}

package/src/model/shared/translation/translation-observer.ts

@@ -1,33 +0,0 @@
-
-import { EventEmitter } from '@angular/core';
-import { TranslationModel } from './translation-model';
-import { VariableCommunicator, VariableValue, VariableStateEnum } from '../../../communication';
-import { TranslationObserverModel } from './translation-observer-model';
-import { VariableUtil } from '../../../utils/variable-util';
-import { VariableDefinition } from '../../../communication/variable/variable-definition';
-import { VariableStore } from '../../../config';
-
-export class TranslationObserver implements TranslationObserverModel {
-
-    readonly translationValueChanged: EventEmitter<number> = new EventEmitter<number>();
-
-    private currentValue: VariableValue;
-
-    constructor(model: TranslationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string) {
-        if (!model.variableName) { return; }
-        const variable = new VariableDefinition(model.variableName, model.variableGroupName,
-            model.dataSourceCode, model.variableVersion);
-        const variableName = VariableUtil.getConvertedVariableName(variableStore, variable);
-        if (!variableName) { return; }
-        variableCommunicator.subscribeVariableState(variableName).subscribe(variableValue => {
-            if (variableValue.state === VariableStateEnum.Normal) {
-                variableCommunicator.openVariable(variableName, signalRAppId).subscribe(value => {
-                    if (value.state === VariableStateEnum.DataNormal) {
-                        this.currentValue = value;
-                        this.translationValueChanged.emit(this.currentValue.value);
-                    }
-                });
-            }
-        });
-    }
-}

package/src/model/shared/variable/variable-identifier.model.ts

@@ -1,6 +0,0 @@
-import { VariableNameModel } from './variable-name.model';
-
-export interface VariableIdentifierModel {
-    readonly dataSourceCode: number;
-    readonly variableName: VariableNameModel;
-}

package/src/model/straight-line/straight-line-model.ts

@@ -1,5 +0,0 @@
-import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
-
-export interface StraightLineModel extends ConditionalDynamicDisplayModel {
-    readonly strokeWidth: number;
-}

package/src/model/switch-indicator-light/bit-switch-operation.ts

@@ -1,6 +0,0 @@
-export enum BitSwitchOperation {
-    On,
-    Off,
-    Inverse,
-    Restoration
-}

package/src/model/switch-indicator-light/bit-switch-settings.ts

@@ -1,12 +0,0 @@
-import { BitSwitchOperation } from './bit-switch-operation';
-
-export interface BitSwitchSettings {
-    readonly operation: BitSwitchOperation;
-    readonly variableName: string;
-    readonly variableGroupName: string;
-    readonly dataSourceCode?: number;
-    readonly isWriteOnly?: boolean;
-    readonly isBitwiseIndex?: boolean;
-    readonly bitIndex?: number;
-    readonly variableVersion?: number;
-}

package/src/model/switch-indicator-light/fault-flicker.ts

@@ -1,6 +0,0 @@
-import { Flicker } from './flicker';
-
-export interface FaultFlicker {
-    readonly flicker: Flicker;
-    readonly frequency: number;
-}

package/src/model/switch-indicator-light/flicker.ts

@@ -1,5 +0,0 @@
-export enum Flicker {
-    Nothing = 0,
-    Image = 1,
-    Label = 2
-}

package/src/model/switch-indicator-light/index.ts

@@ -1,18 +0,0 @@
-export { SwtichSettings } from './switch-settings';
-export { SwitchType } from './switch-type';
-export { BitSwitchSettings } from './bit-switch-settings';
-export { BitSwitchOperation } from './bit-switch-operation';
-export { WordSwitchOperation } from './word-switch-operation';
-export { WordSwitchSettings } from './word-switch-settings';
-
-export { IndicatorLightSettings } from './indicator-light-settings';
-export { IndicatorLightType } from './indicator-light-type';
-export { BitIndicatorLightSettings } from './bit-indicator-light-settings';
-export { WordIndicatorLightSettings } from './word-indicator-light-settings';
-
-export { SwitchIndicatorState } from './switch-indicator-state';
-
-export { SwitchIndicatorLight } from './switch-indicator-light';
-
-export { Flicker } from './flicker';
-export { FaultFlicker } from './fault-flicker';

package/src/model/switch-indicator-light/indicator-light-fault-flicker.ts

@@ -1,6 +0,0 @@
-import { FaultFlicker } from './fault-flicker';
-
-export interface IndicatorLightFaultFlicker {
-    readonly id: number;
-    readonly faultFlicker?: FaultFlicker;
-}

package/src/model/switch-indicator-light/indicator-light-settings.ts

@@ -1,8 +0,0 @@
-import { IndicatorLightType } from './indicator-light-type';
-import { BitIndicatorLightSettings } from './bit-indicator-light-settings';
-import { WordIndicatorLightSettings } from './word-indicator-light-settings';
-
-export interface IndicatorLightSettings {
-    readonly type: IndicatorLightType;
-    readonly settings: BitIndicatorLightSettings | WordIndicatorLightSettings;
-}

package/src/model/switch-indicator-light/indicator-light-type.ts

@@ -1,4 +0,0 @@
-export enum IndicatorLightType {
-    Bit,
-    Word
-}

package/src/model/switch-indicator-light/switch-indicator-light.ts

@@ -1,47 +0,0 @@
-import { SwtichSettings } from './switch-settings';
-import { SwitchIndicatorState } from './switch-indicator-state';
-import { IndicatorLightSettings } from './indicator-light-settings';
-import { ConditionalEnableModel } from '../base/conditional-enable-model';
-import { ConditionItemModel, GraphSetting, Point, Size } from '../shared';
-import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
-import { SecurityModel } from '../base/security-model';
-
-export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityModel {
-
-    /**
-       * @type {(number)}
-       * @memberof GraphSetting
-       * @description 版本1增加动态行为设置
-       * @description 版本2增加固定点设置
-       */
-    readonly version?: number;
-
-    readonly id: number;
-    readonly category: string;
-
-    readonly useSwitch?: boolean;
-    readonly switchSettings?: SwtichSettings;
-
-    readonly useIndicatorLight?: boolean;
-    readonly indicatorLightSettings?: IndicatorLightSettings;
-
-    readonly states: SwitchIndicatorState[];
-
-    readonly useGraph?: boolean;
-    readonly graphSetting?: GraphSetting;
-
-    readonly location: Point;
-    readonly size: Size;
-
-    readonly isAwaysDisplay?: boolean;
-
-    readonly conditionItems?: ConditionItemModel[];
-
-    readonly dynamicSetting?: DynamicDisplayModel;
-
-    readonly isAwaysEnable?: boolean;
-
-    readonly enableItems?: ConditionItemModel[];
-
-    readonly fixedPositionType?: number;
-}

package/src/model/switch-indicator-light/switch-indicator-state.ts

@@ -1,9 +0,0 @@
-import { Text, Condition } from '../shared';
-import { FaultFlicker } from './fault-flicker';
-
-export interface SwitchIndicatorState {
-    readonly id: number;
-    readonly condition?: Condition;
-    readonly text: Text;
-    readonly faultFlicker?: FaultFlicker;
-}

package/src/model/switch-indicator-light/switch-settings.ts

@@ -1,8 +0,0 @@
-import { SwitchType } from './switch-type';
-import { WordSwitchSettings } from './word-switch-settings';
-import { BitSwitchSettings } from './bit-switch-settings';
-
-export interface SwtichSettings {
-    readonly type: SwitchType;
-    readonly settings: BitSwitchSettings | WordSwitchSettings;
-}

package/src/model/switch-indicator-light/switch-type.ts

@@ -1,4 +0,0 @@
-export enum SwitchType {
-    Bit,
-    Word
-}

package/src/model/switch-indicator-light/word-switch-operation.ts

@@ -1,5 +0,0 @@
-export enum WordSwitchOperation {
-    Add,
-    Subtract,
-    SetConstant
-}

package/src/model/switch-indicator-light/word-switch-settings.ts

@@ -1,14 +0,0 @@
-import { WordSwitchOperation } from './word-switch-operation';
-
-export interface WordSwitchSettings {
-    readonly variableName: string;
-    readonly variableGroupName: string;
-    readonly dataSourceCode?: number;
-    readonly operation: WordSwitchOperation;
-    readonly operand: number;
-    readonly dataType?: number;
-    readonly isWriteOnly?: boolean;
-    readonly variableVersion?: number;
-    readonly minValue?: number;
-    readonly maxValue?: number;
-}

package/src/model/table/table-model.ts

@@ -1,14 +0,0 @@
-import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
-import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
-import { Point } from '../shared/point.model';
-
-export interface TableModel extends ConditionalDynamicDisplayModel {
-    readonly version?: number;
-
-    readonly dynamicSetting?: DynamicDisplayModel;
-
-    readonly fixedPositionType?: number;
-
-    readonly location: Point;
-
-}

package/src/model/text/text.model.ts

@@ -1,8 +0,0 @@
-import { GraphSetting } from '../shared';
-import { ConditionalDynamicDisplayModel } from '../base';
-import { FontSettingModel } from '../base/font-setting-model';
-
-export interface TextModel extends ConditionalDynamicDisplayModel, FontSettingModel {
-    readonly useGraph?: boolean;
-    readonly graphSetting?: GraphSetting;
-}

package/src/model/video/video.model.ts

@@ -1,9 +0,0 @@
-import { ConditionalDisplayModel } from '../base/conditional-display-model';
-import { Size } from '../shared/size.model';
-
-export interface VideoModel extends ConditionalDisplayModel {
-    readonly size: Size;
-    readonly version: number;
-    readonly videoTag?: string;
-    readonly location?: any;
-}

package/src/model/view-operation/view-operation-element.model.ts

@@ -1,20 +0,0 @@
-import { Size, Text, GraphSetting } from '../shared';
-import { ConditionalEnableModel } from '../base/conditional-enable-model';
-import { SecurityModel } from '../base';
-import { ViewOperationType } from './view-operation-type';
-
-export interface ViewOperationElementModel extends ConditionalEnableModel, SecurityModel {
-    /**
-     * 版本 2 : 动态行为调整
-     * 版本 3 ：使能控制调整
-     * 版本 4 ：新增操作记录
-     * 版本 5 ：新增页面操作类型，之前类型都为“切换页面”
-     */
-    readonly version?: number;
-    readonly viewIndex?: number;
-    readonly label: Text;
-    readonly size: Size;
-    readonly useGraph: boolean;
-    readonly graphSetting: GraphSetting;
-    readonly operationType: ViewOperationType;
-}

package/src/model/view-operation/view-operation-type.ts

@@ -1,22 +0,0 @@
-export enum ViewOperationType {
-
-    /**
-     * 切换画面
-     */
-    ToggleView = 0,
-
-    /**
-     * 弹出画面
-     */
-    PopupView = 1,
-
-    /**
-     * 关闭画面
-     */
-    CloseView = 2,
-
-    /**
-     * 控制页面
-     */
-    ControlView = 3
-}

package/src/model/weather/weather-info.ts

@@ -1,11 +0,0 @@
-export class WeatherInfo {
-    hasAddress: boolean;
-    gettingAddress: boolean;
-    supported: boolean;
-    temperature: string;
-    humidity: string;
-    weatherPhenomenon: string;
-    weatherIcon: string;
-    wind: string;
-    location: string;
-}

package/src/model/weather/weather.model.ts

@@ -1,8 +0,0 @@
-import { Size } from '../shared';
-import { ConditionalDisplayModel } from '../base';
-
-export interface WeatherModel extends ConditionalDisplayModel {
-    size: Size;
-    stroke: string;
-    fill: string;
-}

package/src/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "@flexem/fc-gui",
-  "peerDependencies": {
-    "@angular/common": "~9.1.9",
-    "@angular/core": "~9.1.9",
-    "rxjs": "~6.5.4",
-    "zone.js": "~0.9.1",
-    "d3-selection": "1.3.0",
-    "jquery": "*",
-    "jqueryui": "*",
-    "lodash": "*",
-    "moment": "*",
-    "ngx-bootstrap": "5.5.0",
-    "snapsvg": "*",
-    "d3-drag": "^1.2.1"
-  }
-}

package/src/public_api.ts

@@ -1,25 +0,0 @@
-export { GuiComponent } from './gui/gui.component';
-export { GuiView } from './gui/gui-view';
-export { GuiContext } from './gui/gui-context';
-
-export * from './core';
-
-export * from './config';
-
-export * from './communication';
-
-export * from './model';
-
-export * from './localization';
-
-export * from './security';
-
-export * from './shared';
-
-export { GuiModule } from './gui.module';
-
-export * from './remote';
-
-export * from './service';
-
-export { LOGGER_SERVICE_TOKEN, LoggerService, ConsoleLoggerService } from './logger';