Skip to content

#2261: Front: Reset zoom when detection time is applied #4

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
Jan 10, 2024
Merged

#2261: Front: Reset zoom when detection time is applied #4

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
3 changes: 2 additions & 1 deletion lib/index-newcrom.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,8 @@ export function react(
data: Data[],
layout?: Partial<Layout>,
config?: Partial<Config>,
isForceUpdate?: boolean
isForceUpdate?: boolean,
xAxisRange?: [x0: number, x1: number] | null
): Promise<PlotlyHTMLElement>;
export function addFrames(root: Root, frames: Array<Partial<Frame>>): Promise<PlotlyHTMLElement>;
export function deleteFrames(root: Root, frames: number[]): Promise<PlotlyHTMLElement>;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plotly.js-newcrom",
"version": "2.27.1",
"version": "2.27.1-1",
"description": "The open source javascript graphing library that powers plotly",
"license": "MIT",
"main": "./lib/index-newcrom.js",
Expand Down
20 changes: 14 additions & 6 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ var numericNameWarningCountLimit = 5;
*
*/
function _doPlot(gd, data, layout, config) {
const isForceRerender = window.isForceRerender
window.isForceRerender = false;
const isForceRerender = window[`plotly-${gd.dataset.chartId}`].isForceRerender
window[`plotly-${gd.dataset.chartId}`].isForceRerender = false;

var frames;

Expand Down Expand Up @@ -330,9 +330,10 @@ function _doPlot(gd, data, layout, config) {

subroutines.doAutoRangeAndConstraints(gd);

// !!! We don't need to save an initial range because we change it if we apply a detection time.
// store initial ranges *after* enforcing constraints, otherwise
// we will never look like we're at the initial ranges
if(graphWasEmpty) Axes.saveRangeInitial(gd);
// if(graphWasEmpty) Axes.saveRangeInitial(gd);

// this one is different from shapes/annotations calcAutorange
// the others incorporate those components into ax._extremes,
Expand Down Expand Up @@ -365,7 +366,8 @@ function _doPlot(gd, data, layout, config) {
gd._fullLayout._insideTickLabelsUpdaterange = undefined;

return relayout(gd, insideTickLabelsUpdaterange).then(function() {
Axes.saveRangeInitial(gd, true);
// !!! We don't need to save an initial range because we change it if we apply a detection time.
// Axes.saveRangeInitial(gd, true);
});
}
}
Expand Down Expand Up @@ -552,6 +554,8 @@ function redraw(gd) {
});
}

const generateId = () => Math.random().toString(36).substr(2, 10);

/**
* Convenience function to make idempotent plot option obvious to users.
*
Expand All @@ -561,7 +565,9 @@ function redraw(gd) {
* @param {Object} config
*/
function newPlot(gd, data, layout, config) {
gd.dataset.chartId = generateId()
gd = Lib.getGraphDiv(gd);
window[`plotly-${gd.dataset.chartId}`] = {}

// remove gl contexts
Plots.cleanPlot([], {}, gd._fullData || [], gd._fullLayout || {});
Expand Down Expand Up @@ -2635,7 +2641,9 @@ function applyUIRevisions(data, layout, oldFullData, oldFullLayout) {
* object containing `data`, `layout`, `config`, and `frames` members
*
*/
function react(gd, data, layout, config, isForce) {
function react(gd, data, layout, config, isForce, xAxisRange) {
window[`plotly-${gd.dataset.chartId}`].xAxisRange = xAxisRange;

var frames, plotDone;

function addFrames() { return exports.addFrames(gd, frames); }
Expand Down Expand Up @@ -2744,7 +2752,7 @@ function react(gd, data, layout, config, isForce) {
});
} else if(isForce || restyleFlags.fullReplot || relayoutFlags.layoutReplot || configChanged) {
gd._fullLayout._skipDefaults = true;
window.isForceRerender = true
window[`plotly-${gd.dataset.chartId}`].isForceRerender = true
seq.push(exports._doPlot);
} else {
for(var componentType in relayoutFlags.arrays) {
Expand Down
25 changes: 15 additions & 10 deletions src/plots/cartesian/dragbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,17 +827,22 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
if(!ax.fixedrange) {
var axName = ax._name;

var autorangeInitial = ax._autorangeInitial;
if(ax._rangeInitial0 === undefined && ax._rangeInitial1 === undefined) {
attrs[axName + '.autorange'] = true;
} else if(ax._rangeInitial0 === undefined) {
attrs[axName + '.autorange'] = autorangeInitial;
attrs[axName + '.range'] = [null, ax._rangeInitial1];
} else if(ax._rangeInitial1 === undefined) {
attrs[axName + '.range'] = [ax._rangeInitial0, null];
attrs[axName + '.autorange'] = autorangeInitial;
const xAxisRange = window[`plotly-${gd.dataset.chartId}`].xAxisRange
if (xAxisRange != null && axName === 'xaxis'){
attrs[axName + '.range'] = [...xAxisRange];
} else {
attrs[axName + '.range'] = [ax._rangeInitial0, ax._rangeInitial1];
var autorangeInitial = ax._autorangeInitial;
if (ax._rangeInitial0 === undefined && ax._rangeInitial1 === undefined) {
attrs[axName + '.autorange'] = true;
} else if (ax._rangeInitial0 === undefined) {
attrs[axName + '.autorange'] = autorangeInitial;
attrs[axName + '.range'] = [null, ax._rangeInitial1];
} else if (ax._rangeInitial1 === undefined) {
attrs[axName + '.range'] = [ax._rangeInitial0, null];
attrs[axName + '.autorange'] = autorangeInitial;
} else {
attrs[axName + '.range'] = [ax._rangeInitial0, ax._rangeInitial1];
}
}
}
}
Expand Down