Skip to content

DM-7964: get period from table/plot #237

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 2 commits into from
Nov 22, 2016
Merged

DM-7964: get period from table/plot #237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130f442
DM-7964: add saga to listen for user click in peak/periodogram plot/t…
ejoliet Nov 19, 2016
b38bc13
DM-7964: simpler - no need for array comparison for now
ejoliet Nov 22, 2016
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
51 changes: 43 additions & 8 deletions src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,23 @@ import {SuggestBoxInputField} from '../../ui/SuggestBoxInputField.jsx';
import Histogram from '../../charts/ui/Histogram.jsx';
import CompleteButton from '../../ui/CompleteButton.jsx';
import {FieldGroup} from '../../ui/FieldGroup.jsx';
import {dispatchMultiValueChange, dispatchRestoreDefaults} from '../../fieldGroup/FieldGroupCntlr.js';
import {dispatchValueChange, dispatchRestoreDefaults} from '../../fieldGroup/FieldGroupCntlr.js';
import DialogRootContainer from '../../ui/DialogRootContainer.jsx';
import {PopupPanel} from '../../ui/PopupPanel.jsx';
import FieldGroupUtils, {revalidateFields} from '../../fieldGroup/FieldGroupUtils';
import {makeTblRequest,getTblById} from '../../tables/TableUtil.js';
import {makeTblRequest,getTblById,getCellValue} from '../../tables/TableUtil.js';

import {CollapsiblePanel} from '../../ui/panel/CollapsiblePanel.jsx';
import {Tabs, Tab,FieldGroupTabs} from '../../ui/panel/TabPanel.jsx';
import {dispatchShowDialog} from '../../core/ComponentCntlr.js';
import {dispatchTableSearch} from '../../tables/TablesCntlr.js';
import {dispatchTableSearch, TABLE_HIGHLIGHT} from '../../tables/TablesCntlr.js';

import {loadXYPlot} from '../../charts/dataTypes/XYColsCDT.js';
import {RAW_TABLE, PHASE_FOLDED} from '../../templates/lightcurve/LcManager.js';
import {RAW_TABLE, PHASE_FOLDED, PERIODOGRAM, PEAK_TABLE} from '../../templates/lightcurve/LcManager.js';
import {showPhaseFoldingPopup} from './LcPhaseFoldingPopup.jsx';

import {isUndefined, get,set,isNil} from 'lodash';
import {take} from 'redux-saga/effects';
import './LCPanels.css';

const grpkey = 'LC_FORM_Panel';
Expand Down Expand Up @@ -135,7 +137,7 @@ var LcPhaseFoldingDialog = React.createClass({
return (
<div style={{padding:'5px', minWidth: 480}}>
<div>
<Tabs componentKey='LCInputTabs' defaultSelected={0} useFlex={true}>
<Tabs componentKey='LCInputTabs' defaultSelected={0} keepState={true} useFlex={true}>
<Tab name='Phase Folding'>
<LcPhaseFoldingForm />
</Tab>
Expand Down Expand Up @@ -225,7 +227,6 @@ export function LcPFOptionsPanel ({fields}) {

<br/>
<ValidationField fieldKey='flux'
forceReinit={true}
initialState= {{
fieldKey: 'flux',
value: '2.0',
Expand All @@ -238,7 +239,6 @@ export function LcPFOptionsPanel ({fields}) {
<br/>

<ValidationField fieldKey='fluxerror'
forceReinit={true}
initialState= {{
fieldKey: 'fluxerror',
value: '0.02',
Expand All @@ -250,7 +250,6 @@ export function LcPFOptionsPanel ({fields}) {
<br/>

<ValidationField fieldKey='period'
forceReinit={true}
initialState= {{
fieldKey: 'period',
value: '1.0',
Expand Down Expand Up @@ -408,6 +407,42 @@ function makeField1(hide) {
return hide ? hidden : f1;
}

export function* listenerPanel() {

while (true) {
const action = yield take([
TABLE_HIGHLIGHT
]);

switch (action.type) {
case TABLE_HIGHLIGHT:
handleTableHighlight(action);
break;
}
}
}

function handleTableHighlight(action) {
const {tbl_id} = action.payload;
const per = getPeriodFromTable(tbl_id);
if (per) {
dispatchValueChange({fieldKey: 'period', groupKey: grpkey, value: per});
}

}
//export default LcPhaseFoldingForm;

/**
* gets the period from either peak or periodogram table, these tables doesn't necesary have a period column and same name
* @param {string} tbl_id
* @returns {string} period value
*/
function getPeriodFromTable(tbl_id) {
const tableModel = getTblById(tbl_id);
if (!tableModel || isNil(tableModel.highlightedRow)) return;
if ([PERIODOGRAM].includes(tbl_id)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a bit confusing, why not tbl_id===PERIODOGRAM? Or you think we'll be adding more elements to this array in future?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right, that can be simplified. Thanks!

return getCellValue(tableModel, tableModel.highlightedRow, 'PERIOD');
} else if ([PEAK_TABLE].includes(tbl_id)) {
return getCellValue(tableModel, tableModel.highlightedRow, 'Period');
}
}
2 changes: 2 additions & 0 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 @@ -11,6 +11,7 @@ import {flux, firefly} from '../../Firefly.js';
import {getMenu, isAppReady, dispatchSetMenu, dispatchOnAppReady} from '../../core/AppDataCntlr.js';
import {LO_VIEW, getLayouInfo, SHOW_DROPDOWN} from '../../core/LayoutCntlr.js';
import {lcManager, PERIODOGRAM, PHASE_FOLDED, RAW_TABLE, PEAK_TABLE} from './LcManager.js';
import {listenerPanel} from './LcPhaseFoldingPanel.jsx';
import {LcResult} from './LcResult.jsx';
import {Menu} from '../../ui/Menu.jsx';
import {Banner} from '../../ui/Banner.jsx';
Expand Down Expand Up @@ -40,6 +41,7 @@ export class LcViewer extends Component {
super(props);
this.state = this.getNextState();
dispatchAddSaga(lcManager);
dispatchAddSaga(listenerPanel);
dispatchAddSaga(syncChartViewer);
}

Expand Down