fix some menu redundancy and confusion around "alt color"

igvteam · Sep 11, 2022 · 4e6cdc5 · 4e6cdc5
1 parent 40f4199
commit 4e6cdc5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/js/feature/interactionTrack.js b/js/feature/interactionTrack.js
@@ -179,10 +179,16 @@ class InteractionTrack extends TrackBase {
                 // Reset transient property drawState.  An undefined value => feature has not been drawn.
                 feature.drawState = undefined
 
-                let color = this.color || feature.color || DEFAULT_ARC_COLOR
-                if (color && this.config.useScore) {
-                    color = getAlphaColor(color, scoreShade(feature.score))
+                let color
+                if(typeof this.color === 'function') {
+                    color = this.color(feature)
+                } else {
+                    color = this.color || feature.color || DEFAULT_ARC_COLOR
+                    if (color && this.config.useScore) {
+                        color = getAlphaColor(color, scoreShade(feature.score))
+                    }
                 }
+
                 ctx.lineWidth = feature.thickness || this.thickness || 1
 
                 if (feature.chr1 === feature.chr2 || feature.chr === 'all') {
@@ -457,18 +463,10 @@ class InteractionTrack extends TrackBase {
 
     menuItemList() {
 
-        let items = [
-
-            {
-                name: "Set track color",
-                click: () => {
-                    this.trackView.presentColorPicker()
-                }
-            },
-            '<hr/>'
-        ]
+        let items = []
 
         if (this.hasValue) {
+            items.push("<hr/>")
             const lut =
                 {
                     "nested": "Nested",

diff --git a/js/feature/wigTrack.js b/js/feature/wigTrack.js
@@ -108,7 +108,9 @@ class WigTrack extends TrackBase {
 
     menuItemList() {
         let items = []
+
         if (this.flipAxis !== undefined) {
+            items.push('<hr>')
             items.push({
                 label: "Flip y-axis",
                 click: () => {

diff --git a/js/ui/menuUtils.js b/js/ui/menuUtils.js
@@ -24,7 +24,9 @@ const MenuUtils = {
             menuItems.push('<hr/>')
             menuItems.push(colorPickerMenuItem({trackView, label: "Set track color", option: "color"}))
             menuItems.push(unsetColorMenuItem({trackView, label: "Unset track color"}))
-            menuItems.push(colorPickerMenuItem({trackView, label: "Set alt color", option: "altColor"}))
+           if(trackView.track.config.type === 'wig' || trackView.track.config.type === 'annotation') {
+               menuItems.push(colorPickerMenuItem({trackView, label: "Set alt color", option: "altColor"}))
+           }
         }
 
         if (trackView.track.menuItemList) {