Skip to content

Commit

Permalink
Rearranged UI to fit in standard height (768).
Browse files Browse the repository at this point in the history
  • Loading branch information
@capn-freako
capn-freako committed Sep 13, 2018
1 parent 28f8351 commit ecb226c
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 71 deletions.
3 changes: 1 addition & 2 deletions make_tags
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/env sh

ctags -R

etags -o TAGS pybert/*.py
38 changes: 1 addition & 37 deletions pybert/pybert.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
make_ctle, lfsr_bits, safe_log10, pulse_center
from pybert.pybert_plot import make_plots
from pybert.pybert_help import help_str
from pybert.pybert_cfg import PyBertCfg

import pybert

Expand Down Expand Up @@ -140,6 +139,7 @@ def stopped(self):
'Should be called by thread (i.e. - subclass) periodically and, if this function returns True, thread should clean itself up and quit ASAP.'
return self._stop_event.is_set()


class TxOptThread(StoppableThread):
'Used to run Tx tap weight optimization in its own thread, in order to preserve GUI responsiveness.'

Expand Down Expand Up @@ -519,8 +519,6 @@ class PyBERT(HasTraits):
btn_abort = Button(label = 'Abort')
btn_cfg_tx = Button(label = 'Configure')
btn_cfg_rx = Button(label = 'Configure')
btn_save_cfg = Button(label = 'Save Config.')
btn_load_cfg = Button(label = 'Load Config.')

# Logger
def log(self, msg):
Expand Down Expand Up @@ -637,40 +635,6 @@ def _btn_cfg_tx_fired(self):
def _btn_cfg_rx_fired(self):
self._rx_cfg()

def _btn_save_cfg_fired(self):
dlg = FileDialog(action='save as', wildcard='*.pybert_cfg', default_path=self.cfg_file)
if dlg.open() == OK:
the_PyBertCfg = PyBertCfg(self)
try:
with open(dlg.path, 'wt') as the_file:
pickle.dump(the_PyBertCfg, the_file)
self.cfg_file = dlg.path
except Exception as err:
err.message = "The following error occured:\n\t{}\nThe configuration was NOT saved.".format(err.message)
self.handle_error(err)

def _btn_load_cfg_fired(self):
dlg = FileDialog(action='open', wildcard='*.pybert_cfg', default_path=self.cfg_file)
if dlg.open() == OK:
try:
with open(dlg.path, 'rt') as the_file:
the_PyBertCfg = pickle.load(the_file)
if(type(the_PyBertCfg) is not PyBertCfg):
raise Exception("The data structure read in is NOT of type: PyBertCfg!")
for prop, value in vars(the_PyBertCfg).iteritems():
if(prop == 'tx_taps'):
i = 0
for (enabled, val) in value:
setattr(self.tx_taps[i], 'enabled', enabled)
setattr(self.tx_taps[i], 'value', val)
i += 1
else:
setattr(self, prop, value)
self.cfg_file = dlg.path
except Exception as err:
err.message = "The following error occured:\n\t{}\nThe configuration was NOT loaded.".format(err.message)
self.handle_error(err)


# Independent variable setting intercepts
# (Primarily, for debugging.)
Expand Down
105 changes: 73 additions & 32 deletions pybert/pybert_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@

from pybert_cntrl import my_run_sweeps
from pybert_data import PyBertData
from pybert_cfg import PyBertCfg


class RunSimThread(Thread):
'Used to run the simulation in its own thread, in order to preserve GUI responsiveness.'

def run(self):
my_run_sweeps(self.the_pybert)


class MyHandler(Handler):
"""This handler is instantiated by the View and handles user button clicks."""

Expand All @@ -45,6 +48,47 @@ def do_run_simulation(self, info):
self.run_sim_thread.the_pybert = the_pybert
self.run_sim_thread.start()

def do_stop_simulation(self, info):
the_pybert = info.object
if self.run_sim_thread and self.run_sim_thread.isAlive():
self.run_sim_thread.stop()

def do_save_cfg(self, info):
the_pybert = info.object
dlg = FileDialog(action='save as', wildcard='*.pybert_cfg', default_path=the_pybert.cfg_file)
if dlg.open() == OK:
the_PyBertCfg = PyBertCfg(the_pybert)
try:
with open(dlg.path, 'wt') as the_file:
pickle.dump(the_PyBertCfg, the_file)
the_pybert.cfg_file = dlg.path
except Exception as err:
err.message = "The following error occured:\n\t{}\nThe configuration was NOT saved.".format(err.message)
the_pybert.handle_error(err)

def do_load_cfg(self, info):
the_pybert = info.object
dlg = FileDialog(action='open', wildcard='*.pybert_cfg', default_path=the_pybert.cfg_file)
if dlg.open() == OK:
try:
with open(dlg.path, 'rt') as the_file:
the_PyBertCfg = pickle.load(the_file)
if(type(the_PyBertCfg) is not PyBertCfg):
raise Exception("The data structure read in is NOT of type: PyBertCfg!")
for prop, value in vars(the_PyBertCfg).iteritems():
if(prop == 'tx_taps'):
i = 0
for (enabled, val) in value:
setattr(the_pybert.tx_taps[i], 'enabled', enabled)
setattr(the_pybert.tx_taps[i], 'value', val)
i += 1
else:
setattr(the_pybert, prop, value)
the_pybert.cfg_file = dlg.path
except Exception as err:
err.message = "The following error occured:\n\t{}\nThe configuration was NOT loaded.".format(err.message)
the_pybert.handle_error(err)

def do_save_data(self, info):
the_pybert = info.object
dlg = FileDialog(action='save as', wildcard='*.pybert_data', default_path=the_pybert.data_file)
Expand Down Expand Up @@ -129,9 +173,12 @@ def do_load_data(self, info):
err.message = "The following error occured:\n\t{}\nThe waveform data was NOT loaded.".format(err.message)
the_pybert.handle_error(err)

run_simulation = Action(name="Run", action="do_run_simulation")
run_sim = Action(name="Run", action="do_run_simulation")
stop_sim = Action(name="Stop", action="do_stop_simulation")
save_data = Action(name="Save Results", action="do_save_data")
load_data = Action(name="Load Results", action="do_load_data")
save_cfg = Action(name="Save Config.", action="do_save_cfg")
load_cfg = Action(name="Load Config.", action="do_load_cfg")

# Main window layout definition.
traits_view = View(
Expand Down Expand Up @@ -172,9 +219,9 @@ def do_load_data(self, info):
),
),
HGroup(
Item('btn_save_cfg', show_label=False, tooltip="Store the current simulation configuration data to a file.",),
Item('btn_load_cfg', show_label=False, tooltip="Load the simulation configuration data from a file.",),
Item('cfg_file', show_label=False, style='readonly'),
Item(name='thresh', label='Pj Threshold (sigma)', tooltip="Threshold for identifying periodic jitter spectral elements. (sigma)", ),
Item(name='impulse_length', label='Impulse Response Length (ns)', tooltip="Manual impulse response length override", ),
label='Analysis Parameters', show_border=True,
),
label='Simulation Control', show_border=True,
),
Expand Down Expand Up @@ -309,46 +356,39 @@ def do_load_data(self, info):
),
label='Rx Equalization', show_border=True,
),
springy=True,
),
HGroup(
HGroup(
VGroup(
VGroup(
HGroup(
Item(name='delta_t', label='Delta-t (ps)', tooltip="magnitude of CDR proportional branch", ),
Item(name='alpha', label='Alpha', tooltip="relative magnitude of CDR integral branch", ),
Item(name='n_lock_ave', label='Lock Nave.', tooltip="# of UI estimates to average, when determining lock", ),
),
VGroup(
HGroup(
Item(name='n_lock_ave', label='Lock Nave.', tooltip="# of UI estimates to average, when determining lock", ),
Item(name='rel_lock_tol', label='Lock Tol.', tooltip="relative tolerance for determining lock", ),
Item(name='lock_sustain', label='Lock Sus.', tooltip="length of lock determining hysteresis vector", ),
),
label='CDR Parameters', show_border=True,
# enabled_when='rx_use_ami == False or rx_use_ami == True and rx_use_getwave == False',
),
HGroup(
VGroup(
Item(name='gain', label='Gain', tooltip="error feedback gain", ),
Item(name='n_taps', label='Taps', tooltip="# of taps", ),
Item(name='decision_scaler', label='Level', tooltip="target output magnitude", ),
enabled_when='use_dfe == True',
VGroup(
Item(name='use_dfe', label='Use DFE', tooltip="Include DFE in simulation.", ),
Item(name='sum_ideal', label='Ideal DFE', tooltip="Use ideal DFE. (performance boost)", enabled_when='use_dfe == True', ),
),
VGroup(
HGroup(
Item(name='n_taps', label='Taps', tooltip="# of taps", ),
Item(name='gain', label='Gain', tooltip="error feedback gain", ),
Item(name='decision_scaler', label='Level', tooltip="target output magnitude", ),
),
VGroup(
VGroup(
Item(name='n_ave', label='Nave.', tooltip="# of CDR adaptations per DFE adaptation", ),
Item(name='sum_bw', label='BW (GHz)', tooltip="summing node bandwidth", enabled_when='sum_ideal == False'),
enabled_when='use_dfe == True',
),
HGroup(
Item(name='use_dfe', label='Use DFE', tooltip="Include DFE in simulation.", ),
Item(name='sum_ideal', label='Ideal DFE', tooltip="Use ideal DFE. (performance boost)", enabled_when='use_dfe == True', ),
),
HGroup(
Item(name='n_ave', label='Nave.', tooltip="# of CDR adaptations per DFE adaptation", ),
Item(name='sum_bw', label='BW (GHz)', tooltip="summing node bandwidth", enabled_when='sum_ideal == False'),
),
label='DFE Parameters', show_border=True,
# enabled_when='rx_use_ami == False or rx_use_ami == True and rx_use_getwave == False',
),
VGroup(
Item(name='thresh', label='Pj Threshold (sigma)', tooltip="Threshold for identifying periodic jitter spectral elements. (sigma)", ),
Item(name='impulse_length', label='Impulse Response Length (ns)', tooltip="Manual impulse response length override", ),
label='Analysis Parameters', show_border=True,
enabled_when='use_dfe == True',
# enabled_when='rx_use_ami == False or rx_use_ami == True and rx_use_getwave == False',
),
),
# spring,
Expand Down Expand Up @@ -485,9 +525,10 @@ def do_load_data(self, info):
),
resizable = True,
handler = MyHandler(),
buttons = [run_simulation, save_data, load_data],
buttons = [run_sim, save_cfg, load_cfg, save_data, load_data],
statusbar = "status_str",
title='PyBERT',
width=0.95, height=0.95
width=0.95,
height=768,
)

0 comments on commit ecb226c

Please sign in to comment.