@yamcs/opi 1.2.1 → 1.2.4

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

@@ -1,6 +1,7 @@
 import { Color } from '../../Color';
 import { Font } from '../../Font';
 import { Graphics } from '../../Graphics';
+import { Range } from '../../Range';
 export declare class LinearScale {
     private scale;
     private scaleFont;
@@ -19,14 +20,30 @@ export declare class LinearScale {
     private horizontal;
     private x;
     private y;
+    scaleFormat: string;
+    timeFormat: number;
     length: number;
     margin: number;
     constructor(scale: number, scaleFont: Font, minimum: number, maximum: number, logScale: boolean, majorTickStepHint: number, foregroundColor: Color, showMinorTicks: boolean, showScale: boolean);
     get scaleLength(): number;
+    /** Only available post-draw */
+    getX(): number;
+    /** Only available post-draw */
+    getY(): number;
+    /** Only available post-draw */
+    getGridPositions(): number[];
+    /**
+     * Use only when the scale is not drawn, but you still need
+     * getValuePosition to work.
+     */
+    setDimensions(x: number, y: number, length: number, horizontal: boolean): void;
     getValuePosition(value: number): number;
+    getMinMax(): Range;
+    getPositionValue(absolutePosition: number): number;
     calculateMargin(g: Graphics, horizontal: boolean): number;
+    measureHorizontalHeight(g: Graphics): number;
     drawHorizontal(g: Graphics, x: number, y: number, width: number): number;
-    drawVertical(g: Graphics, x: number, y: number, height: number, leftCoordinate: boolean): number;
+    drawVertical(g: Graphics, x: number, y: number, height: number, leftCoordinate: boolean, ticksLeft?: boolean): number;
     private drawMinorXTicks;
     private drawMinorYTicks;
     private updateLabels;
@@ -39,6 +56,8 @@ export declare class LinearScale {
     private hasSpaceToDraw;
     private isMajorTick;
     private format;
+    private formatDate;
+    private formatTime;
     get spaceBetweenMarkAndLabel(): number;
     get majorTickLength(): number;
     get minorTickLength(): number;

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

@@ -35,4 +35,5 @@ export declare class Meter extends Widget {
     get showHi(): boolean;
     get showHiHi(): boolean;
     get showRamp(): boolean;
+    get valueLabelFormat(): string;
 }

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

@@ -31,7 +31,6 @@ export declare class ProgressBar extends Widget {
     get colorLoLo(): Color;
     get colorHi(): Color;
     get colorHiHi(): Color;
-    get scaleFont(): Font;
     get colorFillbackground(): Color;
     get effect3d(): boolean;
     get fillColorAlarmSensitive(): boolean;
@@ -50,6 +49,8 @@ export declare class ProgressBar extends Widget {
     get maximum(): number;
     get origin(): number;
     get originIgnored(): boolean;
+    get scaleFont(): Font;
+    get scaleFormat(): string;
     get showHi(): boolean;
     get showHiHi(): boolean;
     get showLabel(): boolean;
@@ -59,4 +60,5 @@ export declare class ProgressBar extends Widget {
     get showMinorTicks(): boolean;
     get showScale(): boolean;
     get transparentBackground(): boolean;
+    get valueLabelFormat(): string;
 }

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

@@ -26,7 +26,6 @@ export declare class Tank extends Widget {
     get colorLoLo(): Color;
     get colorHi(): Color;
     get colorHiHi(): Color;
-    get scaleFont(): Font;
     get colorFillbackground(): Color;
     get fillColorAlarmSensitive(): boolean;
     get fillColor(): Color;
@@ -40,6 +39,8 @@ export declare class Tank extends Widget {
     get minimum(): number;
     get majorTickStepHint(): number;
     get maximum(): number;
+    get scaleFont(): Font;
+    get scaleFormat(): string;
     get showLo(): boolean;
     get showLoLo(): boolean;
     get showHi(): boolean;

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

@@ -28,7 +28,6 @@ export declare class Thermometer extends Widget {
     get colorLoLo(): Color;
     get colorHi(): Color;
     get colorHiHi(): Color;
-    get scaleFont(): Font;
     get colorFillbackground(): Color;
     get fillColorAlarmSensitive(): boolean;
     get fillColor(): Color;
@@ -43,6 +42,8 @@ export declare class Thermometer extends Widget {
     get minimum(): number;
     get majorTickStepHint(): number;
     get maximum(): number;
+    get scaleFont(): Font;
+    get scaleFormat(): string;
     get showBulb(): boolean;
     get showMarkers(): boolean;
     get showMinorTicks(): boolean;
@@ -53,4 +54,5 @@ export declare class Thermometer extends Widget {
     get showScale(): boolean;
     get transparentBackground(): boolean;
     get unit(): number;
+    get valueLabelFormat(): string;
 }

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

@@ -0,0 +1,41 @@
+import { Color } from '../../../Color';
+import { Font } from '../../../Font';
+import { LinearScale } from '../LinearScale';
+import { XYGraph } from './XYGraph';
+export declare class Axis {
+    private widget;
+    readonly index: number;
+    linearScale?: LinearScale;
+    private _effectiveMinimum?;
+    private _effectiveMaximum?;
+    constructor(widget: XYGraph, index: 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);
+    performAutoScale(): void;
+    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/xygraph/CommandBuffer.d.ts

@@ -0,0 +1,26 @@
+import { Axis } from './Axis';
+export interface Command {
+    undo(): void;
+    redo(): void;
+}
+export declare class ZoomCommand implements Command {
+    private xAxis;
+    private yAxis;
+    private beforeXRanges;
+    private beforeYRanges;
+    private afterXRanges;
+    private afterYRanges;
+    constructor(xAxis: Axis[], yAxis: Axis[]);
+    saveState(): void;
+    undo(): void;
+    redo(): void;
+}
+export declare class CommandBuffer {
+    private undoStack;
+    private redoStack;
+    canUndo(): boolean;
+    canRedo(): boolean;
+    add(command: Command): void;
+    undo(): void;
+    redo(): void;
+}

package/dist/types/widgets/monitors/xygraph/PlotAreaRegion.d.ts

@@ -0,0 +1,22 @@
+import { OpiGrabEvent, OpiMouseEvent } from '../../../EventHandler';
+import { HitRegionSpecification } from '../../../HitRegionSpecification';
+import { Bounds } from '../../../positioning';
+import { XYGraph } from './XYGraph';
+export declare class PlotAreaRegion implements HitRegionSpecification {
+    private widget;
+    id: string;
+    cursor?: string;
+    selection?: Bounds;
+    private grabStart?;
+    private prevGrabEvent?;
+    private grabZoomCommand?;
+    constructor(id: string, widget: XYGraph);
+    tooltip(): string | undefined;
+    mouseDown(evt: OpiMouseEvent): void;
+    grab(evt: OpiGrabEvent): void;
+    grabEnd(): void;
+    click(evt: OpiMouseEvent): void;
+    private rangeZoomXAxes;
+    private rangeZoomYAxes;
+    private pan;
+}

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

@@ -0,0 +1,38 @@
+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/xygraph/TraceBuffer.d.ts

@@ -0,0 +1,32 @@
+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/xygraph/XYGraph.d.ts

@@ -0,0 +1,44 @@
+import { Color } from '../../../Color';
+import { Display } from '../../../Display';
+import { Font } from '../../../Font';
+import { Graphics } from '../../../Graphics';
+import { Range } from '../../../Range';
+import { Widget } from '../../../Widget';
+import { AbstractContainerWidget } from '../../others/AbstractContainerWidget';
+import { Axis } from './Axis';
+import { Trace } from './Trace';
+import { XYGraphToolbar } from './XYGraphToolbar';
+export declare class XYGraph extends Widget {
+    toolbar?: XYGraphToolbar;
+    private plotAreaRegion?;
+    private axes;
+    private traces;
+    autoScaleAllowed: boolean;
+    constructor(display: Display, parent: AbstractContainerWidget);
+    init(): void;
+    draw(g: Graphics): void;
+    private drawToolbar;
+    private drawTitle;
+    private drawAxes;
+    private drawPlotArea;
+    private drawZoomSelection;
+    private drawLegend;
+    setCursor(cursor: string | undefined): void;
+    calculateAutoscaledRange(axis: Axis): Range | undefined;
+    performAutoScale(): void;
+    clearGraph(): void;
+    getAxes(): Axis[];
+    getXAxes(): Axis[];
+    getYAxes(): Axis[];
+    getAxis(index: number): Axis;
+    getTrace(index: number): Trace;
+    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;
+}

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

@@ -0,0 +1,54 @@
+import { Graphics } from '../../../Graphics';
+import { HitRegionSpecification } from '../../../HitRegionSpecification';
+import { Bounds } from '../../../positioning';
+import { Command } from './CommandBuffer';
+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' | 'panning' | 'default';
+    private commandBuffer;
+    constructor(xyGraph: XYGraph);
+    updateState(): void;
+    addCommand(command: Command): void;
+    toggleTool(button: Button): void;
+    private createToolButton;
+    private createToggleButton;
+    private createButton;
+    draw(g: Graphics, area: Bounds): number;
+    private maybeWrap;
+    private drawSeparator;
+    private drawButton;
+    get scale(): number;
+    get buttonSize(): number;
+}
+export {};

package/dist/types/widgets/others/LinkingContainer.d.ts

@@ -1,9 +1,11 @@
 import { Display } from '../../Display';
 import { Graphics } from '../../Graphics';
+import { XMLNode } from '../../XMLNode';
 import { AbstractContainerWidget } from './AbstractContainerWidget';
 export declare class LinkingContainer extends AbstractContainerWidget {
     private linkedDisplay?;
     constructor(display: Display, parent: AbstractContainerWidget);
+    parseNode(node: XMLNode): void;
     init(): void;
     draw(g: Graphics): void;
     getLinkedWidget(): import("../../Widget").Widget | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yamcs/opi",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "description": "OPI Display Renderer",
   "author": "Yamcs Team <yamcs@spaceapplications.com>",
   "repository": {
@@ -24,21 +24,19 @@
     "dist/"
   ],
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^20.0.0",
+    "@rollup/plugin-commonjs": "^21.0.2",
     "@rollup/plugin-node-resolve": "^13.0.4",
-    "@types/dygraphs": "^2.1.3",
     "@types/fontfaceobserver": "2.1.0",
-    "@types/node": "^14.17.9",
-    "dygraphs": "^2.1.0",
-    "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"
   }
 }