From af0ba1639ae9622f1345fda15211ac4614e85556 Mon Sep 17 00:00:00 2001 From: Recolic Keghart <root@recolic.net> Date: Mon, 26 Oct 2020 09:17:04 +0800 Subject: [PATCH] scipy 1.3.1 --- quickmap.py | 7 ++++++- test.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/quickmap.py b/quickmap.py index 795147a..9ca273f 100644 --- a/quickmap.py +++ b/quickmap.py @@ -7,7 +7,12 @@ import numpy from scipy.optimize import leastsq import matplotlib.pyplot as plt from matplotlib import rcParams -from scipy.interpolate import spline + +# spline was removed from scipy 1.3.1 +try: + from scipy.interpolate import spline +except ImportError: + from scipy.interpolate import BSpline as spline from deprecated import deprecated diff --git a/test.py b/test.py index dbf1725..4f81ff1 100644 --- a/test.py +++ b/test.py @@ -1,3 +1,13 @@ +import quickmap + +x = [0.89, 1.26, 1.73, 2.10, 2.49, 2.89, 3.30, 3.83] +y = [20.5666, 20.58471, 20.60780, 20.62480, 20.64242, 20.66165, 20.68132, 20.70682] + +quickmap.GetMap(x, y, polyLine=True) + +exit(0) + + #import quickmap # #yrc=[-6.77, -6.78, -6.78, -6.76, -6.73, -6.73, -6.72, -6.70, -6.69, -6.67, -6.60, -6.45, -6.37, -6.20, -5.99, -5.77, -5.45, -5.07, -3.52, -2.87, -2.36, -2.08, -1.77, -1.55, -1.40, -1.26, -0.97, -0.84, -0.64] -- GitLab