Skip to content

initial python3/wxPython4 support #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Evidlo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

initial python3/wxPython4 support #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rtlsdr_scanner/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import rtlsdr # @UnusedImport
import wx # @UnusedImport
except ImportError as error:
print 'Import error: {}'.format(error)
print('Import error: {}'.format(error))
input('\nError importing libraries\nPress [Return] to exit')
exit(1)

Expand Down Expand Up @@ -109,20 +109,20 @@ def __arguments():
args.dirname, args.filename = os.path.split(args.file)

if error is not None:
print "Error: {}".format(error)
print("Error: {}".format(error))
parser.exit(1)

return isGui, (args)


if __name__ == '__main__':
print APP_NAME + "\n"
print(APP_NAME + "\n")

isGui, args = __arguments()
if isGui:
app = RtlSdrScanner()
app.SetClassName(APP_NAME)
wx.Locale().Init2()
wx.Locale().Init()
frame = FrameMain(APP_NAME)
if args.file is not None:
frame.open(os.path.abspath(args.dirname), args.filename)
Expand All @@ -131,5 +131,5 @@ def __arguments():
try:
Cli(args)
except KeyboardInterrupt:
print '\nAborted'
print('\nAborted')
exit(1)
44 changes: 22 additions & 22 deletions rtlsdr_scanner/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

import Queue
from six.moves import queue as Queue
from collections import OrderedDict
import os
import sys
from threading import Thread
import threading
import time
from urlparse import urlparse
from six.moves.urllib.parse import urlparse

from rtlsdr_scanner.constants import SAMPLE_RATE
from rtlsdr_scanner.devices import DeviceRTL, get_devices_rtl
Expand Down Expand Up @@ -126,7 +126,7 @@ def __init__(self, args):
error = 'No devices found'

if error is not None:
print "Error: {}".format(error)
print("Error: {}".format(error))
exit(1)

self.settings.start = start
Expand All @@ -137,19 +137,19 @@ def __init__(self, args):
self.settings.devicesRtl[index].gain = gain
self.settings.devicesRtl[index].lo = lo

print "{} - {}MHz".format(start, end)
print "{} Sweeps".format(sweeps)
print "{}dB Gain".format(gain)
print "{}s Dwell".format(self.settings.dwell)
print "{} FFT points".format(nfft)
print "{}MHz LO".format(lo)
print("{} - {}MHz".format(start, end))
print("{} Sweeps".format(sweeps))
print("{}dB Gain".format(gain))
print("{}s Dwell".format(self.settings.dwell))
print("{} FFT points".format(nfft))
print("{}MHz LO".format(lo))
if remote is not None:
print remote
print(remote)
else:
print self.settings.devicesRtl[index].name
print(self.settings.devicesRtl[index].name)

if len(self.settings.devicesGps):
print 'Using GPS configuration \'{}\''.format(self.settings.devicesGps[0].name)
print('Using GPS configuration \'{}\''.format(self.settings.devicesGps[0].name))
self.threadLocation = ThreadLocation(self.queueLocation,
self.settings.devicesGps[0])
if not self.__gps_wait():
Expand All @@ -169,10 +169,10 @@ def __init__(self, args):
export_plot(fullName, exportType, self.spectrum)

self.__gps_stop()
print "Done"
print("Done")

def __gps_wait(self):
print '\nWaiting for GPS fix: {}'.format(self.settings.devicesGps[0].get_desc())
print('\nWaiting for GPS fix: {}'.format(self.settings.devicesGps[0].get_desc()))

while True:
if not self.queueLocation.empty():
Expand All @@ -191,7 +191,7 @@ def __scan(self, sweeps, settings, index):
samples = next_2_to_pow(int(samples))

for sweep in range(0, sweeps):
print '\nSweep {}:'.format(sweep + 1)
print('\nSweep {}:'.format(sweep + 1))
threadScan = ThreadScan(self.queueNotify, self.queueScan, None,
settings, index, samples, False)
while threadScan.isAlive() or self.steps > 0:
Expand All @@ -200,11 +200,11 @@ def __scan(self, sweeps, settings, index):
if not self.queueLocation.empty():
self.__process_event(self.queueLocation)
if self.settings.scanDelay > 0 and sweep < sweeps - 1:
print '\nDelaying {}s'.format(self.settings.scanDelay)
print('\nDelaying {}s'.format(self.settings.scanDelay))
time.sleep(self.settings.scanDelay)
threadScan.rtl_close()
print ""
print ""
print("")
print("")

