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.

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

Updated method for ternary contour figure factory #1418

Merged
merged 35 commits into from
Mar 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c6744a0
poc of ternarycontour
emmanuelle Jan 26, 2019
82b600d
ternary contour figure factory
emmanuelle Jan 27, 2019
0c02beb
Changed string formatting to be compatible with Python <3.6
emmanuelle Jan 28, 2019
358b376
Changed string format to be compatible with Python < 3.6
emmanuelle Jan 28, 2019
4245423
Improved documentation
emmanuelle Jan 28, 2019
bcd35e8
corrected bug, typo in kw argument
emmanuelle Jan 28, 2019
a32f58f
fixed encoding error
emmanuelle Jan 28, 2019
3d8f9bf
added tests for ternary contour plot
emmanuelle Jan 29, 2019
581b93c
updated docstring
emmanuelle Jan 29, 2019
0c820cf
returned Figure instead of FigureWidget
emmanuelle Jan 30, 2019
e9a2d15
other method for ternary contour plot
emmanuelle Jan 31, 2019
a7c1118
implemented ilr transform
emmanuelle Feb 1, 2019
1ba984b
colormap is now working
emmanuelle Feb 2, 2019
d9c4bf1
Improved documentation and consistency of kw arguments
emmanuelle Feb 3, 2019
e632ec2
fixed tests with ternary contour plot
emmanuelle Feb 3, 2019
cb3f62f
renamed file
emmanuelle Feb 3, 2019
5a64a5a
fixed optional import
emmanuelle Feb 3, 2019
ab28c69
fixed name bug
emmanuelle Feb 3, 2019
7b11148
Merge branch 'master' into alternative_ternary_plot
emmanuelle Feb 4, 2019
7af65cf
Merge branch 'master' into alternative_ternary_plot
emmanuelle Feb 4, 2019
f85435f
better handling of colorspace interval + optional imports
emmanuelle Feb 5, 2019
258fb09
attempt to fix CI with scikit-image import
emmanuelle Feb 5, 2019
335e2d2
Better handling of contour values
emmanuelle Feb 5, 2019
222f303
changed skimage version
emmanuelle Feb 5, 2019
a6af167
fill contours after sorting them by decreasing enclosed area
emmanuelle Feb 5, 2019
4d8520f
play with contour filling
emmanuelle Feb 6, 2019
fd8765c
Better behavior of outer contour and color of background
emmanuelle Feb 10, 2019
e8567ea
Polished doc of ternary contour, ready for a review!
emmanuelle Feb 10, 2019
0182f3d
Removed bgcolor and font configuration. Added marker line
emmanuelle Feb 28, 2019
2c1857c
modified hover behavior
emmanuelle Mar 3, 2019
6f9b078
Discrete colormap when only contours are plotted (no markers)
emmanuelle Mar 3, 2019
a38fc54
Hide trace name from hovertemplate
jonmmease Mar 4, 2019
b43fff4
Skip tooltip on contour lines in `lines` mode.
jonmmease Mar 4, 2019
10e6eb4
Only display marker outline for filled contours
jonmmease Mar 4, 2019
004f6ef
whitespace
jonmmease Mar 4, 2019
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
2 changes: 1 addition & 1 deletion .circleci/create_conda_optional_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
# Create environment
# PYTHON_VERSION=3.6
$HOME/miniconda/bin/conda create -n circle_optional --yes python=$PYTHON_VERSION \
requests six pytz retrying psutil pandas decorator pytest mock nose poppler xarray
requests six pytz retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image

# Install orca into environment
$HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca
Expand Down
Loading