Age | Commit message (Collapse) | Author |
|
* wqflask/utility/webqtlUtil.py (genRandStr): Replace "string.letters" with
"string.ascii_letters".
|
|
|
|
Run:
```
2to3-3.8 -f imports -w . && \
2to3-3.8 -f imports2 -w .
```
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-imports> and
<https://docs.python.org/2/library/2to3.html#2to3fixer-imports2>
|
|
* wqflask/base/data_set.py: Remove usage of "reaper" to load datasets
|
|
* wqflask/base/trait.py: Remove unused imports
* wqflask/db/call.py (Bench): Add urllib2 fallback for python2
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-urllib>
|
|
Run `2to3-3.8 -f idioms -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-idioms>
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-xrange>
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-urllib>
|
|
* wqflask/base/trait.py: See
<https://docs.python.org/2/library/2to3.html#2to3fixer-repr>
|
|
Run `2to3-3.8 -f reduce -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-reduce>
|
|
Run `2to3-3.8 -f raise -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-raise>
|
|
Run `2to3-3.8 -f next -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-next>
|
|
Run `2to3-3.8 -f ne -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-ne>
|
|
Run `2to3-3.8 -f itertools -w . && 2to3-3.8 -f itertools_imports -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-itertools_imports>
and <https://docs.python.org/2/library/2to3.html#2to3fixer-itertools>
|
|
Run `2to3-3.8 -f has_key -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-has_key>
|
|
Run `2to3-3.8 -f dict -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-dict> and
<https://stackoverflow.com/questions/17695456/why-does-python-3-need-dict-items-to-be-wrapped-with-list>
|
|
* wqflask/utility/svg.py [roct, ellipse, SVGelement]: Raise only a single value error
if either height or width is not defined. Fixes parsing error when running
`2to3-3.8 -f apply -w .`
|
|
Run `2to3-3.8 -f map -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-map>
|
|
* wqflask/utility/svg.py: Apply pep8 to fix indentation error when running
`2to3-3.8 -w .`:
````
RefactoringTool: Can't parse ./wqflask/utility/svg.py: IndentationError: unindent does not match any outer indentation level (<tokenize>, line 403)
````
|
|
* wqflask/utility/svg.py: Use "!=". The operator, "<>" is removed in Python3
|
|
|
|
* wqflask/utility/Plot.py: Update docstring.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Many text
instances had their positions changed by the switch from piddle to PIL. Change
various Y offsets and in some cases changing the logic of the way text is
positioned related to its length and font size.
* wqflask/wqflask/static/fonts/verdanab.ttf: Add bold Verdana, since there needs
to be a separate font file for bold text.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: replace piddle
method with PIL.ImageFont
* wqflask/wqflask/static/fonts: Add fonts in path
|
|
* wqflask/tests/wqflask/marker_regression/__init__.py: Add it
* wqflask/tests/wqflask/marker_regression/test_display_marking_results.py: Check
that PIL colors are being used instead of the deprecated Piddle colors.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Piddle seemed to
centre text about the given Y coordinate, while Pillow requires specification to
top-left corner of the text. This slight change means text all over the image is
displaced somewhat, and this fixes the coordinate system for some of the text.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Fix the
placement for the axes labels.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Use
TEXT_Y_DISPLACEMENT instead of magic numbers to help with making it clear that
the drawn text is displaced somewhat.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Give the
rectangles black outlines to correspond to earlier drawings.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Use the new
`draw_open_polygon()` utility to draw open polygons.
|
|
* wqflask/utility/pillow_utils.py: New method.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py:
(DisplayMappingResults): Pillow uses 'fill' in place of 'color'.
|
|
Use the new draw_rotated_text() function to draw the text rotated as was
formerly done.
* wqflask/utility/Plot.py (plotBar): Use draw_rotated_text().
* wqflask/wqflask/marker_regression/display_mapping_results.py:
(DisplayMappingResults) Use draw_rotated_text().
|
|
* wqflask/utility/pillow_utils.py: Create a module to hold some utility
functions for drawing with Pillow. Initialise the module with a function to draw
rotated text.
|
|
* wqflask/utility/Plot.py: Update font paths.
* wqflask/fonts/ttf: Update font files.
|
|
* wqflask/wqflask/snp_browser/snp_browser.py: Use newer, and supported Pillow in
place of obsoleted Piddle library.
|
|
* wqflask/fonts/ttf: Add ttf font files.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Add font files
(DisplayMappingResults): Update the code from the Piddle way of things to the
Pillow way of things, for example, replace:
- pid.drawRect(...) with im_drawer.rectangle(...)
- pid.drawString(...) with im_drawer.text(...)
- pid.drawPolygon(...) with im_drawer.polygon(...) etc.
* wqflask/utility/Plot.py: Migrate code from the older, unsupported Piddle to
the newer Pillow library.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Use Pillow's ImageColor module in place of the older Piddle colours.
|
|
* wqflask/tests(api): Move all the files here to tests/wqflask. The test dir
should mirror the actual module structure
|
|
summaries looking strange
* wqflask/wqflask/templates/show_trait_details.html - Set min-width of
table containing details to 1400px
|
|
|
|
* wqflask/wqflask/views.py - Removed an if statement that was
unnecessary, because it already checks if dataset is either the string
"Temp" or of type "Temp"
|
|
header
* wqflask/wqflask/static/new/css/show_trait.css - Changed right margin
from 20px to 15px to better account for the width of the sort arrows in
the header cell
|
|
Tests/add tests for gen menu
|
|
* wqflask/wqflask/show_trait/show_trait.py - Just added more pixels in
the function which determines the overall table width
|
|
cofactors, leading to an error in non-Chrome browsers
*
wqflask/wqflask/static/new/javascript/get_covariates_from_collection.js
- Added a line that checks if the table already exists before
initializing it; this issue is caused by a circular import issue, but
I'm not sure how to get around it yet
|
|
* wqflask/wqflask/api/gen_menu.py (build_types, build_datasets): Replace '+'
when joining strings inside brackets
|
|
* wqflask/wqflask/api/gen_menu.py: Apply pylint.
* wqflask/tests/api/test_gen_menu.py: Apply pylint.
|