caiyu/qspectrumanalyzer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: qspectrumanalyzer/backends/__init__.py

Browse Source 
modified:   qspectrumanalyzer/backends/hackrf_sweep.py
	modified:   qspectrumanalyzer/backends/rtl_power.py
	modified:   qspectrumanalyzer/backends/rtl_power_fftw.py
	modified:   qspectrumanalyzer/backends/rx_power.py
	modified:   qspectrumanalyzer/backends/soapy_power.py
	renamed:    qspectrumanalyzer/subprocess.py -> qspectrumanalyzer/subproc.py
This commit is contained in:
konung-yaropolk 2022-11-08 02:14:57 -06:00
parent 067fd13b7c
commit 2b49d1f1b3
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qspectrumanalyzer/backends/__init__.py
View File

@ -2,7 +2,7 @@ import os, threading, shlex
from Qt import QtCore from Qt import QtCore
from qspectrumanalyzer import subprocess from qspectrumanalyzer import subproc
class BaseInfo: class BaseInfo:
@ -41,10 +41,10 @@ class BaseInfo:
def help_params(cls, executable): def help_params(cls, executable):
cmdline = shlex.split(executable) cmdline = shlex.split(executable)
try: try:
text = subprocess.check_output(cmdline + ['-h'], universal_newlines=True, text = subproc.check_output(cmdline + ['-h'], universal_newlines=True,
stderr=subprocess.STDOUT, env=dict(os.environ, COLUMNS='125'), stderr=subproc.STDOUT, env=dict(os.environ, COLUMNS='125'),
console=False) console=False)
except subprocess.CalledProcessError as e: except subproc.CalledProcessError as e:
text = e.output text = e.output
except OSError: except OSError:
text = '{} executable not found!'.format(executable) text = '{} executable not found!'.format(executable)

4
qspectrumanalyzer/backends/hackrf_sweep.py
View File

@ -3,7 +3,7 @@ import struct, shlex, sys, time
import numpy as np import numpy as np
from Qt import QtCore from Qt import QtCore
from qspectrumanalyzer import subprocess from qspectrumanalyzer import subproc
from qspectrumanalyzer.backends import BaseInfo, BasePowerThread from qspectrumanalyzer.backends import BaseInfo, BasePowerThread
@ -109,7 +109,7 @@ class PowerThread(BasePowerThread):
print('Starting backend:') print('Starting backend:')
print(' '.join(cmdline)) print(' '.join(cmdline))
print() print()
self.process = subprocess.Popen(cmdline, stdout=subprocess.PIPE, self.process = subproc.Popen(cmdline, stdout=subproc.PIPE,
universal_newlines=False, console=False) universal_newlines=False, console=False)
def parse_output(self, buf): def parse_output(self, buf):

4
qspectrumanalyzer/backends/rtl_power.py
View File

@ -3,7 +3,7 @@ import shlex
import numpy as np import numpy as np
from Qt import QtCore from Qt import QtCore
from qspectrumanalyzer import subprocess from qspectrumanalyzer import subproc
from qspectrumanalyzer.backends import BaseInfo, BasePowerThread from qspectrumanalyzer.backends import BaseInfo, BasePowerThread
@ -65,7 +65,7 @@ class PowerThread(BasePowerThread):
print('Starting backend:') print('Starting backend:')
print(' '.join(cmdline)) print(' '.join(cmdline))
print() print()
self.process = subprocess.Popen(cmdline, stdout=subprocess.PIPE, self.process = subproc.Popen(cmdline, stdout=subproc.PIPE,
universal_newlines=True, console=False) universal_newlines=True, console=False)
def parse_output(self, line): def parse_output(self, line):

4
qspectrumanalyzer/backends/rtl_power_fftw.py
View File

@ -2,7 +2,7 @@ import math, shlex
from Qt import QtCore from Qt import QtCore
from qspectrumanalyzer import subprocess from qspectrumanalyzer import subproc
from qspectrumanalyzer.backends import BaseInfo, BasePowerThread from qspectrumanalyzer.backends import BaseInfo, BasePowerThread
@ -90,7 +90,7 @@ class PowerThread(BasePowerThread):
print('Starting backend:') print('Starting backend:')
print(' '.join(cmdline)) print(' '.join(cmdline))
print() print()
self.process = subprocess.Popen(cmdline, stdout=subprocess.PIPE, self.process = subproc.Popen(cmdline, stdout=subproc.PIPE,
universal_newlines=True, console=False) universal_newlines=True, console=False)
def parse_output(self, line): def parse_output(self, line):

