nfr
/
SigMF
mirror of https://github.com/gnuradio/SigMF
1
0
Fork 0
Code Releases Activity
Browse Source

sorted out entry point for gui; fixed some gui bugs; got gui into pip package; updated copyright notices

pull/152/head
Teque5 1 month ago
parent
7a8b44fa56
commit
90239a62cf
10 changed files with 35 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      setup.py
  2. 2
      sigmf/__init__.py
  3. 2
      sigmf/archive.py
  4. 2
      sigmf/error.py
  5. 32
      sigmf/gui.py
  6. 11
      sigmf/schema.py
  7. 2
      sigmf/sigmf_hash.py
  8. 2
      sigmf/sigmffile.py
  9. 2
      sigmf/utils.py
  10. 2
      sigmf/validate.py

5
setup.py
View File

@ -30,7 +30,10 @@ setup(
'Programming Language :: Python :: 3.8',
],
entry_points={
'console_scripts': ['sigmf_validate=sigmf.validate:main']
'console_scripts': [
'sigmf_validate = sigmf.validate:main',
'sigmf_gui = sigmf.gui:main [gui]',
]
},
packages=['sigmf'],
package_data={

2
sigmf/__init__.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

2
sigmf/archive.py
View File

@ -1,4 +1,4 @@
# Copyright 2017 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

2
sigmf/error.py
View File

@ -1,4 +1,4 @@
# Copyright 2017 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

32
scripts/sigmf_gui.py → sigmf/gui.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python3
# Copyright 2020 The Johns Hopkins University Applied Physics Laboratory LLC. All Rights Reserved.
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@ -8,8 +7,8 @@
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@ -19,12 +18,15 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
'''GUI for creating & editing SigMF Files'''
from PySimpleGUI import *
from sigmf.sigmffile import SigMFFile, fromarchive, dtype_info
from sigmf.archive import SIGMF_ARCHIVE_EXT
import os
import warnings
from .sigmffile import SigMFFile, fromarchive, dtype_info
from .archive import SIGMF_ARCHIVE_EXT
warnings.filterwarnings("error")
validate_button = Button('Update', bind_return_key=False, enable_events=True)
@ -227,13 +229,13 @@ def add_sigmf_field(funct, values, field_name, *args, required=False, type=None,
return False
try:
input = int(input)
except:
except ValueError:
show_error('Expected an integer for: {}'.format(field_name))
return False
elif type == float:
try:
input = float(input)
except:
except ValueError:
show_error('Expected a double for: {}'.format(field_name))
return False
elif type == bool:
@ -241,7 +243,7 @@ def add_sigmf_field(funct, values, field_name, *args, required=False, type=None,
if input != 'False' and input != 'True':
raise ValueError('Unexpected input for boolean')
input = True if input == 'True' else False
except:
except ValueError:
show_error('Expected a bool for: {}'.format(field_name))
return False
Unit.convert(unit, input)
@ -251,7 +253,7 @@ def add_sigmf_field(funct, values, field_name, *args, required=False, type=None,
else:
funct(*args, input)
except UserWarning as w:
Popup('Warning: '.format(repr(w)), title='Warning')
Popup('Warning: {}'.format(repr(w)), title='Warning')
except Exception as e:
show_error(repr(e))
return False
@ -367,7 +369,7 @@ def add_capture(capture_data_input, values, capture_selector_dict, file_data, fr
combo_button.Update(values=tuple(new_values), value=new_val)
def run_gui():
def main():
window_input = WindowInput()
capture_data_input = CaptureData()
capture_text_blocks = dict()
@ -375,7 +377,7 @@ def run_gui():
f = SigMFFile()
capture_selector_dict = dict()
layout = [[Text('This is the APL SIGMF tool to archive RF datasets', size=(80, 1))],
layout = [[Text('This is the SigMF tool to archive RF datasets', size=(80, 1))],
[Text('Enter your data and signal captures below. You must include', auto_size_text=True),
Text('required', text_color='red', font=DEFAULT_FONT + ('italic',), auto_size_text=True),
Text('fields.', size=(50, 1), auto_size_text=True)],
@ -463,7 +465,7 @@ def run_gui():
[validate_button, Button('View Data')]]
)
window = Window('APL SigMF Archive Creator',
window = Window('SigMF Archive Creator',
auto_size_buttons=False,
default_element_size=(20, 1),
auto_size_text=False,
@ -601,7 +603,3 @@ def run_gui():
break
window.Close()
if __name__ == '__main__':
run_gui()

11
sigmf/schema.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@ -27,8 +27,15 @@ from . import utils
def get_schema(version=None):
'''
safe load json
In the future load specific schema versions.
'''
schema_file = os.path.join(
utils.get_schema_path(os.path.dirname(utils.__file__)),
'schema.json'
)
return json.load(open(schema_file))
with open(schema_file, 'rb') as handle:
schema = json.load(handle)
return schema

2
sigmf/sigmf_hash.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

2
sigmf/sigmffile.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

2
sigmf/utils.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

2
sigmf/validate.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 GNU Radio Foundation
# Copyright 2021 GNU Radio Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

Write Preview
Loading…
Cancel
Save