From 9a50d5dfbb0c59ce734a40a156131f457fc9dd42 Mon Sep 17 00:00:00 2001 From: ejoliet Date: Wed, 16 Nov 2016 17:05:20 -0800 Subject: [PATCH 1/2] DM-7967: reverse axis for magnitude --- src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx | 2 +- src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx | 2 +- src/firefly/js/templates/lightcurve/LcViewer.jsx | 4 ++-- .../js/templates/lightcurve/PeriodogramOptionsPanel.jsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx b/src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx index b93bbef3c9..96721677ef 100644 --- a/src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx +++ b/src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx @@ -395,7 +395,7 @@ function doPhaseFolding(fields) { }, {tbl_id:PHASE_FOLDED}); if (tReq !== null) { dispatchTableSearch(tReq, {removable: false}); - let xyPlotParams = {x: {columnOrExpr: 'phase', options: 'grid'}, y: {columnOrExpr: 'w1mpro_ep', options:'grid'}}; + let xyPlotParams = {x: {columnOrExpr: 'phase', options: 'grid'}, y: {columnOrExpr: 'w1mpro_ep', options:'grid,flip'}}; loadXYPlot({chartId:PHASE_FOLDED, tblId:PHASE_FOLDED, xyPlotParams}); } } diff --git a/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx b/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx index 1a5f694617..89ec01715c 100644 --- a/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx +++ b/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx @@ -721,7 +721,7 @@ function setPFTableSuccess(hideDropDown = false) { let xyPlotParams = { userSetBoundaries: {xMax: 2}, x: {columnOrExpr: phaseCol, options: 'grid'}, - y: {columnOrExpr: flux, options: 'grid'} + y: {columnOrExpr: flux, options: 'grid,flip'} }; loadXYPlot({chartId: PHASE_FOLDED, tblId: PHASE_FOLDED, xyPlotParams}); }); diff --git a/src/firefly/js/templates/lightcurve/LcViewer.jsx b/src/firefly/js/templates/lightcurve/LcViewer.jsx index 2c08da5e4e..dcee989727 100644 --- a/src/firefly/js/templates/lightcurve/LcViewer.jsx +++ b/src/firefly/js/templates/lightcurve/LcViewer.jsx @@ -220,11 +220,11 @@ function onSearchSubmit(request) { if ( get(request, RAW_TABLE) ){ treq = TblUtil.makeFileRequest('Raw Table', request[RAW_TABLE], null, {tbl_id:RAW_TABLE}); treq.tblType='notACatalog'; - xyPlotParams = {x: {columnOrExpr: 'mjd'}, y: {columnOrExpr: 'w1mpro_ep'}}; + xyPlotParams = {x: {columnOrExpr: 'mjd'}, y: {columnOrExpr: 'w1mpro_ep', options:'grid,flip'}}; } else if ( get(request, PHASE_FOLDED) ) { treq = TblUtil.makeFileRequest('Phase Folded', request[PHASE_FOLDED], null, {tbl_id:PHASE_FOLDED}); treq.tblType='notACatalog'; - xyPlotParams = {x: {columnOrExpr: 'phase'}, y: {columnOrExpr: 'w1mpro_ep'}}; + xyPlotParams = {x: {columnOrExpr: 'phase'}, y: {columnOrExpr: 'w1mpro_ep', options:'grid,flip'}}; } else if ( get(request, PERIODOGRAM) ) { treq = TblUtil.makeFileRequest('Periodogram', request[PERIODOGRAM], null, {tbl_id:PERIODOGRAM}); treq.tblType='notACatalog'; diff --git a/src/firefly/js/templates/lightcurve/PeriodogramOptionsPanel.jsx b/src/firefly/js/templates/lightcurve/PeriodogramOptionsPanel.jsx index ac1326bdec..be4e198fff 100644 --- a/src/firefly/js/templates/lightcurve/PeriodogramOptionsPanel.jsx +++ b/src/firefly/js/templates/lightcurve/PeriodogramOptionsPanel.jsx @@ -217,7 +217,7 @@ function doPeriodFinding(request) { dispatchTableSearch(tReq, {removable: true}); let xyPlotParams = { userSetBoundaries: {yMin: 0}, - x: {columnOrExpr: 'PERIOD', options: 'grid, log'}, + x: {columnOrExpr: 'PERIOD', options: 'grid,log'}, y: {columnOrExpr: 'POWER', options: 'grid'} }; loadXYPlot({chartId:PERIODOGRAM, tblId:PERIODOGRAM, markAsDefault:true, xyPlotParams}); From 71fdb5c54b0c2e7ef3a7875112990925e61ae3c9 Mon Sep 17 00:00:00 2001 From: ejoliet Date: Fri, 18 Nov 2016 17:20:45 -0800 Subject: [PATCH 2/2] DM-7967: y-axis reversed in popup dialog too --- src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx b/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx index 89ec01715c..bea552bbe8 100644 --- a/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx +++ b/src/firefly/js/templates/lightcurve/LcPhaseFoldingPopup.jsx @@ -347,7 +347,8 @@ class PhaseFoldingChart extends Component { lineWidth: 1, tickWidth: 1, tickLength: 10, - gridLineColor: '#e9e9e9' + gridLineColor: '#e9e9e9', + reversed: true }, tooltip: showTooltip ? {enabled: true, formatter() {