DM-7986: fix circles connecting & add way to reorder image tabs

robyww · robyww · commit 692b94af416c · 2016-10-14T09:25:46.000-07:00
diff --git a/src/firefly/html/firefly.html b/src/firefly/html/firefly.html
@@ -20,7 +20,8 @@
                     //{label:'Help', action:'app_data.helpLoad', type:'COMMAND'},
                     ]
             },
-            MenuItemKeys: {maskOverlay:true}
+            MenuItemKeys: {maskOverlay:true},
+            imageTabs: [ 'fileUpload', 'url', '2mass', 'wise', 'sdss', 'msx', 'dss', 'iras' ]
         };
     </script>
     <script  type="text/javascript" src="firefly_loader.js"></script>
diff --git a/src/firefly/js/visualize/draw/DrawUtil.js b/src/firefly/js/visualize/draw/DrawUtil.js
@@ -497,9 +497,13 @@ function drawSymbol(ctx, x, y, drawParams, renderOptions, onlyAddToPath) {
  * @param onlyAddToPath
  */
 function drawCircle(ctx, x, y, color, lineWidth, size, renderOptions= null, onlyAddToPath= false) {
-    if (!onlyAddToPath) beginPath(ctx,color,lineWidth, renderOptions);
     var radius= size+2;
-
+    if (onlyAddToPath) {
+        ctx.moveTo(x+radius,y);
+    }
+    else {
+        beginPath(ctx, color, lineWidth, renderOptions);
+    }
     ctx.arc(x, y, radius, 0, 2 * Math.PI);
     if (!onlyAddToPath) stroke(ctx);
 }
diff --git a/src/firefly/js/visualize/ui/ImageSelectPanel.jsx b/src/firefly/js/visualize/ui/ImageSelectPanel.jsx
@@ -3,6 +3,7 @@
  */
 
 import React, {Component, PropTypes} from 'react';
+import {get} from 'lodash';
 import {flux} from '../../Firefly.js';
 import {visRoot } from '../ImagePlotCntlr.js';
 import {NewPlotMode, getAViewFromMultiView, findViewerWithItemId,
@@ -26,7 +27,6 @@ import {resultSuccess, resultFail} from './ImageSelectPanelResult.js';
 import {getActivePlotView, primePlot} from '../PlotViewUtil.js';
 import {FieldGroupCollapsible, CollapseBorder, CollapseHeaderCorner} from '../../ui/panel/CollapsiblePanel.jsx';
 import {ImageSelPanelChangeOneColor, ImageSelPanelChange} from './ImageSelectPanelReducer.js';
-import {get} from 'lodash';
 
 import './ImageSelectPanel.css';
 
@@ -56,7 +56,23 @@ export const keyMap = {
     'plotmode':    'SELECTIMAGEPANEL_targetplot'
 };
 
-export const [IRAS, TWOMASS, WISE, MSX, DSS, SDSS, FITS, URL, NONE] = [0, 1, 2, 3, 4, 5, 6, 7, 8];
+const findCatId = (ary, id) => get(ary.find( (p) => p.id===id), 'CatalogId',-1);
+
+
+export const IRAS= findCatId(panelCatalogs,'iras');
+export const TWOMASS= findCatId(panelCatalogs,'2mass');
+export const WISE= findCatId(panelCatalogs,'wise');
+export const MSX= findCatId(panelCatalogs,'msx');
+export const DSS= findCatId(panelCatalogs,'dss');
+export const SDSS= findCatId(panelCatalogs,'sdss');
+export const FITS= findCatId(panelCatalogs,'fileUpload');
+export const URL= findCatId(panelCatalogs,'url');
+export const NONE= -1;
+
+
+const defCurrCatalogId= [panelCatalogs[0].CatalogId, panelCatalogs[0].CatalogId, panelCatalogs[0].CatalogId];
+
+
 export const rgb = ['red', 'green', 'blue'];
 
 export function completeButtonKey( isThreeColor = false ) {
@@ -68,7 +84,8 @@ export function completeButtonKey( isThreeColor = false ) {
  *
  */
 
-export function computeCurrentCatalogId( fields, colorFields, catalogId = [IRAS, IRAS, IRAS] ) {
+
+export function computeCurrentCatalogId( fields, colorFields, catalogId = defCurrCatalogId ) {
 
     const keytab = keyMap['catalogtab'];
     var   newId = catalogId.slice();
@@ -196,7 +213,7 @@ export class ImageSelection extends Component {
          this.allfields = getAllGroupFields(panelKey,...rgbFieldGroup);
 
          this.state = {
-             initCatalogId: props.catalogId ? props.catalogId : [IRAS, IRAS, IRAS],
+             initCatalogId: props.catalogId ? props.catalogId : defCurrCatalogId,
              fields: this.allfields[panelKey],
              [rgbFieldGroup[RED]]: this.allfields[rgbFieldGroup[RED]],
              [rgbFieldGroup[GREEN]]: this.allfields[rgbFieldGroup[GREEN]],
@@ -572,8 +589,9 @@ TargetPanelSetView.defaultProps={
 /**
  * component inside each catalog tab at middle row
  *
- * @param {Object} catalog
- * @param {Object} fields
+ * @param {Object} p
+ * @param {Object} p.catalog
+ * @param {Object} p.fields
  * @returns {XML}
  * @constructor
  */
diff --git a/src/firefly/js/visualize/ui/ImageSelectPanelProp.js b/src/firefly/js/visualize/ui/ImageSelectPanelProp.js
@@ -1,8 +1,12 @@
 /**
  * Created by cwang on 3/10/16.
  */
-export const panelCatalogs = [
+
+import {get} from 'lodash';
+
+export const initPanelCatalogs = [
     {
+        'id':'iras',
         'Title':'IRAS',
         'Symbol': 'IRAS',
         'CatalogId': 0,
@@ -24,6 +28,7 @@ export const panelCatalogs = [
         'size': 5
     },
     {
+        'id':'2mass',
         'Title':'2MASS',
         'Symbol': 'TWOMASS',
         'CatalogId': 1,
@@ -40,6 +45,7 @@ export const panelCatalogs = [
         'size':.139
     },
     {
+        'id': 'wise',
         'Title': 'WISE',
         'Symbol': 'WISE',
         'CatalogId': 2,
@@ -64,6 +70,7 @@ export const panelCatalogs = [
         'size':.15
     },
     {
+        'id': 'msx',
         'Title': 'MSX',
         'Symbol': 'MSX',
         'CatalogId': 3,
@@ -82,6 +89,7 @@ export const panelCatalogs = [
         'size': 1.0
     },
     {
+        'id': 'dss',
         'Title': 'DSS',
         'Symbol': 'DSS',
         'CatalogId': 4,
@@ -105,6 +113,7 @@ export const panelCatalogs = [
         'size':.25
     },
     {
+        'id': 'sdss',
         'Title': 'SDSS',
         'Symbol': 'SDSS',
         'CatalogId': 5,
@@ -124,6 +133,7 @@ export const panelCatalogs = [
         'size':.25
     },
     {
+        'id': 'fileUpload',
         'Title': 'FITS File',
         'Symbol': 'FITS',
         'CatalogId': 6,
@@ -151,6 +161,7 @@ export const panelCatalogs = [
         }
     },
     {
+        'id': 'url',
         'Title': 'URL',
         'Symbol': 'URL',
         'CatalogId': 7,
@@ -176,6 +187,28 @@ export const panelCatalogs = [
     }
 ];
 
+
+const defaultOrder= [
+    'iras',
+    '2mass',
+    'wise',
+    'msx',
+    'dss',
+    'sdss',
+    'fileUpload',
+    'url'
+];
+
+const order= get(window.firefly, 'imageTabs', defaultOrder);
+
+
+export const panelCatalogs = order
+    .map( (id) => initPanelCatalogs.find( (p) => p.id===id))
+    .filter( (e) => e)
+    .map ( (e,idx) => Object.assign({},e,{CatalogId:idx}));
+
+
+
 /*
   blank
  {
diff --git a/src/firefly/js/visualize/ui/ImageSelectPanelReducer.js b/src/firefly/js/visualize/ui/ImageSelectPanelReducer.js
@@ -9,7 +9,7 @@ import FieldGroupCntlr from '../../fieldGroup/FieldGroupCntlr.js';
 import {keyMap, computeLabelWidth, rgbFieldGroup, isTargetNeeded,
         IRAS, TWOMASS, WISE, MSX, DSS, SDSS, FITS, URL, NONE} from './ImageSelectPanel.jsx';
 import {sizeFromDeg} from '../../ui/SizeInputField.jsx';
-import {get} from 'lodash';
+import {get, isUndefined} from 'lodash';
 
 // get unit (string), min (float) and max (float) from the data file
 var getRangeItem = (crtCatalogId, rangeItem) => {
@@ -34,6 +34,18 @@ var getSize = (crtCatalogId) => {
     }
 };
 
+
+
+function getTypeData(keyMapId, key, id,value) {
+    return {
+        fieldKey: keyMap[keyMapId],
+        label: get(panelCatalogs[id],[key,'Title'],'Unused'),
+        value: isUndefined(value) ? get(panelCatalogs[id],[key,'Default'],'') : value,
+        labelWidth: computeLabelWidth(get(panelCatalogs[id],[key,'Title'],'Unused'))
+    };
+}
+
+
 // tab fields initialization
 function initTabFields(crtCatalogId) {
     return (
@@ -42,60 +54,15 @@ function initTabFields(crtCatalogId) {
             fieldKey: keyMap['catalogtab'],
             value: panelCatalogs[crtCatalogId].CatalogId.toString()
         },
-        [keyMap['irastypes']]: {
-            fieldKey: keyMap['irastypes'],
-            label: panelCatalogs[IRAS].types.Title,
-            value: panelCatalogs[IRAS].types.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[IRAS].types.Title)
-        },
-        [keyMap['twomasstypes']]: {
-            fieldKey: keyMap['twomasstypes'],
-            label: panelCatalogs[TWOMASS].types.Title,
-            value: panelCatalogs[TWOMASS].types.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[TWOMASS].types.Title)
-        },
-        [keyMap['wisetypes']]: {
-            fieldKey: keyMap['wisetypes'],
-            label: panelCatalogs[WISE].types.Title,
-            value: panelCatalogs[WISE].types.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[WISE].types.Title)
-        },
-        [keyMap['wisebands']]: {
-            fieldKey: keyMap['wisebands'],
-            label: panelCatalogs[WISE].bands.Title,
-            value: panelCatalogs[WISE].bands.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[WISE].bands.Title)
-        },
-        [keyMap['msxtypes']]: {
-            fieldKey: keyMap['msxtypes'],
-            label: panelCatalogs[MSX].types.Title,
-            value: panelCatalogs[MSX].types.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[MSX].types.Title)
-        },
-        [keyMap['dsstypes']]: {
-            fieldKey: keyMap['dsstypes'],
-            label: panelCatalogs[DSS].types.Title,
-            value: panelCatalogs[DSS].types.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[DSS].types.Title)
-        },
-        [keyMap['sdsstypes']]: {
-            fieldKey: keyMap['sdsstypes'],
-            label: panelCatalogs[SDSS].types.Title,
-            value: panelCatalogs[SDSS].types.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[SDSS].types.Title)
-        },
-        [keyMap['fitslist']]: {
-            fieldKey: keyMap['fitslist'],
-            label: panelCatalogs[FITS].list.Title,
-            value: panelCatalogs[FITS].list.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[FITS].list.Title)
-        },
-        [keyMap['fitsextinput']]: {
-            fieldKey: keyMap['fitsextinput'],
-            label: panelCatalogs[FITS].extinput.Title,
-            value: '0',
-            labelWidth: computeLabelWidth(panelCatalogs[FITS].extinput.Title)
-        },
+        [keyMap['irastypes']]: getTypeData('irastypes', 'types', IRAS),
+        [keyMap['twomasstypes']]: getTypeData('twomasstypes', 'types', TWOMASS),
+        [keyMap['wisetypes']]: getTypeData('wisetypes', 'types', WISE),
+        [keyMap['wisebands']]: getTypeData('wisebands', 'bands', WISE),
+        [keyMap['msxtypes']]: getTypeData('msxtypes', 'types', MSX),
+        [keyMap['dsstypes']]: getTypeData('dsstypes', 'types', DSS),
+        [keyMap['sdsstypes']]: getTypeData('sdsstypes', 'types', SDSS),
+        [keyMap['fitslist']]: getTypeData('fitslist', 'list', FITS),
+        [keyMap['fitsextinput']]: getTypeData('fitsextinput', 'extinput', FITS, '0'),
         /*
         [keyMap['blankinput']]: {
             fieldKey: keyMap['blankinput'],
@@ -107,26 +74,11 @@ function initTabFields(crtCatalogId) {
             labelWidth: computeLabelWidth(panelCatalogs[BLANK].input.Title)
         },
         */
-        [keyMap['urlinput']]: {
-            fieldKey: keyMap['urlinput'],
-            label: panelCatalogs[URL].input.Title,
-            validator: Validate.validateUrl.bind(null, 'a url field'),
-            value: '',
-            labelWidth: computeLabelWidth(panelCatalogs[URL].input.Title)
-        },
-        [keyMap['urllist']]: {
-            fieldKey: keyMap['urllist'],
-            label: panelCatalogs[URL].list.Title,
-            value: panelCatalogs[URL].list.Default,
-            labelWidth: computeLabelWidth(panelCatalogs[URL].list.Title)
-
-        },
-        [keyMap['urlextinput']]: {
-            fieldKey: keyMap['urlextinput'],
-            label: panelCatalogs[URL].extinput.Title,
-            value: '0',
-            labelWidth: computeLabelWidth(panelCatalogs[URL].extinput.Title)
-        }
+        [keyMap['urlinput']]: Object.assign(
+                        getTypeData('urlinput', 'input', URL,''),
+                        {validator: Validate.validateUrl.bind(null, 'a url field')}),
+        [keyMap['urllist']]: getTypeData('urllist', 'list', FITS),
+        [keyMap['urlextinput']]: getTypeData('urlextinput', 'extinput', URL, '0'),
     });
 }
 
@@ -188,7 +140,7 @@ var initTargetSize = (crtCatalogId) => {
 // reducer for the child field group (fieldgrouptabs for r, g, b)
 export var ImageSelPanelChangeOneColor = (inFields, action) => {
     if (!inFields) {
-        return initTabFields(IRAS);
+        return initTabFields(panelCatalogs[0].CatalogId);
     } else {
         return inFields;
     }
