Version 1.5.3: Remove plot method.

derpylz · Apr 1, 2022 · 9557b67 · 9557b67
1 parent ecc0ff2
commit 9557b67
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 22 deletions.
diff --git a/build/babyplots.d.ts b/build/babyplots.d.ts
@@ -200,5 +200,6 @@ export declare class Plots {
     resize(width?: number, height?: number): Plots;
     thumbnail(size: number, saveCallback: (data: string) => void): void;
     dispose(): void;
+    removePlot(index: number): Plots;
     addLabels(labelList: [[number, number, number, string, string?, number?]]): void;
 }
diff --git a/build/babyplots.js b/build/babyplots.js
diff --git a/build/babyplots.js.map b/build/babyplots.js.map
diff --git a/build/utils/Label.d.ts b/build/utils/Label.d.ts
@@ -65,6 +65,7 @@ export declare class AnnotationManager {
     addLabels(labelList: [number, number, number, string, string?, number?][]): number[];
     private _editLabelText;
     private _removeLabelByUI;
+    removeLabelsByPlot(plot: Plot): void;
     removeLabel(index: number): void;
     exportLabels(): [number, number, number, string, string, number][];
     fixLabels(): void;

diff --git a/build/utils/Label.js b/build/utils/Label.js
diff --git a/build/utils/Label.js.map b/build/utils/Label.js.map
diff --git a/build/utils/Plot.js b/build/utils/Plot.js
diff --git a/build/utils/Plot.js.map b/build/utils/Plot.js.map
diff --git a/dist/babyplots.js b/dist/babyplots.js
diff --git a/dist/babyplots.js.map b/dist/babyplots.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babyplots",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Easy interactive 3d plots.",
   "main": "build/babyplots.js",
   "scripts": {

diff --git a/src/babyplots.d.ts b/src/babyplots.d.ts
@@ -200,5 +200,6 @@ export declare class Plots {
     resize(width?: number, height?: number): Plots;
     thumbnail(size: number, saveCallback: (data: string) => void): void;
     dispose(): void;
+    removePlot(index: number): Plots;
     addLabels(labelList: [[number, number, number, string, string?, number?]]): void;
 }
diff --git a/src/babyplots.ts b/src/babyplots.ts
@@ -412,7 +412,7 @@ export class Plots {
             plots: []
         };
 
-        this.scene.onPointerDown = (function (_evt: any, pickResult: PickingInfo) {
+        this.scene.onPointerPick = (function (_evt: any, pickResult: PickingInfo) {
             // (this as Plots)._annotationManager.clearInfo();
             for (let i = 0; i < (this as Plots).plots.length; i++) {
                 let plot = (this as Plots).plots[i];
@@ -991,19 +991,6 @@ export class Plots {
         // update labels
         this._annotationManager.update();
 
-        // for (let pltIdx = 0; pltIdx < this.plots.length; pltIdx++) {
-        //     const plot = this.plots[pltIdx];
-        //     plot.update();          
-        // }
-        // if (this._mouseOverCheck) {
-        //     const pickResult = this._scene.pick(this._scene.pointerX, this._scene.pointerY);
-        //     const faceId = pickResult.faceId;
-        //     if (faceId == -1) {
-        //         return;
-        //     }
-        //     const idx = this._SPS.pickedParticles[faceId].idx;
-        //     this._mouseOverCallback(idx);
-        // }
     }
 
 
@@ -2324,6 +2311,16 @@ export class Plots {
         lblCntrl.remove();
     }
 
+    removePlot(index: number): Plots {
+        let plot = this.plots[index];
+        if (plot === undefined) return;
+        this._annotationManager.removeLabelsByPlot(plot);
+        plot.dispose();
+        this.plots.splice(index);
+        this._downloadObj["plots"].splice(index);
+        return this;
+    }
+
     /**
      * Add labels from a list of labels.
      * 

diff --git a/src/utils/Label.d.ts b/src/utils/Label.d.ts
@@ -65,6 +65,7 @@ export declare class AnnotationManager {
     addLabels(labelList: [number, number, number, string, string?, number?][]): number[];
     private _editLabelText;
     private _removeLabelByUI;
+    removeLabelsByPlot(plot: Plot): void;
     removeLabel(index: number): void;
     exportLabels(): [number, number, number, string, string, number][];
     fixLabels(): void;

diff --git a/src/utils/Label.ts b/src/utils/Label.ts
@@ -312,6 +312,7 @@ export class AnnotationManager {
         if (this._showLabels) {
             for (let i = 0; i < this.labels.length; i++) {
                 const label = this.labels[i];
+                if (label === undefined) continue;
                 label.update(this._camera, this._scene);
             }
         }
@@ -463,6 +464,16 @@ export class AnnotationManager {
         this.removeLabel(labelNum);
     }
 
+    removeLabelsByPlot(plot: Plot): void {
+        for (let i = 0; i < this.labels.length; i++) {
+            const l = this.labels[i];
+            if (l === undefined) continue;
+            if(l.plotCreated === plot) {
+                this.removeLabel(i);
+            }
+        }
+    }
+
     removeLabel(index: number): void {
         // remove label
         if(this.labels[index] === undefined) return;

diff --git a/src/utils/Plot.ts b/src/utils/Plot.ts
@@ -42,7 +42,13 @@ export abstract class Plot {
     setLooping(looping: boolean): void { }
     dispose(): void {
         if (this.mesh !== undefined) {
-
+            this.mesh.dispose()
+        }
+        if (this.meshes !== undefined) {
+            for (let i = 0; i < this.meshes.length; i++) {
+                const m = this.meshes[i];
+                m.dispose();
+            }
         }
     }
 }