def __process_event(self, queue):
event = queue.get()
Expand All @@ -213,7 +213,7 @@ def __process_event(self, queue):
arg2 = event.data.get_arg2()

if status == Event.STARTING:
print "Starting"
print("Starting")
elif status == Event.STEPS:
self.stepsTotal = (arg1 + 1) * 2
self.steps = self.stepsTotal
Expand All @@ -232,7 +232,7 @@ def __process_event(self, queue):
process.start()
self.__progress()
elif status == Event.ERROR:
print "Error: {}".format(arg2)
print("Error: {}".format(arg2))
exit(1)
elif status == Event.PROCESSED:
offset = self.settings.devicesRtl[self.settings.indexRtl].offset
Expand All @@ -253,7 +253,7 @@ def __process_event(self, queue):
arg2[1],
arg2[2])
elif status == Event.LOC_ERR:
print 'Error: {}'.format(arg2)
print('Error: {}'.format(arg2))
exit(1)

return status
Expand All @@ -265,5 +265,5 @@ def __progress(self):


if __name__ == '__main__':
print 'Please run rtlsdr_scan.py'
print('Please run rtlsdr_scan.py')
exit(1)
2 changes: 1 addition & 1 deletion rtlsdr_scanner/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,5 @@ class Markers(object):


if __name__ == '__main__':
print 'Please run rtlsdr_scan.py'
print('Please run rtlsdr_scan.py')
exit(1)
6 changes: 3 additions & 3 deletions rtlsdr_scanner/devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ def get_devices_rtl(currentDevices=None, statusBar=None):


def format_device_rtl_name(name):
remove = ["/", "\\"]
remove = [b"/", b"\\"]
for char in remove:
name = name.replace(char, " ")
name = name.replace(char, b" ")

return name


if __name__ == '__main__':
print 'Please run rtlsdr_scan.py'
print('Please run rtlsdr_scan.py')
exit(1)
12 changes: 6 additions & 6 deletions rtlsdr_scanner/dialogs_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

import Queue
from six.moves import queue as Queue
import copy
from urlparse import urlparse
from six.moves.urllib.parse import urlparse

from wx import grid
import wx
Expand Down Expand Up @@ -74,7 +74,7 @@ def __init__(self, parent, devices, settings):
dc.SetFont(self.gridDev.GetLabelFont())
maxHeight = 0
for i in range(self.COLS - 1):
_w, h, _hl = dc.GetMultiLineTextExtent(self.gridDev.GetColLabelValue(i))
_w, h, _hl = dc.GetFullMultiLineTextExtent(self.gridDev.GetColLabelValue(i))
if h > maxHeight:
maxHeight = h
self.gridDev.SetColLabelSize(maxHeight * 1.25)
Expand Down Expand Up @@ -284,12 +284,12 @@ def __init__(self, parent, settings):
wx.Dialog.__init__(self, parent=parent, title="GPS")

self.checkGps = wx.CheckBox(self, wx.ID_ANY, "Enable GPS")
self.checkGps.SetToolTipString('Record GPS locations in scans')
self.checkGps.SetToolTip('Record GPS locations in scans')
self.checkGps.SetValue(settings.gps)
self.Bind(wx.EVT_CHECKBOX, self.__on_check, self.checkGps)

self.checkGpsRetry = wx.CheckBox(self, wx.ID_ANY, "Retry after disconnection")
self.checkGpsRetry.SetToolTipString('Retry GPS if disconnected')
self.checkGpsRetry.SetToolTip('Retry GPS if disconnected')
self.checkGpsRetry.SetValue(settings.gpsRetry)
self.checkGpsRetry.Enable(settings.gps)

Expand Down Expand Up @@ -714,5 +714,5 @@ def __add_raw(self, text):


if __name__ == '__main__':
print 'Please run rtlsdr_scan.py'
print('Please run rtlsdr_scan.py')
exit(1)
20 changes: 10 additions & 10 deletions rtlsdr_scanner/dialogs_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

