Skip to content

DM-9467: changed labels accordingly to the reviewers feedback #320

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 28, 2017
Merged

DM-9467: changed labels accordingly to the reviewers feedback #320

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions src/firefly/js/templates/lightcurve/DefaultMissionOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,18 @@ export const defaultOptionsReducer = (missionEntries, generalEntries) => {
// cutoutsize: image cutout size
const defValues = {
[LC.META_TIME_CNAME]: Object.assign(getTypeData(LC.META_TIME_CNAME, '',
'time column name',
'Time column name',
'Time Column:', labelWidth),
{validator: null}),
[LC.META_FLUX_CNAME]: Object.assign(getTypeData(LC.META_FLUX_CNAME, '',
'flux column name',
'Flux Column:', labelWidth),
'Value column name',
'Value Column:', labelWidth),
{validator: null}),
[LC.META_TIME_NAMES]: Object.assign(getTypeData(LC.META_TIME_NAMES, '',
'time column suggestion'),
'Value column suggestion'),
{validator: null}),
[LC.META_FLUX_NAMES]: Object.assign(getTypeData(LC.META_FLUX_NAMES, '',
'flux column suggestion'),
'Value column suggestion'),
{validator: null}),
['cutoutSize']: Object.assign(getTypeData('cutoutSize', '',
'image cutout size',
Expand Down Expand Up @@ -217,7 +217,7 @@ export function defaultRawTableRequest(converter, source) {
META_INFO: {[LC.META_MISSION]: mission, timeCName},
pageSize: LC.TABLE_PAGESIZE
};
return makeFileRequest('Raw Table', source, null, options);
return makeFileRequest('Input Data', source, null, options);

}

Expand Down
4 changes: 2 additions & 2 deletions src/firefly/js/templates/lightcurve/LcImageToolbarView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ export function LcImageToolbarView({activePlotId, viewerId, viewerPlotIds, layou
[SORT_DESC]:'descending'};

if (sInfo.direction === UNSORTED) return '';
return `Sortable columns: ${sInfo.sortColumns.join(',')}; `+
`Sort order: ${orderInfo[sInfo.direction]}`;
return `Sorted by column: ${sInfo.sortColumns.join(',')} `+
` ${orderInfo[sInfo.direction]}`;
};

return (
Expand Down
2 changes: 1 addition & 1 deletion src/firefly/js/templates/lightcurve/LcManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const LC = {
RAW_TABLE: 'raw_table', // raw table id
PHASE_FOLDED: 'phase_folded', // phase folded table id
PERIODOGRAM_TABLE: 'periodogram',// periodogram table id
PEAK_TABLE: 'peak_table', // peak table id
PEAK_TABLE: 'peaks_table', // peak table id
PERIOD_CNAME: 'Period', // period column
POWER_CNAME: 'Power', // power column
PEAK_CNAME: 'Peak', // peak column
Expand Down
10 changes: 5 additions & 5 deletions src/firefly/js/templates/lightcurve/LcPeriod.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const PanelResizableStyle = {
const panelSpace = PanelResizableStyle.width/5;
const fKeyDef = {
time: {fkey: 'time', label: 'Time Column'},
flux: {fkey: 'flux', label: 'Flux Column'},
flux: {fkey: 'flux', label: 'Value Column'},
min: {fkey: 'periodMin', label: 'Period Min (day)'},
max: {fkey: 'periodMax', label: 'Period Max (day)'},
tz: {fkey: 'tzero', label: 'Zero Point Time'},
Expand All @@ -74,10 +74,10 @@ const DEC_PHASE = 3; // decimal digit

const defValues= {
[fKeyDef.time.fkey]: Object.assign(getTypeData(fKeyDef.time.fkey, '',
'time column name',
'Time column name',
`${fKeyDef.time.label}:`, labelWidth), {validator: null}),
[fKeyDef.flux.fkey]: Object.assign(getTypeData(fKeyDef.flux.fkey, '',
'flux column name', `${fKeyDef.flux.label}:`, labelWidth), {validator: null}),
'Value column name', `${fKeyDef.flux.label}:`, labelWidth), {validator: null}),
[fKeyDef.tz.fkey]: Object.assign(getTypeData(fKeyDef.tz.fkey, '', 'zero time', `${fKeyDef.tz.label}:`, labelWidth),
{validator: null}),
[fKeyDef.tzmax.fkey]: Object.assign(getTypeData(fKeyDef.tzmax.fkey, '', 'maximum for zero time'),
Expand Down Expand Up @@ -319,7 +319,7 @@ class PhaseFoldingChart extends Component {
},
title: {
fontSize: '16px',
text: period ? `period=${period}(day)`:'period='
text: period ? `period=${period} day`:'period='
},
xAxis: {
min: minPhase - Margin,
Expand All @@ -329,7 +329,7 @@ class PhaseFoldingChart extends Component {
gridLineColor: '#e9e9e9'
},
yAxis: {
title: {text: `${flux}(mag)`},
title: {text: `${flux} (mag)`},
lineWidth: 1,
tickWidth: 1,
tickLength: 10,
Expand Down
9 changes: 4 additions & 5 deletions src/firefly/js/templates/lightcurve/LcPeriodogram.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {TablesContainer} from '../../tables/ui/TablesContainer.jsx';
import {ChartsContainer} from '../../charts/ui/ChartsContainer.jsx';
import CompleteButton from '../../ui/CompleteButton.jsx';
import {loadXYPlot} from '../../charts/dataTypes/XYColsCDT.js';
import {dispatchChartAdd} from '../../charts/ChartsCntlr.js';
import {LO_VIEW, getLayouInfo} from '../../core/LayoutCntlr.js';
import {dispatchShowDialog, dispatchHideDialog, isDialogVisible} from '../../core/ComponentCntlr.js';
import DialogRootContainer from '../../ui/DialogRootContainer.jsx';
Expand Down Expand Up @@ -48,7 +47,7 @@ const stepOptions = [

// parameter list in the popup dialog
const pKeyDef = { time: {fkey: 'time', label: 'Time Column'},
flux: {fkey: 'flux', label: 'Flux Column'},
flux: {fkey: 'flux', label: 'Value Column'},
min: {fkey: 'periodMin', label: 'Period Min (day)'},
max: {fkey: 'periodMax', label: 'Period Max (day)'},
algor: {fkey: 'periodAlgor', label: 'Periodogram Type'},
Expand Down Expand Up @@ -156,7 +155,7 @@ function PeriodogramButton(props) {
display: 'flex', justifyContent: 'center', alignItems: 'center'}}>
<button type='button' style={{maxWidth: '50%'}}
className='button std'
onClick={startPeriodogramPopup(groupKey)}>Find Periodogram</button>
onClick={startPeriodogramPopup(groupKey)}>Calculate Periodogram</button>
<div style={{marginLeft:10}}>
<HelpIcon helpId={'findpTSV.pgram'}/>
</div>
Expand All @@ -172,7 +171,7 @@ PeriodogramButton.propTypes = {
function ChangePeriodogram() {
return (
<button type='button' className='button std hl'
onClick={startPeriodogramPopup(LC.FG_PERIODOGRAM_FINDER)}>Change Periodogram
onClick={startPeriodogramPopup(LC.FG_PERIODOGRAM_FINDER)}>Recalculate Periodogram
</button>
);
}
Expand Down Expand Up @@ -517,7 +516,7 @@ function periodogramSuccess(popupId, hideDropDown = false) {
const ssize = get(request, [pKeyDef.stepsize.fkey]);
const peak = get(request, [pKeyDef.peaks.fkey]);

var tReq2 = makeTblRequest('LightCurveProcessor', LC.PEAK_TABLE, {
var tReq2 = makeTblRequest('LightCurveProcessor', LC.PEAK_TABLE.replace('_',' '), {
original_table: srcFile,
x: get(defPeriod, [pKeyDef.time.fkey, 'value']) || get(layoutInfo, [LC.MISSION_DATA, LC.META_TIME_CNAME]),
y: get(defPeriod, [pKeyDef.flux.fkey, 'value']) || get(layoutInfo, [LC.MISSION_DATA, LC.META_FLUX_CNAME]),
Expand Down
2 changes: 1 addition & 1 deletion src/firefly/js/templates/lightcurve/LcPhaseTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function addPhaseToTable(tbl, timeName, tzero, period) {
if (tIdx < 0) return null;

const tbl_id = LC.PHASE_FOLDED;
const title = 'Phase Folded';
const title = 'Phase Folded Data';

var tPF = {tableData: cloneDeep(tbl.tableData),
tableMeta: cloneDeep(tbl.tableMeta),
Expand Down
3 changes: 2 additions & 1 deletion src/firefly/js/templates/lightcurve/LcResult.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ const StandardView = ({visToolbar, title, searchDesc, imagePlot, xyPlot, tables,
<DownloadButton>
<DownloadOptionPanel
cutoutSize = {cutoutSize}
title = {'Image Download Option'}
dlParams = {{
MaxBundleSize: 200*1024*1024, // set it to 200mb to make it easier to test multi-parts download. each wise image is ~64mb
FilePrefix: `${mission}_Files`,
Expand Down Expand Up @@ -208,7 +209,7 @@ class SettingBox extends Component {
groupKey={groupKey}
onSuccess={setViewerSuccess(periodState)}
onFail={setViewerFail()}
text={'Period Finding'}
text={'Find Period'}
/>
</div>
<div style={{display: 'flex', flexDirection: 'row-reverse'}}>
Expand Down
5 changes: 3 additions & 2 deletions src/firefly/js/templates/lightcurve/LcViewer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,15 @@ export function UploadPanel(props) {
groupKey={vFileKey}
onSubmit={(request) => onSearchSubmit(request)}
onCancel={dispatchHideDropDown}
submitText={'Upload'}
help_id={'loadingTSV'}>
<FieldGroup groupKey={vFileKey} validatorFunc={null} keepState={true}>
<FileUpload
wrapperStyle = {wrapperStyle}
fieldKey = 'rawTblSource'
initialState= {{
tooltip: 'Select a Light Curves Table file to upload',
label: 'Raw Light Curves Table:'
tooltip: 'Select a Time Series Table file to upload',
label: 'Time Series Table:'
}}
/>
<ListBoxInputField fieldKey='mission'
Expand Down
10 changes: 6 additions & 4 deletions src/firefly/js/ui/DownloadDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ DownloadOptionPanel.propTypes = {
tbl_id: PropTypes.string,
cutoutSize: PropTypes.string,
help_id: PropTypes.string,
title: PropTypes.string,
mask: PropTypes.bool,
style: PropTypes.object,
dlParams: PropTypes.shape({
Expand All @@ -276,16 +277,17 @@ DownloadOptionPanel.defaultProps= {
* @param {boolean} [show=true] show or hide this dialog
*/
function showDownloadDialog(panel, show=true) {
let ttl = panel.props.title || DOWNLOAD_DIALOG_ID;
if (show) {
const content= (
<PopupPanel title={DOWNLOAD_DIALOG_ID} >
<PopupPanel title={ttl} >
{panel}
</PopupPanel>
);
DialogRootContainer.defineDialog(DOWNLOAD_DIALOG_ID, content);
dispatchShowDialog(DOWNLOAD_DIALOG_ID);
DialogRootContainer.defineDialog(ttl, content);
dispatchShowDialog(ttl);
} else {
dispatchHideDialog(DOWNLOAD_DIALOG_ID);
dispatchHideDialog(ttl);
}
}