diff options
| author | Alexander Kabui | 2021-10-13 08:28:16 +0300 |
|---|---|---|
| committer | Alexander Kabui | 2021-10-13 08:28:16 +0300 |
| commit | 5f855ab3c605201175482591073a10692516fd5c (patch) | |
| tree | 4ae1dc86a467ea3b7e3b23519b8875fa0da0548f /wqflask/utility/Plot.py | |
| parent | db9225caf0a78b13af1892d47c69463e00262d03 (diff) | |
| parent | a212ad123f902b6a9c74bcac1d98bc274cebbdda (diff) | |
| download | genenetwork2-5f855ab3c605201175482591073a10692516fd5c.tar.gz | |
resolve merge conflict
Diffstat (limited to 'wqflask/utility/Plot.py')
| -rw-r--r-- | wqflask/utility/Plot.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/utility/Plot.py b/wqflask/utility/Plot.py index 9b2c6735..d4256a46 100644 --- a/wqflask/utility/Plot.py +++ b/wqflask/utility/Plot.py @@ -139,7 +139,7 @@ def plotBar(canvas, data, barColor=BLUE, axesColor=BLACK, labelColor=BLACK, XLab max_D = max(data) min_D = min(data) # add by NL 06-20-2011: fix the error: when max_D is infinite, log function in detScale will go wrong - if max_D == float('inf') or max_D > webqtlConfig.MAXLRS: + if (max_D == float('inf') or max_D > webqtlConfig.MAXLRS) and min_D < webqtlConfig.MAXLRS: max_D = webqtlConfig.MAXLRS # maximum LRS value xLow, xTop, stepX = detScale(min_D, max_D) @@ -156,7 +156,7 @@ def plotBar(canvas, data, barColor=BLUE, axesColor=BLACK, labelColor=BLACK, XLab j += step for i, item in enumerate(data): - if item == float('inf') or item > webqtlConfig.MAXLRS: + if (item == float('inf') or item > webqtlConfig.MAXLRS) and min_D < webqtlConfig.MAXLRS: item = webqtlConfig.MAXLRS # maximum LRS value j = int((item - xLow) / step) Count[j] += 1 |