import Queue
import cPickle
from six.moves import queue as Queue
from six.moves import cPickle
import os

from PIL import Image
Expand Down Expand Up @@ -377,7 +377,7 @@ def __init__(self, parent, spectrum, settings):

self.textSize = wx.StaticText(self)
buttonSize = wx.Button(self, label='Change...')
buttonSize.SetToolTipString('Change exported image size')
buttonSize.SetToolTip('Change exported image size')
self.Bind(wx.EVT_BUTTON, self.__on_imagesize, buttonSize)
self.__show_image_size()

Expand Down Expand Up @@ -610,7 +610,7 @@ def __init__(self, parent, spectrum, location, settings):

textMesh = wx.StaticText(self, label='Mesh')
self.checkMesh = wx.CheckBox(self, label='On')
self.checkMesh.SetToolTipString('Signal level mesh')
self.checkMesh.SetToolTip('Signal level mesh')
self.checkMesh.SetValue(self.plotMesh)
self.Bind(wx.EVT_CHECKBOX, self.__on_mesh, self.checkMesh)
self.choiceMapMesh = wx.Choice(self, choices=colours)
Expand All @@ -628,7 +628,7 @@ def __init__(self, parent, spectrum, location, settings):
colours = get_colours()
textHeat = wx.StaticText(self, label='Heat map')
self.checkHeat = wx.CheckBox(self, label='On')
self.checkHeat.SetToolTipString('GPS location heatmap')
self.checkHeat.SetToolTip('GPS location heatmap')
self.checkHeat.SetValue(self.plotHeat)
self.Bind(wx.EVT_CHECKBOX, self.__on_heat, self.checkHeat)
self.choiceMapHeat = wx.Choice(self, choices=colours)
Expand All @@ -646,15 +646,15 @@ def __init__(self, parent, spectrum, location, settings):
textRange = wx.StaticText(self, label='Range')
textCentre = wx.StaticText(self, label='Centre')
self.spinCentre = wx.SpinCtrl(self)
self.spinCentre.SetToolTipString('Centre frequency (kHz)')
self.spinCentre.SetToolTip('Centre frequency (kHz)')
self.spinCentre.SetRange(freqMin, freqMax)
self.spinCentre.SetValue(freqMin + bw / 2)
sizerCentre = wx.BoxSizer(wx.HORIZONTAL)
sizerCentre.Add(textCentre, flag=wx.ALL, border=5)
sizerCentre.Add(self.spinCentre, flag=wx.ALL, border=5)
textBw = wx.StaticText(self, label='Bandwidth')
self.spinBw = wx.SpinCtrl(self)
self.spinBw.SetToolTipString('Bandwidth (kHz)')
self.spinBw.SetToolTip('Bandwidth (kHz)')
self.spinBw.SetRange(1, bw)
self.spinBw.SetValue(bw / 10)
sizerBw = wx.BoxSizer(wx.HORIZONTAL)
Expand All @@ -671,7 +671,7 @@ def __init__(self, parent, spectrum, location, settings):
textOutput = wx.StaticText(self, label='Output')
self.textRes = wx.StaticText(self)
buttonRes = wx.Button(self, label='Change...')
buttonRes.SetToolTipString('Change output resolution')
buttonRes.SetToolTip('Change output resolution')
self.Bind(wx.EVT_BUTTON, self.__on_imageres, buttonRes)
sizerRes = wx.BoxSizer(wx.HORIZONTAL)
sizerRes.Add(self.textRes, flag=wx.ALL, border=5)
Expand Down Expand Up @@ -762,7 +762,7 @@ def __draw_plot(self):
y = []
z = []

for coord, peak in coords.iteritems():
for coord, peak in coords.items():
x.append(coord[1])
y.append(coord[0])
z.append(peak)
Expand Down Expand Up @@ -1071,5 +1071,5 @@ def get_restored(self):


if __name__ == '__main__':
print 'Please run rtlsdr_scan.py'
print('Please run rtlsdr_scan.py')
exit(1)
2 changes: 1 addition & 1 deletion rtlsdr_scanner/dialogs_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,5 @@ def __init__(self, parent):


if __name__ == '__main__':
print 'Please run rtlsdr_scan.py'
print('Please run rtlsdr_scan.py')
exit(1)
Loading