Skip to content

DM-5763: XYPlot decimation options #105

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
Jun 18, 2016
Merged

DM-5763: XYPlot decimation options #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
721c678
DM-5763: XYPlot decimation options
tgoldina Jun 16, 2016
6902b01
DM-5763: response to review comments
tgoldina Jun 17, 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
12 changes: 9 additions & 3 deletions src/firefly/js/ui/SuggestBoxInputField.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ class SuggestBoxInputFieldView extends Component {
this.state = {
isOpen: false,
displayValue: props.value,
valid: true,
message: '',
valid: get(props, 'valid', true),
message: get(props.message, ''),
inputWidth: undefined,
suggestions: [],
mouseTrigger: false
Expand All @@ -123,6 +123,12 @@ class SuggestBoxInputFieldView extends Component {
this.updateSuggestions = debounce(this.updateSuggestions.bind(this), 200);
}

componentWillReceiveProps(nextProps) {
const {valid, message, value} = nextProps;
if (valid !== this.state.valid || message !== this.state.message || value !== this.state.displayValue) {
this.setState({valid, message, displayValue: value});
}
}

onValueChange(ev) {
var displayValue = get(ev, 'target.value');
Expand Down Expand Up @@ -230,7 +236,7 @@ class SuggestBoxInputFieldView extends Component {
/>
</div>

{isOpen && <div className={'SuggestBoxPopup'} style={{left: leftOffset, minWidth: minWidth}} onMouseLeave={() => this.setState({highlightedIdx : undefined})}>
{isOpen && <div className={'SuggestBoxPopup'} style={{left: leftOffset, minWidth}} onMouseLeave={() => this.setState({highlightedIdx : undefined})}>
<SuggestBox
suggestions={suggestions}
highlightedIdx={highlightedIdx}
Expand Down
65 changes: 38 additions & 27 deletions src/firefly/js/visualize/ChartsTableViewPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import {PopupPanel} from '../ui/PopupPanel.jsx';
import DialogRootContainer from '../ui/DialogRootContainer.jsx';
import {dispatchShowDialog, dispatchHideDialog, isDialogVisible} from '../core/ComponentCntlr.js';

import {showInfoPopup} from '../ui/PopupUtil.jsx';

import OUTLINE_EXPAND from 'html/images/icons-2014/24x24_ExpandArrowsWhiteOutline.png';
import SETTINGS from 'html/images/icons-2014/24x24_GearsNEW.png';
import ZOOM_IN from 'html/images/icons-2014/24x24_ZoomIn.png';
Expand Down Expand Up @@ -322,23 +324,28 @@ class ChartsPanel extends React.Component {

addSelection() {
if (this.state.chartType === SCATTER) {
const {tblId, tableModel} = this.props;
const selection = get(this.props, 'tblPlotData.xyPlotParams.selection');
const rows = get(this.props, 'tblPlotData.xyPlotData.rows');
if (tableModel && rows && selection) {
const {xMin, xMax, yMin, yMax} = selection;
const selectInfoCls = SelectInfo.newInstance({rowCount: tableModel.totalRows});
// add all rows which fall into selection
const xIdx = 0, yIdx = 1;
rows.forEach((arow, index) => {
const x = Number(arow[xIdx]);
const y = Number(arow[yIdx]);
if (x>=xMin && x<=xMax && y>=yMin && y<=yMax) {
selectInfoCls.setRowSelect(index, true);
}
});
const selectInfo = selectInfoCls.data;
TablesCntlr.dispatchTableSelect(tblId, selectInfo);
if (get(this.props, 'tblPlotData.xyPlotData.decimateKey')) {
showInfoPopup('Your data set is too large to select. You must filter it down first.',
`Can't Select`); // eslint-disable-line quotes
} else {
const {tblId, tableModel} = this.props;
const selection = get(this.props, 'tblPlotData.xyPlotParams.selection');
const rows = get(this.props, 'tblPlotData.xyPlotData.rows');
if (tableModel && rows && selection) {
const {xMin, xMax, yMin, yMax} = selection;
const selectInfoCls = SelectInfo.newInstance({rowCount: tableModel.totalRows});
// add all rows which fall into selection
const xIdx = 0, yIdx = 1, rowIdx = 2;
rows.forEach((arow) => {
const x = Number(arow[xIdx]);
const y = Number(arow[yIdx]);
if (x >= xMin && x <= xMax && y >= yMin && y <= yMax) {
selectInfoCls.setRowSelect(Number(arow[rowIdx]), true);
}
});
const selectInfo = selectInfoCls.data;
TablesCntlr.dispatchTableSelect(tblId, selectInfo);
}
}
}
}
Expand Down Expand Up @@ -389,15 +396,19 @@ class ChartsPanel extends React.Component {

selectionNotEmpty(selection) {
const rows = get(this.props, 'tblPlotData.xyPlotData.rows');
if (rows && selection) {
const {xMin, xMax, yMin, yMax} = selection;
const xIdx = 0, yIdx = 1;
const aPt = rows.find((arow) => {
const x = Number(arow[xIdx]);
const y = Number(arow[yIdx]);
return (x >= xMin && x <= xMax && y >= yMin && y <= yMax);
});
return Boolean(aPt);
if (rows) {
if (selection) {
const {xMin, xMax, yMin, yMax} = selection;
const xIdx = 0, yIdx = 1;
const aPt = rows.find((arow) => {
const x = Number(arow[xIdx]);
const y = Number(arow[yIdx]);
return (x >= xMin && x <= xMax && y >= yMin && y <= yMax);
});
return Boolean(aPt);
} else {
return true; // empty selection replacing non-empty
}
} else {
return false;
}
Expand All @@ -413,7 +424,7 @@ class ChartsPanel extends React.Component {
src={ZOOM_IN}
onClick={() => this.addZoom()}
/>
{!get(this.props, 'tblPlotData.xyPlotData.decimateKey') && <img style={selectionBtnStyle}
{<img style={selectionBtnStyle}
title='Select enclosed points'
src={SELECT_ROWS}
onClick={() => this.addSelection()}
Expand Down
Loading