save before parsing is added

Author: benjaminbeer256

js/events/load_composite_button.js

@@ -19,6 +19,7 @@ $(function() {
                 $("#metadata-table").metadata_table("add_row", [id]);
                 $("#settings-table").settings_table("add_row", [id]);
             };
+            console.log(prefixes)
 
             $("#settings-table").settings_table("plot_all_composites", {xmin: xmin, xmax: xmax, ymax: ymax}, allow_shrink=true);
             $("#main-plot").main_plot("update_legend")

js/parse_composite.js

@@ -129,6 +129,7 @@ let parse_multiple_composite = function(text, prefix) {
         if (col0 === "" || col0 === "NAME") {
             // If the x domain is defined, save the composite
             if (save_comp) {
+                console.log(id)
                 composites[id] = {xmin: xmin, xmax: xmax, sense: sense, anti: anti}
             };
             save_comp = false;
@@ -142,6 +143,7 @@ let parse_multiple_composite = function(text, prefix) {
             }
         } else if (col0.startsWith(prefix)){
             id = col0.slice(prefix.length).split("_")[0];
+            console.log(id)
             save_comp = true;
             if (col0.toLowerCase().includes("sense")) {
                 sense = fields.slice(1).map(parseFloat)
@@ -160,6 +162,6 @@ let parse_multiple_composite = function(text, prefix) {
     if (save_comp) {
         composites[id] = {xmin: xmin, xmax: xmax, sense: sense, anti: anti}
     };
-
+    console.log(composites)
     return composites
 }

js/widgets/main_plot.js

@@ -171,8 +171,8 @@ $(function() {
             d3.select("#main-plot-div").on("mousemove", function(e) {
                 $("#main-plot").main_plot("move_tooltip", e)
             });
-            main_plot.on("mouseleave", function() {
-                // $("#main-plot").main_plot("hide_tooltip")
+            d3.select("#main-plot-div").on("mouseleave", function() {
+                $("#main-plot").main_plot("hide_tooltip")
             });
 
             this.enable_tooltip = true;
@@ -315,6 +315,8 @@ $(function() {
 
         plot_composite: function(xmin, xmax, sense, anti, scale, color, secondary_color, i, opacity, smoothing, bp_shift, hide, hide_sense=false, hide_anti=false, baseline=0) {
             // Set composite visibility
+            console.log("xmin:" + xmin)
+            console.log("xmax:" + xmax)
             let composite = this._elements.composites[i]
                 .classed("plotted", !hide)
                 .style("display", hide ? "none" : null),
@@ -345,6 +347,7 @@ $(function() {
                     scaled_occupancy = smoothed_occupancy.filter((_, j) => new_xdomain[j] >= this.xmin && new_xdomain[j] <= this.xmax)
                         .map(d => ((value = d * scale + baseline) > 0)? value: 0);
 
+                console.log(truncated_xdomain)
                 // Set fill color
                 composite.select(".composite-gradient-top")
                     .selectAll("stop")
@@ -737,8 +740,10 @@ $(function() {
             if (color_trace) {
                 this._elements.composite_group.selectAll(".composite .color-line-top")
                     .style("display", null);
-                this._elements.composite_group.selectAll(".composite .color-line-bottom")
-                    .style("display", null);
+                if (!this.combined){
+                    this._elements.composite_group.selectAll(".composite .color-line-bottom")
+                        .style("display", null);
+                    }
                 this._elements.composite_group.selectAll(".composite .white-line")
                     .style("display", "none");
                 this._elements.composite_group.selectAll(".composite .black-line")
@@ -820,12 +825,13 @@ $(function() {
                         .style("left",  ev.clientX - (w - 80) / 1.4)
                 } else {
                     this._elements.tooltip.style("display", "none")
+                    d3.selectAll("#composite-plot-tooltip").remove();
                 }
             }
         },
 
         hide_tooltip: function() {
-            this._elements.tooltip.style("display", "none")
+            d3.selectAll("#composite-plot-tooltip").remove();
         },
 
         download_as_svg: function() {

python/__pycache__/plot.cpython-39.pyc

@@ -17,13 +17,23 @@ def __str__(self):
         return "Sense: " + str(self.sense) + "\nAnti: " + str(self.anti) + "\nXMin: " + str(self.xmin) + "\nXMax: " + str(self.xmax) + "\nID:" + str(self.id)
 
 class CompositeGroup:
-    def __init__(self):
+    def __init__(self, scale=1, color=None, secondary_color=None, i=None, opacity=None, smoothing=None, bp_shift=None, hide_sense=False, hide_anti=False, baseline=0, name=None):
         self.xmin = 0
         self.xmax = 0
         self.sense = []
         self.anti = []
+        self.scale = scale
+        self.color = color
+        self.secondary_color = secondary_color if secondary_color is not None else color
+        self.opacity = opacity
+        self.smoothing = smoothing
+        self.bp_shift = bp_shift
+        self.hide_anti = hide_anti
+        self.baseline = baseline
+        self.hide_sense = hide_sense
         self.individual_composites = {}
         self.files_loaded = len(self.individual_composites)
+        self.name = name
 
     def loadComposite(self,composite: Composite):
         # If no files, initialize sense and anti arrays; otherwise, pad sense and anti arrays to new xdomain