Skip to content

Add table trace #370

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
Mar 5, 2018
Merged

Add table trace #370

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
9 changes: 6 additions & 3 deletions dev/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ import Nav from './Nav';
import ACCESS_TOKENS from '../accessTokens';

const dataSources = {
col1: [1, 2, 3], // eslint-disable-line no-magic-numbers
col2: [4, 3, 2], // eslint-disable-line no-magic-numbers
col3: [17, 13, 9], // eslint-disable-line no-magic-numbers
col1: ['Jan', 'Feb', 'Mar'], // eslint-disable-line no-magic-numbers
col2: [1, 2, 3],
col3: [4, 3, 2], // eslint-disable-line no-magic-numbers
col4: [17, 13, 9], // eslint-disable-line no-magic-numbers
col5: ['blue'],
col6: ['yellow', 'green', 'yellow'],
};
const dataSourceOptions = Object.keys(dataSources).map(name => ({
value: name,
Expand Down
27 changes: 25 additions & 2 deletions src/components/fields/DataSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ export class UnconnectedDataSelector extends Component {
}

this.is2D =
props.attr === 'z' &&
['contour', 'heatmap', 'surface'].includes(props.container.type);
(props.attr === 'z' &&
['contour', 'heatmap', 'surface'].includes(props.container.type)) ||
(props.container.type === 'table' && props.attr !== 'columnorder');
}

updatePlot(value) {
Expand All @@ -52,6 +53,28 @@ export class UnconnectedDataSelector extends Component {
update[this.props.attr] = value
.filter(v => Array.isArray(this.dataSources[v]))
.map(v => this.dataSources[v]);

// Table traces have many configuration options,
// The below attributes can be 2d or 1d and will affect the plot differently
// EX:
// header.values = ['Jan', 'Feb', 'Mar'] => will put data in a row
// header.values = [['Jan', 1], ['Feb', 2], ['Mar', 3]] => will create 3 columns
// 1d arrays affect columns
// 2d arrays affect rows within each column

if (
this.props.container.type === 'table' &&
value.length === 1 &&
[
'header.values',
'header.font.color',
'header.font.size',
'header.fill.color',
'columnwidth',
].includes(this.props.attr)
) {
update[this.props.attr] = update[this.props.attr][0];
}
update[this.srcAttr] = value;
} else {
update[this.srcAttr] = value;
Expand Down
4 changes: 4 additions & 0 deletions src/components/fields/derived.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,10 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, {
];
}

if (context.container.type === 'table') {
plotProps.isVisible = false;
}

plotProps.options = options;
},
});
Expand Down
19 changes: 19 additions & 0 deletions src/default_panels/GraphCreatePanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ const GraphCreatePanel = ({localize: _}) => {
<DataSelector label={_('A')} attr="a" />
<DataSelector label={_('B')} attr="b" />
<DataSelector label={_('C')} attr="c" />
<DataSelector label={_('Headers')} attr="header.values" />
<DataSelector label={_('Columns')} attr="cells.values" />
</Section>

<Section name={_('Axes to Use')}>
Expand All @@ -80,6 +82,23 @@ const GraphCreatePanel = ({localize: _}) => {
<ErrorBars localize={_} attr="error_z" />
</Section>

<Section name={_('Header Options')}>
<DataSelector label={_('Fill Color')} attr="header.fill.color" />
<DataSelector label={_('Font Color')} attr="header.font.color" />
<DataSelector label={_('Font Size')} attr="header.font.size" />
</Section>

<Section name={_('Cell Options')}>
<DataSelector label={_('Fill Color')} attr="cells.fill.color" />
<DataSelector label={_('Font Color')} attr="cells.font.color" />
<DataSelector label={_('Font Size')} attr="cells.font.size" />
</Section>

<Section name={_('Column Options')}>
<DataSelector label={_('Width')} attr="columnwidth" />
<DataSelector label={_('Order')} attr="columnorder" />
</Section>

<Section name={_('Options')}>
<DataSelector label={_('Intensity')} attr="intensity" />
<DataSelector label={_('Facecolor')} attr="facecolor" />
Expand Down
38 changes: 38 additions & 0 deletions src/default_panels/StyleTracesPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,44 @@ const StyleTracesPanel = ({localize: _}) => (
/>
</Section>

<Section name={_('Header')}>
<Numeric label={_('Height')} attr="header.height" />
<ColorPicker label={_('Fill Color')} attr="header.fill.color" />
<FontSelector label={_('Typeface')} attr="header.font.family" />
<Numeric label={_('Font Size')} attr="header.font.size" />
<Dropdown
label={_('Text Alignment')}
options={[
{label: _('Left'), value: 'left'},
{label: _('Center'), value: 'center'},
{label: _('Right'), value: 'right'},
]}
attr="header.align"
/>
<ColorPicker label={_('Font Color')} attr="header.font.color" />
<Numeric label={_('Border Width')} attr="header.line.width" />
<ColorPicker label={_('Border Color')} attr="header.line.color" />
</Section>

<Section name={_('Cells')}>
<Numeric label={_('Height')} attr="cells.height" />
<ColorPicker label={_('Fill Color')} attr="cells.fill.color" />
<FontSelector label={_('Typeface')} attr="cells.font.family" />
<Numeric label={_('Font Size')} attr="cells.font.size" />
<Dropdown
label={_('Text Alignment')}
options={[
{label: _('Left'), value: 'left'},
{label: _('Center'), value: 'center'},
{label: _('Right'), value: 'right'},
]}
attr="cells.align"
/>
<ColorPicker label={_('Font Color')} attr="cells.font.color" />
<Numeric label={_('Border Width')} attr="cells.line.width" />
<ColorPicker label={_('Border Color')} attr="cells.line.color" />
</Section>

<Section name={_('Display')}>
<Flaglist
attr="mode"
Expand Down
20 changes: 10 additions & 10 deletions src/lib/traceTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ export const traceTypes = _ => [
label: _('Line'),
category: chartCategory(_).SIMPLE,
},
// {
// value: 'area',
// label: _('Area'),
// category: chartCategory(_).SIMPLE,
// },
{
value: 'area',
label: _('Area'),
category: chartCategory(_).SIMPLE,
},
{
value: 'heatmap',
label: _('Heatmap'),
category: chartCategory(_).SIMPLE,
},
// {
// value: 'table',
// label: _('Table'),
// category: chartCategory(_).SIMPLE,
// },
{
value: 'table',
label: _('Table'),
category: chartCategory(_).SIMPLE,
},
{
value: 'contour',
label: _('Contour'),
Expand Down