Mercurial > hg > may
changeset 121:789da8e322e1
Guess the architecture, and minor fixes
author | Chris Cannam |
---|---|
date | Thu, 18 Apr 2013 17:03:53 +0100 |
parents | 098b4efde5b1 |
children | a524a15935f0 |
files | bin/yc bin/yetilab yetilab/plot/plot.yeti |
diffstat | 3 files changed, 31 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/yc Thu Apr 18 09:46:34 2013 +0100 +++ b/bin/yc Thu Apr 18 17:03:53 2013 +0100 @@ -1,6 +1,19 @@ #!/bin/sh -ARCH=linux32 +ARCH=unknown + +case `uname -a` in +Linux*x86_64*) ARCH=linux64;; +Linux*) ARCH=linux32;; +Darwin*) ARCH=osx;; +CYG*) ARCH=win32;; +MINGW*) ARCH=win32;; +esac + +if [ "$ARCH" == "unknown" ]; then + echo "Failed to guess architecture for native libraries, sorry!" 1>&2 + exit 2 +fi YLDIR=`dirname $0`/..
--- a/bin/yetilab Thu Apr 18 09:46:34 2013 +0100 +++ b/bin/yetilab Thu Apr 18 17:03:53 2013 +0100 @@ -1,6 +1,19 @@ #!/bin/sh -ARCH=linux32 +ARCH=unknown + +case `uname -a` in +Linux*x86_64*) ARCH=linux64;; +Linux*) ARCH=linux32;; +Darwin*) ARCH=osx;; +CYG*) ARCH=win32;; +MINGW*) ARCH=win32;; +esac + +if [ "$ARCH" == "unknown" ]; then + echo "Failed to guess architecture for native libraries, sorry!" 1>&2 + exit 2 +fi YLDIR=`dirname $0`/..
--- a/yetilab/plot/plot.yeti Thu Apr 18 09:46:34 2013 +0100 +++ b/yetilab/plot/plot.yeti Thu Apr 18 17:03:53 2013 +0100 @@ -37,13 +37,13 @@ plotMatrix matrix = (mapper = newMatrixMapper matrix; size = matrix.size; - xrange = new Range(1, size.columns - 1); - yrange = new Range(1, size.rows - 1); + xrange = new Range(0, size.columns - 1); + yrange = new Range(0, size.rows - 1); grid = new OrthonormalGrid(xrange, size.columns, yrange, size.rows); println "Matrix size: \(size)"; surface = Builder#buildOrthonormal(grid, mapper); //??? big? println "Z Bounds: \(surface#getBounds()#getZmin()) -> \(surface#getBounds()#getZmax())"; - surface#setFaceDisplayed(false); + surface#setFaceDisplayed(true); surface#setWireframeDisplayed(true); surface#setWireframeColor(Color#BLACK); // chart = new Chart(Quality#Fastest, "swing");