@yamcs/opi 1.2.3 → 1.2.4

package/dist/types/AutoScaleWidgets.d.ts

@@ -0,0 +1,6 @@
+export declare class AutoScaleWidgets {
+    readonly autoScaleWidgets: boolean;
+    readonly minWidth: number;
+    readonly minHeight: number;
+    constructor(autoScaleWidgets: boolean, minWidth: number, minHeight: number);
+}

package/dist/types/Display.d.ts

@@ -1,4 +1,5 @@
 import { OPIEvent, OPIEventMap } from './events';
+import { ImageResolver } from './ImageResolver';
 import { Bounds } from './positioning';
 import { PVEngine } from './pv/PVEngine';
 import { PVProvider } from './pv/PVProvider';
@@ -45,6 +46,7 @@ export declare class Display {
     private g;
     private ctx;
     pvEngine: PVEngine;
+    private imageResolver;
     private repaintRequested;
     private _editMode;
     private _showGrid;
@@ -68,6 +70,8 @@ export declare class Display {
     constructor(targetElement: HTMLElement);
     addProvider(provider: PVProvider): void;
     addScriptLibrary(name: string, library: any): void;
+    setImageResolver(imageResolver: ImageResolver): void;
+    getImageResolver(): ImageResolver;
     private step;
     private drawScreen;
     /**

package/dist/types/ImageResolver.d.ts

@@ -0,0 +1,9 @@
+import { Display } from './Display';
+export interface ImageResolver {
+    resolve(file: string): string;
+}
+export declare class DefaultImageResolver implements ImageResolver {
+    private display;
+    constructor(display: Display);
+    resolve(file: string): string;
+}

package/dist/types/ScaleOptions.d.ts

@@ -0,0 +1,6 @@
+export declare class ScaleOptions {
+    readonly widthScalable: boolean;
+    readonly heightScalable: boolean;
+    readonly keepWidthHeightRatio: boolean;
+    constructor(widthScalable: boolean, heightScalable: boolean, keepWidthHeightRatio: boolean);
+}

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 export { Display } from './Display';
+export { DefaultImageResolver, ImageResolver } from './ImageResolver';
+export { CompiledFormula, DataSourceStatus } from './pv/formulas/CompiledFormula';
+export { FormulaCompiler } from './pv/formulas/FormulaCompiler';
 export { AlarmSeverity, PV } from './pv/PV';
 export { PVProvider } from './pv/PVProvider';
 export { Sample } from './pv/Sample';
-export { FormulaCompiler } from './pv/formulas/FormulaCompiler';
-export { DataSourceStatus, CompiledFormula } from './pv/formulas/CompiledFormula';

package/dist/types/scripting/GUIUtil.d.ts

@@ -0,0 +1,8 @@
+export declare class GUIUtil {
+    fullScreen(): void;
+    openConfirmDialog(message: string): boolean;
+    openInformationDialog(message: string): void;
+    openWarningDialog(message: string): void;
+    openErrorDialog(message: string): void;
+    openPasswordDialog(message: string, password: string): boolean | undefined;
+}

package/dist/types/scripting/WidgetWrapper.d.ts

@@ -1,10 +1,13 @@
 import { Widget } from '../Widget';
+import { PVWrapper } from './PVWrapper';
 /**
  * Exposes the API for the variable "widget" as used in display scripts.
  */
 export declare class WidgetWrapper {
     private widget;
     constructor(widget: Widget);
+    getPVByName(name: string): PVWrapper | null;
+    getPV(propertyName?: string): PVWrapper | null;
     getPropertyValue(propertyName: string): any;
     setPropertyValue(propertyName: string, value: any): void;
     getName(): string;

package/dist/types/widgets/graphics/ImageWidget.d.ts

@@ -6,6 +6,7 @@ export declare class ImageWidget extends Widget {
     private currentImageFile?;
     private imageElement?;
     private imageSnapshot?;
+    private imageLoading;
     private imageLoaded;
     constructor(display: Display, parent: AbstractContainerWidget);
     init(): void;

package/dist/types/widgets/monitors/XYGraph.d.ts

@@ -3,31 +3,31 @@ import { Display } from '../../Display';
 import { Font } from '../../Font';
 import { Graphics } from '../../Graphics';
 import { Widget } from '../../Widget';
+import { XMLNode } from '../../XMLNode';
 import { AbstractContainerWidget } from '../others/AbstractContainerWidget';
-import { Axis } from './Axis';
-import { Trace } from './Trace';
 export declare class XYGraph extends Widget {
-    private toolbar?;
-    private axes;
-    private traces;
-    autoScaleAllowed: boolean;
-    private plotAreaRegion?;
+    private containerEl;
+    private containerId;
+    private styleEl;
+    private graphEl;
+    private axisDataSet;
+    private traceDataSet;
+    private initialized;
+    private graph?;
+    private scaleListener;
     constructor(display: Display, parent: AbstractContainerWidget);
-    init(): void;
+    parseNode(node: XMLNode): void;
+    private updateGraph;
     draw(g: Graphics): void;
-    private drawPlotArea;
-    setCursor(cursor: string | undefined): void;
-    private calculateAutoscaledMinMax;
-    clearGraph(): void;
-    getAxis(index: number): Axis;
-    getTrace(index: number): Trace;
+    private initializeDygraphs;
+    private drawPoint;
+    hide(): void;
+    destroy(): void;
+    private destroyGraph;
     get axisCount(): number;
-    get plotAreaBackgroundColor(): Color;
-    get showLegend(): boolean;
-    get showPlotAreaBorder(): boolean;
-    get showToolbar(): boolean;
     get title(): string;
     get titleFont(): Font;
     get traceCount(): number;
-    get transparent(): boolean;
+    get plotAreaBackgroundColor(): Color;
+    get showPlotAreaBorder(): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yamcs/opi",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "OPI Display Renderer",
   "author": "Yamcs Team <yamcs@spaceapplications.com>",
   "repository": {
@@ -12,7 +12,7 @@
   "scripts": {
     "build": "rollup -c",
     "clean": "rm -rf dist",
-    "prepublishOnly": "yarn build",
+    "prepublishOnly": "npm run build",
     "watch": "rollup -cw",
     "peggy": "cd src/pv/formulas && peggy --format es -o parser.js formula-grammar.peggy",
     "start": "node ./demo/server.js"
@@ -24,19 +24,19 @@
     "dist/"
   ],
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^20.0.0",
+    "@rollup/plugin-commonjs": "^21.0.2",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@types/fontfaceobserver": "2.1.0",
-    "@types/node": "^14.17.9",
-    "express": "^4.17.1",
+    "@types/node": "^14.18.12",
+    "express": "^4.17.3",
     "fontfaceobserver": "^2.0.13",
     "morgan": "^1.10.0",
     "nunjucks": "^3.2.2",
     "peggy": "^1.2.0",
-    "rollup": "^2.56.2",
+    "rollup": "^2.68.0",
     "rollup-plugin-copy": "^3.3.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.30.0",
+    "rollup-plugin-typescript2": "^0.31.2",
     "typescript": "^4.3.5"
   }
 }

package/dist/types/widgets/monitors/Axis.d.ts

@@ -1,40 +0,0 @@
-import { Color } from '../../Color';
-import { Font } from '../../Font';
-import { LinearScale } from './LinearScale';
-import { XYGraph } from './XYGraph';
-export declare class Axis {
-    private widget;
-    private i;
-    linearScale?: LinearScale;
-    private _effectiveMinimum?;
-    private _effectiveMaximum?;
-    constructor(widget: XYGraph, i: number);
-    get scale(): number;
-    private getValue;
-    isDateEnabled(): boolean;
-    isHorizontal(): boolean;
-    isVertical(): boolean;
-    isPrimary(): boolean;
-    get effectiveMinimum(): number;
-    set effectiveMinimum(effectiveMinimum: number);
-    get effectiveMaximum(): number;
-    set effectiveMaximum(effectiveMaximum: number);
-    applyZoom(center: number, ratio: number): void;
-    get autoScale(): boolean;
-    get autoScaleTreshold(): number;
-    get axisColor(): Color;
-    get axisTitle(): string;
-    get dashGridLine(): boolean;
-    get gridColor(): Color;
-    get leftBottomSide(): boolean;
-    get logScale(): boolean;
-    private get maximum();
-    private get minimum();
-    get scaleFont(): Font;
-    get scaleFormat(): string;
-    get showGrid(): boolean;
-    get timeFormat(): number;
-    get titleFont(): Font;
-    get visible(): boolean;
-    get yAxis(): boolean;
-}

package/dist/types/widgets/monitors/CommandBuffer.d.ts

@@ -1,6 +0,0 @@
-export declare class AxisCommand {
-}
-export declare class CommandBuffer {
-    canUndo(): boolean;
-    canRedo(): boolean;
-}

package/dist/types/widgets/monitors/Trace.d.ts

@@ -1,38 +0,0 @@
-import { Color } from '../../Color';
-import { Graphics } from '../../Graphics';
-import { Point } from '../../positioning';
-import { XYGraph } from './XYGraph';
-export declare class Trace {
-    private widget;
-    private i;
-    private traceData?;
-    private xPVInstance?;
-    private yPVInstance?;
-    private xPVListener;
-    private yPVListener;
-    constructor(widget: XYGraph, i: number);
-    init(): void;
-    snapshot(): import("./TraceBuffer").Sample[];
-    drawTrace(g: Graphics, points: Point[]): void;
-    drawPoint(g: Graphics, point: Point): void;
-    clearData(): void;
-    get scale(): number;
-    private getValue;
-    get antiAlias(): boolean;
-    get bufferSize(): number;
-    get concatenateData(): boolean;
-    get lineWidth(): number;
-    get name(): string;
-    get plotMode(): number;
-    get pointSize(): number;
-    get pointStyle(): number;
-    get traceColor(): Color;
-    get traceType(): number;
-    get updateDelay(): number;
-    get updateMode(): number;
-    get visible(): boolean;
-    get xAxisIndex(): number;
-    get xPV(): string;
-    get yAxisIndex(): number;
-    get yPV(): string;
-}

package/dist/types/widgets/monitors/TraceBuffer.d.ts

@@ -1,32 +0,0 @@
-export interface Sample {
-    x: number;
-    y: number;
-}
-export declare class TraceBuffer {
-    private bufferSize;
-    private plotMode;
-    private updateMode;
-    private concatenateData;
-    private chronological;
-    private traceData;
-    private x;
-    private xPending;
-    private y;
-    private yTimestamp?;
-    private yPending;
-    private xArray;
-    private xArrayPending;
-    private yArray;
-    private yArrayPending;
-    constructor(bufferSize: number, plotMode: number, updateMode: number, concatenateData: boolean, chronological: boolean);
-    clear(): void;
-    snapshot(): Sample[];
-    updateX(x: number): void;
-    updateY(y: number, timestamp?: number): void;
-    updateXArray(xArray: number[]): void;
-    updateYArray(yArray: number[]): void;
-    private maybeAddPoint;
-    private maybeAddArray;
-    private addPoint;
-    private addArray;
-}

package/dist/types/widgets/monitors/XYGraph2.d.ts

@@ -1,46 +0,0 @@
-import { Color } from '../../Color';
-import { Display } from '../../Display';
-import { Font } from '../../Font';
-import { Graphics } from '../../Graphics';
-import { Widget } from '../../Widget';
-import { AbstractContainerWidget } from '../others/AbstractContainerWidget';
-import { LinearScale } from './LinearScale';
-declare class Axis {
-    private widget;
-    private i;
-    linearScale?: LinearScale;
-    constructor(widget: XYGraph2, i: number);
-    get scale(): number;
-    private getValue;
-    isDateEnabled(): boolean;
-    get autoScale(): boolean;
-    get autoScaleTreshold(): number;
-    get axisColor(): Color;
-    get axisTitle(): string;
-    get dashGridLine(): boolean;
-    get gridColor(): Color;
-    get logScale(): boolean;
-    get maximum(): number;
-    get minimum(): number;
-    get scaleFont(): Font;
-    get scaleFormat(): string;
-    get showGrid(): boolean;
-    get timeFormat(): number;
-    get titleFont(): Font;
-    get visible(): boolean;
-}
-export declare class XYGraph2 extends Widget {
-    private axes;
-    private traces;
-    constructor(display: Display, parent: AbstractContainerWidget);
-    init(): void;
-    draw(g: Graphics): void;
-    private drawPlotArea;
-    getAxis(index: number): Axis;
-    get axisCount(): number;
-    get plotAreaBackgroundColor(): Color;
-    get showPlotAreaBorder(): boolean;
-    get traceCount(): number;
-    get transparent(): boolean;
-}
-export {};

package/dist/types/widgets/monitors/XYGraphToolbar.d.ts

@@ -1,51 +0,0 @@
-import { Graphics } from '../../Graphics';
-import { HitRegionSpecification } from '../../HitRegionSpecification';
-import { Bounds } from '../../positioning';
-import { XYGraph } from './XYGraph';
-declare class Button {
-    private imageFile;
-    private disabledImageFile;
-    private action;
-    readonly imageElement: HTMLImageElement;
-    readonly disabledImageElement: HTMLImageElement;
-    readonly loadPromise: Promise<void>;
-    readonly disabledLoadPromise: Promise<void>;
-    toggleButton: boolean;
-    toolButton: boolean;
-    pushed: boolean;
-    disabled: boolean;
-    region: HitRegionSpecification;
-    constructor(toolbar: XYGraphToolbar, imageFile: string, disabledImageFile: string, tooltip: string, action: () => void);
-    loadImage(prefix: string): void;
-}
-export declare class XYGraphToolbar {
-    readonly xyGraph: XYGraph;
-    private buttons;
-    private showLegend;
-    private autoScale;
-    private rubberbandZoom;
-    private horizontalZoom;
-    private verticalZoom;
-    private zoomIn;
-    private zoomOut;
-    private panning;
-    private mouseArrow;
-    private undo;
-    private redo;
-    private camera;
-    private imagesLoaded;
-    currentTool: 'rubberband-zoom' | 'horizontal-zoom' | 'vertical-zoom' | 'zoom-in' | 'zoom-out' | 'default';
-    private commandBuffer;
-    constructor(xyGraph: XYGraph);
-    updateState(): void;
-    toggleTool(button: Button): void;
-    private createToolButton;
-    private createToggleButton;
-    private createButton;
-    draw(g: Graphics, area: Bounds): number;
-    private drawSeparator;
-    private drawButton;
-    get scale(): number;
-    get buttonSize(): number;
-}
-export {};