From a1e92bd44428fef4ea006ebe1c50e7f5178dfcef Mon Sep 17 00:00:00 2001
From: Recolic Keghart <admin@recolic.net>
Date: Tue, 23 May 2017 15:03:47 +0800
Subject: [PATCH] f
---
phySpider.py | 1 -
va/va.py | 15 +++++++++++++++
va/va1.py | 10 ----------
va/va2.py | 10 ----------
va/va3.py | 10 ----------
5 files changed, 15 insertions(+), 31 deletions(-)
create mode 100644 va/va.py
delete mode 100644 va/va1.py
delete mode 100644 va/va2.py
delete mode 100644 va/va3.py
diff --git a/phySpider.py b/phySpider.py
index 09f475d..f1d86ab 100644
--- a/phySpider.py
+++ b/phySpider.py
@@ -1,7 +1,6 @@
#!/bin/env python3
# -*- coding: UTF-8 -*-
# Scan if there's any empty seat to play physics exp..
-# License: Unauthorized copy is strictly FORBIDDEN.
# By Recolic Keghart, Apr 26, 2017
import urllib.parse, urllib.request
diff --git a/va/va.py b/va/va.py
new file mode 100644
index 0000000..cb709f9
--- /dev/null
+++ b/va/va.py
@@ -0,0 +1,15 @@
+import numpy
+import sys
+from quickmap import GetMap as draw
+
+print('Usage: python va.py path/va-dat.in <Voltmeter range(V)> <Ammeter range(mA)> <fit line>')
+print('Example: python3 va.py va-dat.in 1 15 true')
+dat=numpy.loadtxt(sys.argv[1], delimiter=' ')
+Uraw,Iraw=dat[:,0],dat[:,1]
+U=[utrue/100*float(sys.argv[2]) for utrue in Uraw]
+I=[itrue/150*float(sys.argv[3]) for itrue in Iraw]
+# 1V 15mA. Edit it to adjust Ammeter/Voltmeter range.
+if sys.argv[4] == 'true':
+ draw(I,U,line=True,passO=True)
+else:
+ draw(I,U)
diff --git a/va/va1.py b/va/va1.py
deleted file mode 100644
index 9faf2d9..0000000
--- a/va/va1.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import numpy
-import sys
-from quickmap import GetMap as draw
-
-dat=numpy.loadtxt(sys.argv[1], delimiter=' ')
-Uraw,Iraw=dat[:,0],dat[:,1]
-U=[utrue/100*2.5 for utrue in Uraw]
-I=[itrue/150*30 for itrue in Iraw]
-
-draw(I,U,line=True,passO=True)
diff --git a/va/va2.py b/va/va2.py
deleted file mode 100644
index 2a65817..0000000
--- a/va/va2.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import numpy
-import sys
-from quickmap import GetMap as draw
-
-dat=numpy.loadtxt(sys.argv[1], delimiter=' ')
-Uraw,Iraw=dat[:,0],dat[:,1]
-U=[utrue/100*5 for utrue in Uraw]
-I=[itrue/150*7.5 for itrue in Iraw]
-# 1V 15mA. Edit it to adjust Ammeter/Voltmeter range.
-draw(I,U)
diff --git a/va/va3.py b/va/va3.py
deleted file mode 100644
index 453fe32..0000000
--- a/va/va3.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import numpy
-import sys
-from quickmap import GetMap as draw
-
-dat=numpy.loadtxt(sys.argv[1], delimiter=' ')
-Uraw,Iraw=dat[:,0],dat[:,1]
-U=[utrue/100*5 for utrue in Uraw]
-I=[itrue/150*15 for itrue in Iraw]
-# 1V 15mA. Edit it to adjust Ammeter/Voltmeter range.
-draw(I,U)
--
GitLab