Merge pull request #602 from pavel-demin/develop

fix xlim in vna.py and set jobs to 4 in decode-wspr.sh
pavel-demin · Oct 11, 2017 · dbe31d4 · dbe31d4
2 parents 33a7598 + b8dfbde
commit dbe31d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/projects/sdr_transceiver_wspr/app/decode-wspr.sh b/projects/sdr_transceiver_wspr/app/decode-wspr.sh
@@ -4,7 +4,7 @@
 CALL=
 GRID=
 
-JOBS=2
+JOBS=4
 NICE=10
 
 DIR=`readlink -f $0`

diff --git a/projects/vna/client/vna.py b/projects/vna/client/vna.py
@@ -234,9 +234,9 @@ def move_marker(self, index, event):
   def release_marker(self, index, event):
     self.cursorPressed[index] = False
 
-  def xlim(self):
-    start = self.dut.freq[0]
-    stop = self.dut.freq[-1]
+  def xlim(self, freq):
+    start = freq[0]
+    stop = freq[-1]
     min = np.minimum(start, stop)
     max = np.maximum(start, stop)
     margin = (max - min) / 50
@@ -268,7 +268,7 @@ def plot_curves(self, freq, data1, label1, limit1, data2, label2, limit2):
     axes1.xaxis.grid()
     axes1.set_xlabel('kHz')
     axes1.set_ylabel(label1)
-    xlim = self.xlim()
+    xlim = self.xlim(freq)
     axes1.set_xlim(xlim)
     if limit1 is not None: axes1.set_ylim(limit1)
     self.curve1, = axes1.plot(freq, data1, color = 'blue', label = label1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     CALL=
     GRID=
-    JOBS=2
+    JOBS=4
     NICE=10
     DIR=`readlink -f $0`
@@ Expand Down @@