Skip to content
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

Jump to bottom

#7625 fix python NanoPlot problems #7663

Merged
merged 9 commits into from
Jul 23, 2018
Merged

#7625 fix python NanoPlot problems #7663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2e1919
#7625 handle single point correctly
piorek Jul 4, 2018
97bbadb
#7625 fixed num to string conversion for nanoplot elements coordinates
Jul 4, 2018
23b77f8
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
piorek Jul 6, 2018
03c50fb
#7625 fix python NanoPlot problems
piorek Jul 6, 2018
8b9b709
Merge branch 'master' of github.com:twosigma/beakerx into lukasz/7625
piorek Jul 11, 2018
6f0a9b1
Merge branch 'lukasz/7625' of github.com:twosigma/beakerx into lukasz…
piorek Jul 11, 2018
cee54df
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
piorek Jul 18, 2018
3c622ce
#7625 fix
piorek Jul 19, 2018
a89679d
#7625 CR fix
piorek Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions beakerx/beakerx/plot/chart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,11 +442,15 @@ def __init__(self, **kwargs):

def add(self, item):
super(NanoPlot, self).add(item)
converted = []
for l in self.chart.graphics_list:
convertedx = []
convertedy = []
for x in l.x:
converted.append(str(x))
l.x = converted
convertedx.append(str(x))
l.x = convertedx
for y in l.y:
convertedy.append(str(y))
l.y = convertedy
self.model = self.chart.transform()
return self

Expand Down
6 changes: 4 additions & 2 deletions js/notebook/src/plot/plotUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,12 @@ define([

var self = this;
var increaseRange = function(value) {
return self.plus(value, self.div((value || 1), 10));
var v = self.eq(value, 0) ? 1 : value || 1;
return self.plus(value, self.div(v, 10));
};
var decreaseRange = function(value){
return self.minus(value, self.div((value || 1), 10));
var v = self.eq(value, 0) ? 1 : value || 1;
return self.minus(value, self.div(v, 10));
};

if (this.eq(datarange.xl, datarange.xr)) {
Expand Down