4
qspectrumanalyzer/backends/rx_power.py
View File

@ -3,7 +3,7 @@ import shlex
import numpy as np import numpy as np
from Qt import QtCore from Qt import QtCore
from qspectrumanalyzer import subprocess from qspectrumanalyzer import subproc
from qspectrumanalyzer.backends import BaseInfo, BasePowerThread from qspectrumanalyzer.backends import BaseInfo, BasePowerThread
@ -70,7 +70,7 @@ class PowerThread(BasePowerThread):
print('Starting backend:') print('Starting backend:')
print(' '.join(cmdline)) print(' '.join(cmdline))
print() print()
self.process = subprocess.Popen(cmdline, stdout=subprocess.PIPE, self.process = subproc.Popen(cmdline, stdout=subproc.PIPE,
universal_newlines=True, console=False) universal_newlines=True, console=False)
def parse_output(self, line): def parse_output(self, line):

18
qspectrumanalyzer/backends/soapy_power.py
View File

@ -3,7 +3,7 @@ import os, sys, shlex, signal
import numpy as np import numpy as np
from Qt import QtCore from Qt import QtCore
from qspectrumanalyzer import subprocess from qspectrumanalyzer import subproc
from qspectrumanalyzer.backends import BaseInfo, BasePowerThread from qspectrumanalyzer.backends import BaseInfo, BasePowerThread
try: try:
@ -34,14 +34,14 @@ class Info(BaseInfo):
def help_device(cls, executable, device): def help_device(cls, executable, device):
cmdline = shlex.split(executable) cmdline = shlex.split(executable)
try: try:
text = subprocess.check_output(cmdline + ['--detect'], universal_newlines=True, text = subproc.check_output(cmdline + ['--detect'], universal_newlines=True,
stderr=subprocess.DEVNULL, env=dict(os.environ, COLUMNS='125'), stderr=subproc.DEVNULL, env=dict(os.environ, COLUMNS='125'),
console=False) console=False)
text += '\n' text += '\n'
text += subprocess.check_output(cmdline + ['--device', device, '--info'], universal_newlines=True, text += subproc.check_output(cmdline + ['--device', device, '--info'], universal_newlines=True,
stderr=subprocess.DEVNULL, env=dict(os.environ, COLUMNS='125'), stderr=subproc.DEVNULL, env=dict(os.environ, COLUMNS='125'),
console=False) console=False)
except subprocess.CalledProcessError as e: except subproc.CalledProcessError as e:
text = e.output text = e.output
except OSError: except OSError:
text = '{} executable not found!'.format(executable) text = '{} executable not found!'.format(executable)
@ -85,7 +85,7 @@ class PowerThread(BasePowerThread):
os.set_inheritable(self.pipe_write_fd, True) os.set_inheritable(self.pipe_write_fd, True)
if sys.platform == 'win32': if sys.platform == 'win32':
self.pipe_write_handle = subprocess.make_inheritable_handle(self.pipe_write_fd) self.pipe_write_handle = subproc.make_inheritable_handle(self.pipe_write_fd)
# Prepare soapy_power cmdline parameters # Prepare soapy_power cmdline parameters
settings = QtCore.QSettings() settings = QtCore.QSettings()
@ -121,14 +121,14 @@ class PowerThread(BasePowerThread):
# Start soapy_power process and close write part of pipe # Start soapy_power process and close write part of pipe
if sys.platform == 'win32': if sys.platform == 'win32':
creationflags = subprocess.CREATE_NEW_PROCESS_GROUP creationflags = subproc.CREATE_NEW_PROCESS_GROUP
else: else:
creationflags = 0 creationflags = 0
print('Starting backend:') print('Starting backend:')
print(' '.join(cmdline)) print(' '.join(cmdline))
print() print()
self.process = subprocess.Popen(cmdline, close_fds=False, universal_newlines=False, self.process = subproc.Popen(cmdline, close_fds=False, universal_newlines=False,
creationflags=creationflags, console=False) creationflags=creationflags, console=False)
os.close(self.pipe_write_fd) os.close(self.pipe_write_fd)

0
qspectrumanalyzer/subprocess.py → qspectrumanalyzer/subproc.py
View File