Merge pull request #266 from plantinformatics/develop

Master Release v2.10.0

README.md

@@ -345,3 +345,10 @@ Wang, S., Wong, D., Forrest, K., Allen, A., Chao, S., Huang, B. E., Maccaferri,
 Gardner, K. A., Wittern, L. M. and Mackay, I. J. (2016), *A highly recombined, high-density, eight-founder wheat MAGIC map reveals extensive segregation distortion and genomic locations of introgression segments.* Plant Biotechnol J, 14: 1406–1417. doi:10.1111/pbi.12504
 
 Wen, W., He, Z., Gao, F., Liu, J., Jin, H., Zhai, S., Xia, X. (2017). *A High-Density Consensus Map of Common Wheat Integrating Four Mapping Populations Scanned by the 90K SNP Array.* Frontiers in Plant Science, 8, 1389. http://doi.org/10.3389/fpls.2017.01389
+
+# Software / Tools Acknowledgments
+
+### Images / Media
+
+[bucketFill.png](https://www.flaticon.com/free-icon/bucket_834205?term=paint%20bucket&page=1&position=53&page=1&position=53&related_id=834205&origin=tag)
+from : Icons made by [Freepik](https://www.freepik.com) from [www.flaticon.com](https://www.flaticon.com/)

frontend/app/components/axis-tracks.js

@@ -491,6 +491,7 @@ export default InAxis.extend({
 
   queryParams: service('query-params'),
   urlOptions : alias('queryParams.urlOptions'),
+  controls : service(),
   selected : service('data/selected'),
   axisZoom: service('data/axis-zoom'),
   trait : service('data/trait'),
@@ -627,6 +628,22 @@ export default InAxis.extend({
 
   /*--------------------------------------------------------------------------*/
 
+  /** based on configureClick(), this interposes the requirement that there is no current GUI mode.
+   */
+  configureClick2() {
+    let thisAt = this;
+    return function (selection) {
+      selection.on('click', function (d, i, g) {
+        if (thisAt.controls.noGuiModeFilter()) {
+          /* clickTrack() does not yet use element this. */
+          clickTrack.apply(this, [thisAt.selected, thisAt.featureData2Feature, d]);
+        }
+      });
+    };
+  },
+
+  /*--------------------------------------------------------------------------*/
+
   /** Convert input text to an interval tree.
    * @param tableText text string, TSV, rows separated by \n and/or \r.
    * First row may contain a header with column names, indicated by leading #.
@@ -1121,7 +1138,7 @@ export default InAxis.extend({
         .attr('class', 'track')
         .each(subElements ? configureSubTrackHover : configureTrackHover);
       if (! subElements) {
-        ra.call(configureClick(thisAt.selected, thisAt.featureData2Feature));
+        ra.call(thisAt.configureClick2());
       }
       rs.merge(ra)
         .transition().duration(featureTrackTransitionTime)
@@ -1134,7 +1151,7 @@ export default InAxis.extend({
         .transition().duration(featureTrackTransitionTime)
         .attr('width', useTriangle ? ((d) => alwaysTri || showTriangleP(y, d) ? undefined : width) : width);
         if (! subElements) {
-          s.call(configureClick(thisAt.selected, thisAt.featureData2Feature));
+          s.call(thisAt.configureClick2());
         }
       }