Skip to content

DM-9550: #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2017
Merged

DM-9550: #314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions src/firefly/js/ui/FitsDownloadDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
* propType: define all the property variable for the component
* this.plot, this.plotSate are the class global variables
*
* Work History
*
* [Feb-22-2017 LZ]
* DM-9500
* DM-8963
*/
import React from 'react';
import {dispatchShowDialog} from '../core/ComponentCntlr.js';
Expand Down Expand Up @@ -37,7 +42,7 @@ function getDialogBuilder() {
return () => {
if (!popup) {
const popup = (
<PopupPanel title={'Fits Download Dialog'}>
<PopupPanel title={'FITS Download Dialog'}>
<FitsDownloadDialog groupKey={'FITS_DOWNLOAD_FORM'}/>
</PopupPanel>
);
Expand Down Expand Up @@ -85,7 +90,8 @@ function getInitialPlotState() {
colors[i] = 'Blue';
break;
default:
} break;
break;
}

}

Expand Down Expand Up @@ -175,6 +181,13 @@ function renderOperationOption(hasOperation) {

function renderThreeBand(hasThreeColorBand, colors) {

const fieldKey = FieldGroupUtils.getGroupFields('FITS_DOWNLOAD_FORM');

if (fieldKey && (fieldKey.fileType.value==='png' || fieldKey.fileType.value==='reg') ){
return <br/>;
}


var rightColumn={display: 'inline-block', paddingLeft:18};
var leftColumn;

Expand All @@ -194,7 +207,7 @@ function renderThreeBand(hasThreeColorBand, colors) {

var optionArray=[];
for (var i=0; i<colors.length; i++){
optionArray[i]={label: colors[i], value: colors[i]+'Radio'};
optionArray[i]={label: colors[i], value: colors[i]};
}

return (
Expand Down Expand Up @@ -231,9 +244,9 @@ function FitsDownloadDialogForm() {
var renderThreeBandButtons = renderThreeBand(hasThreeColorBand, colors);//true, ['Green','Red', 'Blue']);


var leftColumn = { display: 'inline-block', paddingLeft:75, verticalAlign:'middle', paddingBottom:30};
var leftColumn = { display: 'inline-block', paddingLeft:63, verticalAlign:'middle', paddingBottom:30};

var rightColumn = {display: 'inline-block', paddingLeft:18};
var rightColumn = {display: 'inline-block', paddingLeft:14};

var dialogStyle = { minWidth : 300, minHeight: 100 , padding:'15px 5px 5px 5px'};
return (
Expand All @@ -245,7 +258,7 @@ function FitsDownloadDialogForm() {
<RadioGroupInputField
initialState={{
tooltip: 'Please select an option',
value : 'fits'
value : 'FITS'
//move the label as a InputFieldLabel
}}
options={ [
Expand All @@ -255,7 +268,9 @@ function FitsDownloadDialogForm() {
]}
alignment={'vertical'}
fieldKey='fileType'

/>

</div>


Expand Down Expand Up @@ -326,6 +341,7 @@ function resultsSuccess(request, plot) {
}
if (key === 'threeBandColor') {
bandSelect = value;

}
if (key === 'operationOption') {
whichOp = value;
Expand All @@ -334,7 +350,7 @@ function resultsSuccess(request, plot) {

var band = Band.NO_BAND;
if (bandSelect) {
band = Band[bandSelect];
band = Band[bandSelect.toUpperCase()];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since Band is an Enum object, the right way to do this line is:

band= Band.get(bandSelect)

That converts the string (case insensitive) into the enum

}


Expand Down