@thegraid/hexlib 1.1.5 → 1.1.8

package/dist/table-params.js

@@ -1,53 +1,63 @@
-export const playerColors = ['b', 'w']; // Player Colors!
-export const playerColorsC = ['b', 'w', 'c']; // Player Colors + Criminal!
+const playerColorsLib = ['b', 'w']; // Player Colors!
+export const playerColors = playerColorsLib.concat();
+// Locally (for example, hextowns):
 export const playerColor0 = playerColors[0];
 export const playerColor1 = playerColors[1];
-export const playerColor2 = playerColorsC[2];
+// export const playerColor2 = playerColorsC[2]
 export function otherColor(color) { return color === playerColor0 ? playerColor1 : playerColor0; }
-export function playerColorRecord(b, w, c) { return { b, w, c }; }
-;
-export function playerColorRecordF(f) { return playerColorRecord(f(playerColor0), f(playerColor1), f(playerColor2)); }
+/** @return \{ pc0: arg0 as T, pc1: arg1 as T, ...}: PlayerColorRecord\<T> */
+export function playerColorRecord(...args) {
+    const rv = {};
+    playerColors.forEach((key, ndx) => rv[key] = (args[ndx]));
+    return rv;
+}
+export function playerColorRecordF(f) {
+    return playerColorRecord(...playerColors.map(pc => f(pc)));
+}
 export class TP {
+    /** compose a URL of form wss://host.domain:port/path.
+     *
+     * @param scheme ['wss']
+     * @param host [TP.ghost]
+     * @param domain [TP.gdomain]
+     * @param port [TP.gport]
+     * @param path [''] supply your own '/' and any query part
+     */
     static buildURL(scheme = 'wss', host = TP.ghost, domain = TP.gdomain, port = TP.gport, path = '') {
         return `${scheme}://${host}.${domain}:${port}${path}`;
     }
+    /** return OwnPropertyNames that are NOT also in Object (ie: length, name, prototype) */
     static staticFields(over = TP) {
         const basic_props = Object.getOwnPropertyNames(class {
         }); // [length, prototype, name]
         const static_props = Object.getOwnPropertyNames(over).filter(k => !basic_props.includes(k));
         return static_props;
     }
-    /** called by framework before TP is used; put your overrides here.
-     * @param qParams
-     * @param force true to apply exact value, if new key or new type.
-     */
-    static setParams(qParams = {}, force = false, over = TP) {
-        /** do not muck with standard basic properties of all/empty classes */
-        const static_props = TP.staticFields(over);
-        for (let [key, value] of Object.entries(qParams)) {
-            if (force || static_props.includes(key)) {
-                if (!force && (typeof value === 'string' && typeof over[key] === 'number')) {
-                    value = Number.parseInt(value); // minimal effort to align types.
-                }
-                TP[key] = value; // set a static value in base; DANGER! not typesafe!
-            }
-        }
-    }
     /**
-     * After pushing all values from local subclass of TP into base TP,
-     * delete them, so there is only the one copy in original base class: TP (from hexlib)
-     * Local references should still get/set values in the base object.
+     * If local field is present in tplib, set local value in tplib, and delete it from local.
+     *
+     * So hexlib methods will see and use the value as TP.field
      *
-     * This way, tsc still sees local TP for type safety,
-     * but there is a single object for updates using Chooser.
+     * If tplib value is a number and local value is a string, try coerce using parseInt()
      *
-     * @param local the locally created subclass of TP with static fields
+     * @param local source of the new values (typically TP-local or {...})
+     * @param force [false] if true, do not attempt to coerce value with parseInt().
+     * @param tplib [TP-lib] the target in which to set the values from local.
+     * @return local with tplib values removed
      */
-    static eraseLocal(local) {
-        const static_props = TP.staticFields(local);
-        static_props.forEach(key => delete local[key]);
-        const new_props = TP.staticFields(local);
-        // assert new_props is empty!
+    static setParams(local = {}, force = false, tplib = TP) {
+        /** do not muck with standard basic properties of all/empty classes */
+        const static_props = TP.staticFields(tplib);
+        for (let [key, value] of Object.entries(local)) {
+            if (!static_props.includes(key))
+                continue; // if no collision leave in TP-local
+            if (!force && (typeof value === 'string' && typeof tplib[key] === 'number')) {
+                value = Number.parseInt(value); // minimal effort to align types.
+            }
+            tplib[key] = value; // set a static value in base; DANGER! not typesafe!
+            delete local[key]; // so future local[key] = value will tplib[key] = value;
+        }
+        return local;
     }
     /** the current map from PlayerColor to colorn */
     static colorScheme = playerColorRecordF(n => n);

package/dist/table-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-params.js","sourceRoot":"","sources":["../src/table-params.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table-params.js","sourceRoot":"","sources":["../src/table-params.ts"],"names":[],"mappings":"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"}

package/dist/table.d.ts

@@ -6,20 +6,13 @@ import { Container, DisplayObject, EventDispatcher, Shape, Stage, Text } from "@
 import { NamedContainer, NamedObject, type GamePlay } from "./game-play";
 import { Scenario } from "./game-setup";
 import type { GameState } from "./game-state";
-import { Hex, IHex2, IdHex, RecycleHex, HexM } from "./hex";
+import { Hex, HexM, IdHex, IHex2, RecycleHex } from "./hex";
 import { XYWH } from "./hex-intfs";
 import { Player } from "./player";
 import { PlayerPanel } from "./player-panel";
 import { HexShape, RectShape, UtilButton } from "./shapes";
-import { PlayerColor } from "./table-params";
 import { Tile } from "./tile";
 import { TileSource } from "./tile-source";
-export type EventName = 'Claim' | 'Split' | 'Conflict' | 'merge' | 'redzone';
-export interface ActionButton extends Container {
-    isEvent: boolean;
-    pid: number;
-    rollover?: ((b: ActionButton, over: boolean) => void);
-}
 export interface Dragable {
     dragFunc0(hex: IHex2, ctx: DragContext): void;
     dropFunc0(hex: IHex2, ctx: DragContext): void;
@@ -59,7 +52,7 @@ export declare class Table {
     static table: Table;
     static stageTable(obj: DisplayObject): Table;
     disp: EventDispatcher;
-    namedOn(Aname: string, type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): void;
+    namedOn(Aname: string, type: string, listener: (eventObj: any) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): void;
     gamePlay: GamePlay;
     stage: Stage;
     bgRect: Shape;
@@ -97,6 +90,15 @@ export declare class Table {
     isVisible: boolean;
     /** method invokes closure defined in enableHexInspector. */
     toggleText(vis?: boolean): undefined;
+    cacheScale: number;
+    /**
+     * re-cache all Tiles with alternate cacheScale; improves resolution at high zoom.
+     *
+     * Alternate invocations return cacheScale to 0 (un-cached)
+     * @param setScale [TP.cacheTiles === 0] set true to force setting, false to toggle
+     * @param cacheScale [max(1, scaleCont.scaleX)] set to use specific scale
+     */
+    reCacheTiles(setScale?: boolean, cacheScale?: number): void;
     aiControl(color?: string, dx?: number, rad?: number): Container;
     /** all the non-map hexes created by newHex2 */
     newHexes: IHex2[];
@@ -407,7 +409,7 @@ export declare class Table {
     };
     /**
      * all number in units of dxdc or dydr
-     * @param x0 frame left; relative to scaleCont
+     * @param x0 frame left; relative to scaleCont (offset from bgRect to hexCont)
      * @param y0 frame top; relative to scaleCont
      * @param w0 pad width; width of bgRect, beyond hexCont, centered on hexCont
      * @param h0 pad height; height of bgRect, beyond hexCont, centered on hexCont
@@ -431,16 +433,29 @@ export declare class Table {
         row: number;
         col: number;
     };
+    /**
+     * After setBackground() & hexCont.cache(); before makePerPlayer();
+     *
+     * Whatever: make overlays, score panel, extra tracks (auction...)
+     */
     layoutTable2(): void;
+    /**
+     * Make ParamGUI with a background RectShape, and make it dragable.
+     * @param makeGUI a function(Container) to create a ParamGUI
+     * @param name of the Container to hold the ParamGUI
+     * @param cx location of Container on scaleCont: cx * scale
+     * @param cy location of Container on scaleCont: cy * scale
+     * @param scale [TP.hexRad / 60] Container scaleX, scaleY
+     * @param d border size of background RectShape around/behind GUI Container
+     * @returns the gui returned from makeGUI(Table, Ccntainer)
+     */
     gpanel(makeGUI: (cont: Container) => ParamGUI, name: string, cx: number, cy: number, scale?: number, d?: number): ParamGUI;
     /**
-     * makeNetworkGUI(parent)
-     * makeParamGUI(parent)
-     * makeParamGUI2(parent)
-     * makeDragable()
-     * @param table
+     * makeNetworkGUI(parent) -> gui3.ymax
+     * makeParamGUI(parent)   -> gui1.ymax
+     * makeParamGUI2(parent)  -> gui2.ymax
      */
-    makeGUIs(): void;
+    makeGUIs(scale?: number, cx?: number, cy?: number, dy?: number): void;
     get panelHeight(): number;
     get panelOffset(): number;
     /**
@@ -1297,13 +1312,19 @@ export declare class Table {
     get tablePlanner(): TablePlanner;
     /**
      * All manual moves feed through this (drop & redo)
+     *
      * TablePlanner.logMove(); then dispatchEvent() --> gamePlay.doPlayerMove()
      *
      * New: let Ship (Drag & Drop) do this.
      */
     doTableMove(ihex: IdHex): void;
-    /** All moves (GUI & player) feed through this: */
-    moveStoneToHex(ihex: IdHex, sc: PlayerColor): void;
+    /** All moves (GUI & plannerMove) feed through here:
+     *
+     * gamePlay listens with playerMoveEvent(TileEvent)
+     *
+     * and eventually get to Player.doPlayerMove()
+     */
+    moveTileToHex(tile: Tile, ihex: IdHex): void;
     /** default scaling-up value */
     upscale: number;
     /** change cont.scale to given scale value. */
@@ -1315,27 +1336,25 @@ export declare class Table {
         steps: number;
         zscale: number;
     };
-    readonly scaleCont: ScaleableContainer2;
+    readonly scaleCont: ScaleableContainer;
     /** makeScaleableBack and setup scaleParams
-     * @param bindkeys true if there's a GUI/user/keyboard
+     * @param bindkeys true if there's a GUI/user/keyboard (Canvas)
      */
-    makeScaleCont(bindKeys: boolean): ScaleableContainer2;
+    makeScaleCont(bindKeys: boolean): ScaleableContainer;
     bindKeys(): void;
     /** put a Rectangle Shape at (0,0) with XYWH bounds as given */
     setBackground(parent: Container, bounds: XYWH, bgColor?: string): RectShape & NamedObject;
     zoom(z?: number): void;
     pan(xy: XY): void;
     /**
-     * invoked before this.scaleC has been set
-     * @param scaleC same Container as this.scaleC
-     * @param char keybinding to set initial scale
-     * @param xos x-offset of scaleC in screen coords (pre-scale)
-     * @param yos y-offset of scaleC in screen coords (pre-scale)
-     * @param scale0 imitial scale [.5]
+     * invoked before this.scaleCont has been set.
+     * @param scaleC the ScaleableContainer to be used
+     * @param isc ['a'] initial scale char, keybinding to reset to initial scale
+     * @param xos initial x-offset of scaleC in screen coords (pre-scale)
+     * @param yos initial y-offset of scaleC in screen coords (pre-scale)
+     * @param scale0 [.5] initial scale
      */
-    bindKeysToScale(scaleC: ScaleableContainer2, char: string, xos: number, yos: number, scale0?: number): void;
-}
-declare class ScaleableContainer2 extends ScaleableContainer {
+    bindKeysToScale(scaleC: ScaleableContainer, isc?: string, xos?: number, yos?: number, scale0?: number): void;
 }
 export {};
 //# sourceMappingURL=table.d.ts.map

package/dist/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../src/table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../src/table.ts"],"names":[],"mappings":"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"}

package/dist/table.js

@@ -1,16 +1,13 @@
 import { AT, C, CenterText, Dragger, F, KeyBinder, ParamGUI, S, ScaleableContainer, stime } from "@thegraid/easeljs-lib";
 import { Container, EventDispatcher, Graphics, Shape, Text } from "@thegraid/easeljs-module";
-import { NamedContainer } from "./game-play";
+import { EBC, PidChoice } from "./choosers";
+import { NamedContainer, TileEvent } from "./game-play";
 import { RecycleHex } from "./hex";
 import { Player } from "./player";
 import { PlayerPanel } from "./player-panel";
 import { CircleShape, HexShape, RectShape, UtilButton } from "./shapes";
 import { playerColor0, playerColor1, TP } from "./table-params";
 import { Tile } from "./tile";
-import { PidChoice, EBC } from "./choosers";
-//import { TablePlanner } from "./planner";
-function firstChar(s, uc = true) { return uc ? s.substring(0, 1).toUpperCase() : s.substring(0, 1); }
-;
 /** to own file... */
 class TablePlanner {
     constructor(gamePlay) { }
@@ -207,6 +204,33 @@ export class Table {
         this.hexMap.update(); // after toggleText & updateCache()
         return undefined;
     }
+    cacheScale = TP.cacheTiles;
+    /**
+     * re-cache all Tiles with alternate cacheScale; improves resolution at high zoom.
+     *
+     * Alternate invocations return cacheScale to 0 (un-cached)
+     * @param setScale [TP.cacheTiles === 0] set true to force setting, false to toggle
+     * @param cacheScale [max(1, scaleCont.scaleX)] set to use specific scale
+     */
+    reCacheTiles(setScale = (TP.cacheTiles === 0), cacheScale) {
+        this.cacheScale = cacheScale ?? Math.max(1, this.scaleCont.scaleX); // If zoomed in, use that higher scale
+        TP.cacheTiles = setScale ? this.cacheScale : 1; //
+        console.log(stime('GamePlay', `.reCacheTiles: TP.cacheTiles=`), TP.cacheTiles, this.scaleCont.scaleX);
+        Tile.allTiles.forEach(tile => {
+            const rad = tile.radius;
+            tile.setBounds(null, 0, 0, 0);
+            if (tile.cacheID) {
+                tile.uncache();
+                const { x, y, width, height } = tile.getBounds() ?? { x: -rad, y: -rad, width: 2 * rad, height: 2 * rad };
+                tile.setBounds(x, y, width, height);
+            }
+            else {
+                const { x, y, width, height } = tile.getBounds() ?? { x: -rad, y: -rad, width: 2 * rad, height: 2 * rad };
+                tile.cache(x, y, width, height, TP.cacheTiles);
+            }
+        });
+        this.hexMap.update();
+    }
     aiControl(color = TP.bgColor, dx = 100, rad = 16) {
         let table = this;
         // c m v on buttons
@@ -261,7 +285,7 @@ export class Table {
     }
     /**
      * all number in units of dxdc or dydr
-     * @param x0 frame left; relative to scaleCont
+     * @param x0 frame left; relative to scaleCont (offset from bgRect to hexCont)
      * @param y0 frame top; relative to scaleCont
      * @param w0 pad width; width of bgRect, beyond hexCont, centered on hexCont
      * @param h0 pad height; height of bgRect, beyond hexCont, centered on hexCont
@@ -276,7 +300,7 @@ export class Table {
         const mapCont = hexMap.mapCont, hexCont = mapCont.hexCont; // local reference
         this.scaleCont.addChild(mapCont);
         // background sized for hexMap:
-        const { width, height } = hexCont.getBounds();
+        const { width, height } = hexCont.getBounds(); // & .setBounds() ??
         const { dxdc, dydr } = hexMap.xywh;
         const { x, y, w, h } = { x: x0 * dxdc, y: y0 * dydr, w: width + w0 * dxdc, h: height + h0 * dydr };
         // align center of mapCont(0,0) == hexMap(center) with center of background
@@ -298,16 +322,9 @@ export class Table {
         this.bgRect = this.setBackground(this.scaleCont, xywh); // bounded by xywh
         const { x, y, width, height } = hexCont.getBounds();
         hexCont.cache(x, y, width, height); // cache hexCont (bounded by bgr)
-        /**
-         * After setBackground() & hexCont.cache(); before makePerPlayer();
-         *
-         * Whatever: make overlays, score panel, extra tracks (auction...)
-         */
         this.layoutTable2(); // supply args (mapCont?) if necessary;
         this.makePerPlayer();
         this.setupUndoButtons(55, 60, 45, xywh); // & enableHexInspector()
-        this.stage.on('drawend', () => setTimeout(() => this.toggleText(this.initialVis), 10), this, true);
-        this.hexMap.update();
         this.layoutTurnlog();
         this.namedOn("playerMoveEvent", S.add, this.gamePlay.playerMoveEvent, this.gamePlay);
     }
@@ -325,29 +342,44 @@ export class Table {
         const col = (pIndex == 0 ? (icol) : (dc - icol));
         return { row, col };
     }
+    /**
+     * After setBackground() & hexCont.cache(); before makePerPlayer();
+     *
+     * Whatever: make overlays, score panel, extra tracks (auction...)
+     */
     layoutTable2() {
+        this.stage.on('drawend', () => setTimeout(() => this.toggleText(this.initialVis), 10), this, true);
+        this.hexMap.update();
     }
+    /**
+     * Make ParamGUI with a background RectShape, and make it dragable.
+     * @param makeGUI a function(Container) to create a ParamGUI
+     * @param name of the Container to hold the ParamGUI
+     * @param cx location of Container on scaleCont: cx * scale
+     * @param cy location of Container on scaleCont: cy * scale
+     * @param scale [TP.hexRad / 60] Container scaleX, scaleY
+     * @param d border size of background RectShape around/behind GUI Container
+     * @returns the gui returned from makeGUI(Table, Ccntainer)
+     */
     gpanel(makeGUI, name, cx, cy, scale = 1, d = 5) {
         const guiC = new NamedContainer(name, cx * scale, cy * scale);
         // const map = table.hexMap.mapCont.parent;
         this.scaleCont.addChildAt(guiC);
         guiC.scaleX = guiC.scaleY = scale;
-        const gui = makeGUI.call(this, guiC); // @[0, 0]
-        guiC.x -= (gui.linew + d) * scale;
+        const gui = makeGUI.call(this, guiC); // gui.[x,y] = [0, 0];
+        guiC.x -= (gui.linew + d) * scale; // Chooser-lines go to left, text to right
         const bgr = new RectShape({ x: -d, y: -d, w: gui.linew + 2 * d, h: gui.ymax + 2 * d }, 'rgb(200,200,200,.5)', '');
         guiC.addChildAt(bgr, 0);
         this.dragger.makeDragable(guiC);
         return gui;
     }
     /**
-     * makeNetworkGUI(parent)
-     * makeParamGUI(parent)
-     * makeParamGUI2(parent)
-     * makeDragable()
-     * @param table
+     * makeNetworkGUI(parent) -> gui3.ymax
+     * makeParamGUI(parent)   -> gui1.ymax
+     * makeParamGUI2(parent)  -> gui2.ymax
      */
-    makeGUIs() {
-        const scaleCont = this.scaleCont, scale = TP.hexRad / 60, cx = -200, cy = 250, dy = 20;
+    makeGUIs(scale = TP.hexRad / 60, cx = -200, cy = 250, dy = 20) {
+        const scaleCont = this.scaleCont;
         let ymax = 0;
         const gui3 = this.gpanel(this.makeNetworkGUI, 'NetGUI', cx, cy + ymax, scale);
         ymax += gui3.ymax + dy;
@@ -546,13 +578,13 @@ export class Table {
         doneButton.on(S.click, this.doneClicked, this);
         actionCont.addChild(doneButton);
         // prefix advice: set text color
-        const o_cgf = doneButton.shape.cgf;
+        const o_cgf = doneButton.rectShape.cgf;
         const cgf = (color) => {
             const tcolor = (C.dist(color, C.WHITE) < C.dist(color, C.black)) ? C.black : C.white;
             doneButton.label.color = tcolor;
             return o_cgf(color);
         };
-        doneButton.shape.cgf = cgf; // invokes shape.paint(cgf) !!
+        doneButton.rectShape.cgf = cgf; // invokes shape.paint(cgf) !!
         return actionCont;
     }
     /** show player player score on table */
@@ -763,17 +795,23 @@ export class Table {
     }
     /**
      * All manual moves feed through this (drop & redo)
+     *
      * TablePlanner.logMove(); then dispatchEvent() --> gamePlay.doPlayerMove()
      *
      * New: let Ship (Drag & Drop) do this.
      */
     doTableMove(ihex) {
     }
-    /** All moves (GUI & player) feed through this: */
-    moveStoneToHex(ihex, sc) {
-        // let hex = Hex.ofMap(ihex, this.hexMap)
-        // this.hexMap.showMark(hex)
-        // this.dispatchEvent(new HexEvent(S.add, hex, sc)) // -> GamePlay.playerMoveEvent(hex, sc)
+    /** All moves (GUI & plannerMove) feed through here:
+     *
+     * gamePlay listens with playerMoveEvent(TileEvent)
+     *
+     * and eventually get to Player.doPlayerMove()
+     */
+    moveTileToHex(tile, ihex) {
+        const hex = this.hexMap.getHex(ihex);
+        this.hexMap.showMark(hex);
+        this.disp.dispatchEvent(new TileEvent(S.add, tile, hex)); // -> GamePlay.playerMoveEvent(hex, sc)
     }
     /** default scaling-up value */
     upscale = 1.5;
@@ -784,11 +822,11 @@ export class Table {
     scaleParams = { initScale: .125, scale0: .05, scaleMax: 4, steps: 30, zscale: .20, };
     scaleCont;
     /** makeScaleableBack and setup scaleParams
-     * @param bindkeys true if there's a GUI/user/keyboard
+     * @param bindkeys true if there's a GUI/user/keyboard (Canvas)
      */
     makeScaleCont(bindKeys) {
         /** scaleCont: a scalable background */
-        const scaleC = new ScaleableContainer2(this.stage, this.scaleParams);
+        const scaleC = new ScaleableContainer(this.stage, this.scaleParams);
         this.dragger = new Dragger(scaleC);
         if (!!scaleC.stage.canvas) {
             // Special case of makeDragable; drag the parent of Dragger!
@@ -796,7 +834,7 @@ export class Table {
             //this.scaleUp(Dragger.dragCont, 1.7); // Items being dragged appear larger!
         }
         if (bindKeys) {
-            this.bindKeysToScale(scaleC, "a", 436, 2);
+            this.bindKeysToScale(scaleC);
             this.bindKeys();
         }
         return scaleC;
@@ -829,15 +867,15 @@ export class Table {
         this.stage?.update();
     }
     /**
-     * invoked before this.scaleC has been set
-     * @param scaleC same Container as this.scaleC
-     * @param char keybinding to set initial scale
-     * @param xos x-offset of scaleC in screen coords (pre-scale)
-     * @param yos y-offset of scaleC in screen coords (pre-scale)
-     * @param scale0 imitial scale [.5]
+     * invoked before this.scaleCont has been set.
+     * @param scaleC the ScaleableContainer to be used
+     * @param isc ['a'] initial scale char, keybinding to reset to initial scale
+     * @param xos initial x-offset of scaleC in screen coords (pre-scale)
+     * @param yos initial y-offset of scaleC in screen coords (pre-scale)
+     * @param scale0 [.5] initial scale
      */
     // bindKeysToScale('a', scaleC, 436, 0, .5)
-    bindKeysToScale(scaleC, char, xos, yos, scale0 = .5) {
+    bindKeysToScale(scaleC, isc = 'a', xos = 436, yos = 2, scale0 = .5) {
         const nsA = scale0;
         const apt = { x: xos, y: yos };
         let nsZ = 0.647; //
@@ -862,7 +900,7 @@ export class Table {
             this.stage.getObjectsUnderPoint(500, 100, 1);
         };
         // Scale-setting keystrokes:
-        KeyBinder.keyBinder.setKey("a", { func: () => setScaleXY(nsA, apt) });
+        KeyBinder.keyBinder.setKey(isc, { func: () => setScaleXY(nsA, apt) });
         KeyBinder.keyBinder.setKey("z", { func: () => setScaleXY(nsZ, zpt) });
         KeyBinder.keyBinder.setKey("x", { func: () => saveScaleZ() });
         KeyBinder.keyBinder.setKey("p", { func: () => getOop(), thisArg: this });
@@ -874,9 +912,7 @@ export class Table {
         KeyBinder.keyBinder.setKey('S-ArrowRight', { thisArg: this, func: this.pan, argVal: { x: 10, y: 0 } });
         KeyBinder.keyBinder.setKey('ArrowUp', { thisArg: this, func: this.pan, argVal: { x: 0, y: -10 } });
         KeyBinder.keyBinder.setKey('ArrowDown', { thisArg: this, func: this.pan, argVal: { x: 0, y: 10 } });
-        KeyBinder.keyBinder.dispatchChar(char);
+        KeyBinder.keyBinder.dispatchChar(isc);
     }
 }
-class ScaleableContainer2 extends ScaleableContainer {
-}
 //# sourceMappingURL=table.js.map