Merge pull request #33 from CDAT/32_toomanyitems

trim attributes to number of lines plotted, fix #32
CDAT · Oct 4, 2018 · 8af0752 · 8af0752
2 parents f06e41e + b5363dc
commit 8af0752
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,16 +17,16 @@ aliases:
     name: create_conda_env
     environment:
        PKGS: "cdms2 mesalib matplotlib 'numpy>1.14' vcs 'proj4<5' testsrunner"
-       CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
+       CHANNELS: "-c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat"
     command: |
        export PATH=$WORKDIR/miniconda/bin:$PATH
        conda config --set always_yes yes --set changeps1 no
        conda update -y -q conda
        conda config --set anaconda_upload no
        if [[ $PY_VER = "py2" ]]; then
-          conda create -q -n $PY_VER $CHANNELS $PKGS 'python>3' $FFMPEG ${CONDA_COMPILERS}
+          conda create -q -n $PY_VER $CHANNELS $PKGS 'python<3' $FFMPEG ${CONDA_COMPILERS}
        else
-          conda create -q -n $PY_VER $CHANNELS $PKGS 'python<3' $FFMPEG ${CONDA_COMPILERS} $COVERAGE_PKGS
+          conda create -q -n $PY_VER $CHANNELS $PKGS 'python>3' $FFMPEG ${CONDA_COMPILERS} $COVERAGE_PKGS
        fi
     
   - &setup_vcsaddons

diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,8 @@ script:
 - export UVCDAT_SETUP_PATH=${HOME}
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export COMPILERS=gcc_linux-64; export LDSHARED_FLAGS="-shared -pthread" ; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export COMPILERS=clang_osx-64; export LDSHARED_FLAGS="-bundle -undefined dynamic_lookup" ; fi
-- conda create -q -n py2 -c cdat/label/nightly -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python<3" ${COMPILERS}
-- conda create -q -n py3 -c cdat/label/nightly -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python>3" ${COMPILERS}
+- conda create -q -n py2 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python<3" ${COMPILERS}
+- conda create -q -n py3 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python>3" ${COMPILERS}
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
 - echo $TRAVIS_EVENT_TYPE

diff --git a/Lib/parallelCoordinates.py b/Lib/parallelCoordinates.py
@@ -50,7 +50,6 @@ def list(self):
         print('datawc_y2 = ', self.datawc_y2)
         print('xmtics1 = ', self.xmtics1)
         print('xmtics2 = ', self.xmtics2)
-        print('ymtics = ', self.ymtics)
         print('xticlabels1 = ', self.xticlabels1)
         print('xticlabels2 = ', self.xticlabels2)
         print('yticlabels = ', self.yticlabels)
@@ -304,6 +303,12 @@ def plot(self, array, template=None, bg=False, render=True, x=None):
             else:
                 scratched.append(True)
         # Now draws the legend
+        linecolors = linecolors[:nlines]
+        linetypes = linetypes[:nlines]
+        linewidths = linewidths[:nlines]
+        markercolors = markercolors[:nlines]
+        markersizes = markersizes[:nlines]
+        markertypes = markertypes[:nlines]
         t.drawLinesAndMarkersLegend(x,
                                     linecolors, linetypes, linewidths,  # noqa
                                     markercolors, markertypes, markersizes,  # noqa