From ebe9c2c35d809a37e738995a5080d4dafad3016b Mon Sep 17 00:00:00 2001
From: Recolic Keghart <root@recolic.net>
Date: Mon, 11 Dec 2017 18:46:39 +0800
Subject: [PATCH] update data
---
TuningFork/draw.py | 5 ++++-
quickmap.py | 5 +----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/TuningFork/draw.py b/TuningFork/draw.py
index a3aafac..ae325a8 100755
--- a/TuningFork/draw.py
+++ b/TuningFork/draw.py
@@ -10,4 +10,7 @@ quickmap.GetMap(x,y,smoothLine=True)
x,y = quickmap.DataFileToXYArray('with_damping.dat')
quickmap.GetMap(x,y,smoothLine=True)
-
+sq_T = '14.633 19.327 24.256 29.192 34.589 39.547'.split(' ')
+sq_T = [float(e) for e in sq_T]
+m = [0,10,20,30,40,50]
+quickmap.GetMap(m,sq_T,polyLine=True)
diff --git a/quickmap.py b/quickmap.py
index 2ddf75a..b42dc05 100644
--- a/quickmap.py
+++ b/quickmap.py
@@ -67,12 +67,9 @@ def GetMap(arrX, arrY, windowSizeX=12, windowSizeY=8, extendXRate=1, extendYRate
kFinal, _ = leastsq(lossFunc, kInit, args=(X, Y))
print('Fitting line done. k=', kFinal)
else:
- print('Drawing map without fitting a line...')
+ print('Drawing map without fitting a line...\n')
# Draw function map.
- rcParams['grid.linestyle'] = '-'
- rcParams['grid.color'] = 'blue'
- rcParams['grid.linewidth'] = 0.2
plt.figure(figsize=(windowSizeX, windowSizeY))
plt.scatter(X, Y, color="red", label="Sample Point", linewidth=3)
if polyLine:
--
GitLab