fixed some styling issues, removed obsolete function
This commit is contained in:
parent
0a40fce4d9
commit
a1824dc7f4
67
qrzlogger.py
67
qrzlogger.py
|
@ -120,12 +120,11 @@ class QRZLogger():
|
||||||
'api_key': '1234-ABCD-1234-A1B2',
|
'api_key': '1234-ABCD-1234-A1B2',
|
||||||
'qrz_user': 'MYCALL',
|
'qrz_user': 'MYCALL',
|
||||||
'qrz_pass': 'my_secret_password',
|
'qrz_pass': 'my_secret_password',
|
||||||
'xml_fields': '("call", "band", "mode", "qso_date",\
|
'xml_fields': '("call", "band", "mode", "qso_date", "time_on", "rst_sent", "rst_rcvd", "comment")'}
|
||||||
"time_on", "rst_sent", "rst_rcvd", "comment")'}
|
|
||||||
config['log'] = {
|
config['log'] = {
|
||||||
'log_file': '/tmp/qrzlogger.log'}
|
'log_file': '/tmp/qrzlogger.log'}
|
||||||
config['qso_defaults'] = {
|
config['qso_defaults'] = {
|
||||||
'band': '20',
|
'band': '20m',
|
||||||
'mode': 'SSB',
|
'mode': 'SSB',
|
||||||
'rst_rcvd': '59',
|
'rst_rcvd': '59',
|
||||||
'rst_sent': '59',
|
'rst_sent': '59',
|
||||||
|
@ -140,19 +139,19 @@ class QRZLogger():
|
||||||
'tablecol': 'light_blue',
|
'tablecol': 'light_blue',
|
||||||
'logocol': 'yellow'}
|
'logocol': 'yellow'}
|
||||||
config['bandfreqs'] = {
|
config['bandfreqs'] = {
|
||||||
'160': '1.850',
|
'160m': '1.850',
|
||||||
'80': '3.700',
|
'80m': '3.700',
|
||||||
'60': '5.355',
|
'60m': '5.355',
|
||||||
'40': '7.100',
|
'40m': '7.100',
|
||||||
'30': '10.130',
|
'30m': '10.130',
|
||||||
'20': '14.200',
|
'20m': '14.200',
|
||||||
'17': '18.130',
|
'17m': '18.130',
|
||||||
'15': '21.200',
|
'15m': '21.200',
|
||||||
'12': '24.950',
|
'12m': '24.950',
|
||||||
'10': '28.500',
|
'10m': '28.500',
|
||||||
'6': '50.150',
|
'6m': '50.150',
|
||||||
'2': '145.500',
|
'2m': '145.500',
|
||||||
'70': '432.300' }
|
'70cm': '432.300' }
|
||||||
|
|
||||||
with open(file_name, 'w') as configfile:
|
with open(file_name, 'w') as configfile:
|
||||||
config.write(configfile)
|
config.write(configfile)
|
||||||
|
@ -449,34 +448,6 @@ class QRZLogger():
|
||||||
# User Interaction Functions #
|
# User Interaction Functions #
|
||||||
#####################################################
|
#####################################################
|
||||||
|
|
||||||
def get_band_from_freq(self, freq):
|
|
||||||
bandfreq = freq.split('.',1)[0]
|
|
||||||
if bandfreq == "1":
|
|
||||||
return "160m"
|
|
||||||
elif bandfreq == "3":
|
|
||||||
return "80m"
|
|
||||||
elif bandfreq == "5":
|
|
||||||
return "60m"
|
|
||||||
elif bandfreq == "7":
|
|
||||||
return "40m"
|
|
||||||
elif bandfreq == "10":
|
|
||||||
return "30m"
|
|
||||||
elif bandfreq == "14":
|
|
||||||
return "20m"
|
|
||||||
elif bandfreq == "18":
|
|
||||||
return "17m"
|
|
||||||
elif bandfreq == "21":
|
|
||||||
return "15m"
|
|
||||||
elif bandfreq == "24":
|
|
||||||
return "12m"
|
|
||||||
elif bandfreq == "28":
|
|
||||||
return "10m"
|
|
||||||
elif bandfreq == "29":
|
|
||||||
return "10m"
|
|
||||||
elif bandfreq == "50":
|
|
||||||
return "6m"
|
|
||||||
|
|
||||||
|
|
||||||
def query_qso_data(self, qso):
|
def query_qso_data(self, qso):
|
||||||
"""Queries QSO specific data from the user via
|
"""Queries QSO specific data from the user via
|
||||||
the command line"""
|
the command line"""
|
||||||
|
@ -564,7 +535,6 @@ class QRZLogger():
|
||||||
logid = self.send_qso(self.qso, call)
|
logid = self.send_qso(self.qso, call)
|
||||||
if logid and logid != "null":
|
if logid and logid != "null":
|
||||||
break
|
break
|
||||||
else:
|
|
||||||
answer = input("\n" + self.inputcol + "QSO Upload failed. Retry? [" + \
|
answer = input("\n" + self.inputcol + "QSO Upload failed. Retry? [" + \
|
||||||
self.defvalcol + "y/n" + self.inputcol + "]: " + attr('reset'))
|
self.defvalcol + "y/n" + self.inputcol + "]: " + attr('reset'))
|
||||||
answer = answer.upper()
|
answer = answer.upper()
|
||||||
|
@ -582,14 +552,13 @@ class QRZLogger():
|
||||||
self.recent_qsos.pop(0)
|
self.recent_qsos.pop(0)
|
||||||
done = True
|
done = True
|
||||||
break
|
break
|
||||||
else:
|
|
||||||
break
|
break
|
||||||
elif answer == "C":
|
if answer == "C":
|
||||||
done = True
|
done = True
|
||||||
break
|
break
|
||||||
elif answer == "N":
|
if answer == "N":
|
||||||
break
|
break
|
||||||
elif answer == "QUIT":
|
if answer == "QUIT":
|
||||||
sys.exit()
|
sys.exit()
|
||||||
return done
|
return done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue