Skip to content

IRSA-601: labels change in error bars options #413

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
Jul 17, 2017
Merged

IRSA-601: labels change in error bars options #413

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
8 changes: 1 addition & 7 deletions src/firefly/js/charts/ui/XYPlotOptions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {plotParamsShape} from './XYPlotPropTypes.js';
import {hideColSelectPopup} from './ColSelectView.jsx';
import {ColumnOrExpression, getColValidator} from './ColumnOrExpression.jsx';
import {updateSet} from '../../util/WebUtil.js';
import {ERR_TYPE_OPTIONS} from '../ui/options/Errors.jsx';

const DECI_ENABLE_SIZE = 5000;

Expand All @@ -39,13 +40,6 @@ const Y_AXIS_OPTIONS = [
{label: 'log', value: 'log'}
];

const ERR_TYPE_OPTIONS = [
{label: 'None', value: 'none'},
{label: 'Sym', value: 'sym'},
{label: 'Asym', value: 'asym'}

];

const Y_AXIS_OPTIONS_NOLOG = Y_AXIS_OPTIONS.filter((el) => {return el.label !== 'log';});

const helpStyle = {fontStyle: 'italic', color: '#808080', paddingBottom: 10};
Expand Down
4 changes: 2 additions & 2 deletions src/firefly/js/charts/ui/options/Errors.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {ColumnOrExpression} from '../ColumnOrExpression.jsx';
import ColValuesStatistics from '../../ColValuesStatistics.js';


const ERR_TYPE_OPTIONS = [
export const ERR_TYPE_OPTIONS = [
{label: 'None', value: 'none'},
{label: 'Sym', value: 'sym'},
{label: 'Symm', value: 'sym'},
{label: 'Asym', value: 'asym'}

];
Expand Down
2 changes: 1 addition & 1 deletion src/firefly/js/charts/ui/options/ScatterOptions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function fieldReducer({chartId, activeTrace}) {
fieldKey: errorMinusFieldKey(activeTrace, 'x'),
value: get(tablesourceMappings, ['error_x.arrayminus'], ''),
//tooltip: 'X error',
label: 'X Err\u2193:',
label: 'Error\u2193:',
Copy link
Contributor

Choose a reason for hiding this comment

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

We might want to remove tooltip and label properties from error and errorMinus fields here - they have no effect here and are actually defined in the Errors' render (as props to ColumnOrExpression).

...fieldProps
},
[errorFieldKey(activeTrace, 'y')]: {
Expand Down