oncoprintjs 5.0.3 → 6.0.1

package/src/js/oncoprintshapetovertexes.ts

@@ -1,31 +1,36 @@
-import {ComputedShapeParams, Rectangle} from "./oncoprintshape";
-import {RGBAColor} from "./oncoprintruleset";
+import { ComputedShapeParams, Rectangle } from './oncoprintshape';
+import { RGBAColor } from './oncoprintruleset';
 
 const halfsqrt2 = Math.sqrt(2) / 2;
 
-function normalizeRGBA(color:RGBAColor):[number, number, number, number] {
-    return [
-        color[0],
-        color[1],
-        color[2],
-        color[3]*255
-    ]
+function normalizeRGBA(color: RGBAColor): [number, number, number, number] {
+    return [color[0], color[1], color[2], color[3] * 255];
 }
 
-type AddVertexCallback = (vertex:[number,number,number], color:[number,number,number,number])=>void;
-
-function rectangleToVertexes(params:ComputedShapeParams, z_index:number, addVertex:AddVertexCallback) {
-    const x = params.x, y = params.y, height = params.height, width = params.width;
+type AddVertexCallback = (
+    vertex: [number, number, number],
+    color: [number, number, number, number]
+) => void;
+
+function rectangleToVertexes(
+    params: ComputedShapeParams,
+    z_index: number,
+    addVertex: AddVertexCallback
+) {
+    const x = params.x,
+        y = params.y,
+        height = params.height,
+        width = params.width;
 
     // Fill
     const fill_rgba = normalizeRGBA(params.fill);
-    addVertex([x,y,z_index], fill_rgba);
-    addVertex([x+width, y, z_index], fill_rgba);
-    addVertex([x+width, y+height, z_index], fill_rgba);
+    addVertex([x, y, z_index], fill_rgba);
+    addVertex([x + width, y, z_index], fill_rgba);
+    addVertex([x + width, y + height, z_index], fill_rgba);
 
-    addVertex([x,y,z_index], fill_rgba);
-    addVertex([x+width, y+height, z_index], fill_rgba);
-    addVertex([x,y+height,z_index],fill_rgba);
+    addVertex([x, y, z_index], fill_rgba);
+    addVertex([x + width, y + height, z_index], fill_rgba);
+    addVertex([x, y + height, z_index], fill_rgba);
 
     // Stroke
     const stroke_width = params['stroke-width'];
@@ -69,53 +74,124 @@ function rectangleToVertexes(params:ComputedShapeParams, z_index:number, addVert
     }
 }
 
-function triangleToVertexes(params:ComputedShapeParams, z_index:number, addVertex:AddVertexCallback) {
+function triangleToVertexes(
+    params: ComputedShapeParams,
+    z_index: number,
+    addVertex: AddVertexCallback
+) {
     const fill_rgba = normalizeRGBA(params.fill);
     addVertex([params.x1, params.y1, z_index], fill_rgba);
     addVertex([params.x2, params.y2, z_index], fill_rgba);
     addVertex([params.x3, params.y3, z_index], fill_rgba);
 }
 
-function ellipseToVertexes(params:ComputedShapeParams, z_index:number, addVertex:AddVertexCallback) {
-    const center = {x:params.x +params.width / 2, y:params.y +params.height / 2};
-    const horzrad =params.width / 2;
-    const vertrad =params.height / 2;
+function ellipseToVertexes(
+    params: ComputedShapeParams,
+    z_index: number,
+    addVertex: AddVertexCallback
+) {
+    const center = {
+        x: params.x + params.width / 2,
+        y: params.y + params.height / 2,
+    };
+    const horzrad = params.width / 2;
+    const vertrad = params.height / 2;
 
     const fill_rgba = normalizeRGBA(params.fill);
     addVertex([center.x, center.y, z_index], fill_rgba);
     addVertex([center.x + horzrad, center.y, z_index], fill_rgba);
-    addVertex([center.x + halfsqrt2 * horzrad, center.y + halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x + halfsqrt2 * horzrad,
+            center.y + halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
 
     addVertex([center.x, center.y, z_index], fill_rgba);
-    addVertex([center.x + halfsqrt2 * horzrad, center.y + halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x + halfsqrt2 * horzrad,
+            center.y + halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
     addVertex([center.x, center.y + vertrad, z_index], fill_rgba);
 
     addVertex([center.x, center.y, z_index], fill_rgba);
     addVertex([center.x, center.y + vertrad, z_index], fill_rgba);
-    addVertex([center.x - halfsqrt2 * horzrad, center.y + halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x - halfsqrt2 * horzrad,
+            center.y + halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
 
     addVertex([center.x, center.y, z_index], fill_rgba);
-    addVertex([center.x - halfsqrt2 * horzrad, center.y + halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x - halfsqrt2 * horzrad,
+            center.y + halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
     addVertex([center.x - horzrad, center.y, z_index], fill_rgba);
 
     addVertex([center.x, center.y, z_index], fill_rgba);
     addVertex([center.x - horzrad, center.y, z_index], fill_rgba);
-    addVertex([center.x - halfsqrt2 * horzrad, center.y - halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x - halfsqrt2 * horzrad,
+            center.y - halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
 
     addVertex([center.x, center.y, z_index], fill_rgba);
-    addVertex([center.x - halfsqrt2 * horzrad, center.y - halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x - halfsqrt2 * horzrad,
+            center.y - halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
     addVertex([center.x, center.y - vertrad, z_index], fill_rgba);
 
     addVertex([center.x, center.y, z_index], fill_rgba);
     addVertex([center.x, center.y - vertrad, z_index], fill_rgba);
-    addVertex([center.x + halfsqrt2 * horzrad, center.y - halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x + halfsqrt2 * horzrad,
+            center.y - halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
 
     addVertex([center.x, center.y, z_index], fill_rgba);
-    addVertex([center.x + halfsqrt2 * horzrad, center.y - halfsqrt2 * vertrad, z_index], fill_rgba);
+    addVertex(
+        [
+            center.x + halfsqrt2 * horzrad,
+            center.y - halfsqrt2 * vertrad,
+            z_index,
+        ],
+        fill_rgba
+    );
     addVertex([center.x + horzrad, center.y, z_index], fill_rgba);
 }
 
-function lineToVertexes(params:ComputedShapeParams, z_index:number, addVertex:AddVertexCallback) {
+function lineToVertexes(
+    params: ComputedShapeParams,
+    z_index: number,
+    addVertex: AddVertexCallback
+) {
     // For simplicity of dealing with webGL we'll implement lines as thin triangle pairs
     let x1 = params.x1;
     let x2 = params.x2;
@@ -135,11 +211,20 @@ function lineToVertexes(params:ComputedShapeParams, z_index:number, addVertex:Ad
     }
 
     const perpendicular_vector = [y2 - y1, x1 - x2];
-    const perpendicular_vector_length = Math.sqrt(perpendicular_vector[0] * perpendicular_vector[0] + perpendicular_vector[1] * perpendicular_vector[1]);
-    const unit_perp_vector = [perpendicular_vector[0] / perpendicular_vector_length, perpendicular_vector[1] / perpendicular_vector_length];
+    const perpendicular_vector_length = Math.sqrt(
+        perpendicular_vector[0] * perpendicular_vector[0] +
+            perpendicular_vector[1] * perpendicular_vector[1]
+    );
+    const unit_perp_vector = [
+        perpendicular_vector[0] / perpendicular_vector_length,
+        perpendicular_vector[1] / perpendicular_vector_length,
+    ];
 
     const half_stroke_width = params['stroke-width'] / 2;
-    const direction1 = [unit_perp_vector[0] * half_stroke_width, unit_perp_vector[1] * half_stroke_width];
+    const direction1 = [
+        unit_perp_vector[0] * half_stroke_width,
+        unit_perp_vector[1] * half_stroke_width,
+    ];
     const direction2 = [direction1[0] * -1, direction1[1] * -1];
     const A = [x1 + direction1[0], y1 + direction1[1]];
     const B = [x1 + direction2[0], y1 + direction2[1]];
@@ -156,25 +241,45 @@ function lineToVertexes(params:ComputedShapeParams, z_index:number, addVertex:Ad
     addVertex([B[0], B[1], z_index], stroke_rgba);
 }
 
-export default function(oncoprint_shape_computed_params:ComputedShapeParams, z_index:number, addVertex:AddVertexCallback) {
+export default function(
+    oncoprint_shape_computed_params: ComputedShapeParams,
+    z_index: number,
+    addVertex: AddVertexCallback
+) {
     // target_position_array is an array with 3-d float vertexes
     // target_color_array is an array with rgba values in [0,1]
     // We pass them in to save on concatenation costs
 
     const type = oncoprint_shape_computed_params.type;
-    if (type === "rectangle") {
-        return rectangleToVertexes(oncoprint_shape_computed_params, z_index, addVertex);
-    } else if (type === "triangle") {
-        return triangleToVertexes(oncoprint_shape_computed_params, z_index, addVertex);
-    } else if (type === "ellipse") {
-        return ellipseToVertexes(oncoprint_shape_computed_params, z_index, addVertex);
-    } else if (type === "line") {
-        return lineToVertexes(oncoprint_shape_computed_params, z_index, addVertex);
+    if (type === 'rectangle') {
+        return rectangleToVertexes(
+            oncoprint_shape_computed_params,
+            z_index,
+            addVertex
+        );
+    } else if (type === 'triangle') {
+        return triangleToVertexes(
+            oncoprint_shape_computed_params,
+            z_index,
+            addVertex
+        );
+    } else if (type === 'ellipse') {
+        return ellipseToVertexes(
+            oncoprint_shape_computed_params,
+            z_index,
+            addVertex
+        );
+    } else if (type === 'line') {
+        return lineToVertexes(
+            oncoprint_shape_computed_params,
+            z_index,
+            addVertex
+        );
     }
 }
 
-export function getNumWebGLVertexes(shape:ComputedShapeParams) {
-    let ret:number;
+export function getNumWebGLVertexes(shape: ComputedShapeParams) {
+    let ret: number;
     switch (shape.type) {
         case 'rectangle':
             if (shape['stroke-width'] > 0) {
@@ -194,4 +299,4 @@ export function getNumWebGLVertexes(shape:ComputedShapeParams) {
             break;
     }
     return ret;
-}
+}

package/src/js/oncoprinttooltip.ts

@@ -1,22 +1,32 @@
-import $ from "jquery";
+import $ from 'jquery';
 
-const TOOLTIP_CLASS = "oncoprintjs__tooltip";
+const TOOLTIP_CLASS = 'oncoprintjs__tooltip';
 
-export type OncoprintTooltipParams = { noselect?:boolean };
+export type OncoprintTooltipParams = { noselect?: boolean };
 
 export default class OncoprintToolTip {
-    private $div:JQuery;
-    private hide_timeout_id:number|undefined;
-    private show_timeout_id:number|undefined;
-    public center:boolean;
-    private shown:boolean;
+    private $div: JQuery;
+    private hide_timeout_id: number | undefined;
+    private show_timeout_id: number | undefined;
+    public center: boolean;
+    private shown: boolean;
 
-    constructor(private $container:JQuery, params?:OncoprintTooltipParams) {
+    constructor(private $container: JQuery, params?: OncoprintTooltipParams) {
         params = params || {};
 
-        this.$div = $('<div></div>').addClass(TOOLTIP_CLASS).appendTo($container).css({'background-color':'rgba(255,255,255,1)', 'position':'absolute', 'display':'none', 'border':'1px solid black', 'max-width':300, 'min-width':150});
+        this.$div = $('<div></div>')
+            .addClass(TOOLTIP_CLASS)
+            .appendTo($container)
+            .css({
+                'background-color': 'rgba(255,255,255,1)',
+                position: 'absolute',
+                display: 'none',
+                border: '1px solid black',
+                'max-width': 300,
+                'min-width': 150,
+            });
         if (params.noselect) {
-            this.$div.addClass("noselect");
+            this.$div.addClass('noselect');
         }
         this.hide_timeout_id = undefined;
         this.show_timeout_id = undefined;
@@ -25,16 +35,22 @@ export default class OncoprintToolTip {
         this.shown = false;
 
         const self = this;
-        this.$div.on("mousemove", function(evt) {
+        this.$div.on('mousemove', function(evt) {
             evt.stopPropagation();
             self.cancelScheduledHide();
         });
-        this.$div.on("mouseleave", function(evt) {
+        this.$div.on('mouseleave', function(evt) {
             evt.stopPropagation();
             self.hide();
         });
     }
-    public show(wait:number|undefined, viewport_x:number, viewport_y:number, $contents:JQuery, fade?:boolean) {
+    public show(
+        wait: number | undefined,
+        viewport_x: number,
+        viewport_y: number,
+        $contents: JQuery,
+        fade?: boolean
+    ) {
         this.cancelScheduledHide();
 
         if (typeof wait !== 'undefined' && !this.shown) {
@@ -42,16 +58,21 @@ export default class OncoprintToolTip {
             this.cancelScheduledShow();
             this.show_timeout_id = setTimeout(function() {
                 self.doShow(viewport_x, viewport_y, $contents, fade);
-            }, wait);
+            }, wait) as any;
         } else {
             this.doShow(viewport_x, viewport_y, $contents, fade);
         }
     }
-    private doShow(viewport_x:number, viewport_y:number, $contents:JQuery, fade?:boolean) {
+    private doShow(
+        viewport_x: number,
+        viewport_y: number,
+        $contents: JQuery,
+        fade?: boolean
+    ) {
         this.cancelScheduledShow();
         this.show_timeout_id = undefined;
         this.$div.empty();
-        this.$div.css({'top':0, 'left':0, 'z-index':9999}); // put up top left so that it doesnt cause any page expansion, before the position calculation which depends on page size
+        this.$div.css({ top: 0, left: 0, 'z-index': 9999 }); // put up top left so that it doesnt cause any page expansion, before the position calculation which depends on page size
         this.$div.append($contents);
         if (!fade) {
             this.$div.show();
@@ -59,7 +80,7 @@ export default class OncoprintToolTip {
             this.$div.stop().fadeIn('fast');
         }
         // adjust tooltip position based on size of contents
-        let x = viewport_x - (this.center ? this.$div.width()/2 : 0);
+        let x = viewport_x - (this.center ? this.$div.width() / 2 : 0);
         let y = viewport_y - this.$div.height();
         // clamp to visible area
         const min_padding = 20;
@@ -68,10 +89,10 @@ export default class OncoprintToolTip {
         x = Math.max(x, min_padding); // make sure not too left
         x = Math.min(x, $(window).width() - this.$div.width() - min_padding); // make sure not too right
 
-        this.$div.css({'top':y, 'left':x, 'z-index':9999});
+        this.$div.css({ top: y, left: x, 'z-index': 9999 });
         this.shown = true;
     }
-    private doHide(fade?:boolean) {
+    private doHide(fade?: boolean) {
         this.cancelScheduledHide();
         this.hide_timeout_id = undefined;
         if (!fade) {
@@ -80,7 +101,7 @@ export default class OncoprintToolTip {
             this.$div.fadeOut();
         }
         this.shown = false;
-    };
+    }
     private cancelScheduledShow() {
         clearTimeout(this.show_timeout_id);
         this.show_timeout_id = undefined;
@@ -89,17 +110,22 @@ export default class OncoprintToolTip {
         clearTimeout(this.hide_timeout_id);
         this.hide_timeout_id = undefined;
     }
-    public showIfNotAlreadyGoingTo(wait:number|undefined, viewport_x:number, viewport_y:number, $contents:JQuery) {
+    public showIfNotAlreadyGoingTo(
+        wait: number | undefined,
+        viewport_x: number,
+        viewport_y: number,
+        $contents: JQuery
+    ) {
         if (typeof this.show_timeout_id === 'undefined') {
             this.show(wait, viewport_x, viewport_y, $contents);
         }
     }
-    public hideIfNotAlreadyGoingTo(wait?:number) {
+    public hideIfNotAlreadyGoingTo(wait?: number) {
         if (typeof this.hide_timeout_id === 'undefined') {
             this.hide(wait);
         }
     }
-    public hide(wait?:number) {
+    public hide(wait?: number) {
         this.cancelScheduledShow();
 
         if (!this.shown) {
@@ -111,12 +137,17 @@ export default class OncoprintToolTip {
             this.cancelScheduledHide();
             this.hide_timeout_id = setTimeout(function() {
                 self.doHide();
-            }, wait);
+            }, wait) as any;
         } else {
             this.doHide();
         }
     }
-    public fadeIn(wait:number|undefined, viewport_x:number, viewport_y:number, $contents:JQuery) {
+    public fadeIn(
+        wait: number | undefined,
+        viewport_x: number,
+        viewport_y: number,
+        $contents: JQuery
+    ) {
         this.show(wait, viewport_x, viewport_y, $contents, true);
     }
-}
+}