Skip to content

WIP: Basic config loading works. #105

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Basic config loading works. #105

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
98 changes: 69 additions & 29 deletions yeadon/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,28 @@

from numpy import deg2rad, rad2deg

from traits.api import HasTraits, Range, Instance, \
on_trait_change, Float, Property, File, Bool, Button
from traitsui.api import \
View, Item, VSplit, VGroup, HSplit, HGroup, Group, Label
from traits.api import (HasTraits, Range, Instance, on_trait_change, Float,
Property, File, Bool, Button)
from traitsui.api import (View, Item, VSplit, VGroup, HSplit, HGroup, Group,
Label)

from mayavi.core.ui.api import MayaviScene, MlabSceneModel, SceneEditor

from human import Human

sliders = Human.CFGnames

def format_func(value):

def _format_func(value):
return '{:1.3}'.format(value)


class YeadonGUI(HasTraits):
"""A GUI for the yeadon module, implemented using the traits package."""

# Input.
measurement_file_name = File()
configuration_file_name = File()

# Drawing options.
show_mass_center = Bool(False)
Expand All @@ -29,10 +32,10 @@ class YeadonGUI(HasTraits):
# Configuration variables.
opts = {'enter_set': True, 'auto_set': True, 'mode': 'slider'}
for name, bounds in zip(Human.CFGnames, Human.CFGbounds):
# TODO : Find a better way than using locals here, it may not be a good
# idea, but I don't know the consequences.
locals()[name] = Range(float(rad2deg(bounds[0])),
float(rad2deg(bounds[1])), 0.0, **opts)
# TODO : Find a better way than using locals here, it may not be a
# good idea, but I don't know the consequences.
locals()[name] = Range(float(rad2deg(bounds[0])),
float(rad2deg(bounds[1])), 0.0, **opts)

reset_configuration = Button()

Expand All @@ -52,7 +55,8 @@ class YeadonGUI(HasTraits):

scene = Instance(MlabSceneModel, args=())

input_group = Group(Item('measurement_file_name'))
input_group = Group(Item('measurement_file_name'),
Item('configuration_file_name'))

vis_group = Group(Item('scene',
editor=SceneEditor(scene_class=MayaviScene), height=580, width=430,
Expand Down Expand Up @@ -107,26 +111,26 @@ class YeadonGUI(HasTraits):
inertia_prop = VGroup(
Label('Mass center (from origin of coord. sys.) (m):'),
HGroup(
Item('x', style='readonly', format_func=format_func),
Item('y', style='readonly', format_func=format_func),
Item('z', style='readonly', format_func=format_func)
Item('x', style='readonly', format_func=_format_func),
Item('y', style='readonly', format_func=_format_func),
Item('z', style='readonly', format_func=_format_func)
),
Label('Inertia tensor (about origin, in basis shown) (kg-m^2):'),
HSplit( # HSplit 2
Group(
Item('Ixx', style='readonly', format_func=format_func),
Item('Iyx', style='readonly', format_func=format_func),
Item('Izx', style='readonly', format_func=format_func),
Item('Ixx', style='readonly', format_func=_format_func),
Item('Iyx', style='readonly', format_func=_format_func),
Item('Izx', style='readonly', format_func=_format_func),
),
Group(
Item('Ixy', style='readonly', format_func=format_func),
Item('Iyy', style='readonly', format_func=format_func),
Item('Izy', style='readonly', format_func=format_func),
Item('Ixy', style='readonly', format_func=_format_func),
Item('Iyy', style='readonly', format_func=_format_func),
Item('Izy', style='readonly', format_func=_format_func),
),
Group(
Item('Ixz', style='readonly', format_func=format_func),
Item('Iyz', style='readonly', format_func=format_func),
Item('Izz', style='readonly', format_func=format_func)
Item('Ixz', style='readonly', format_func=_format_func),
Item('Iyz', style='readonly', format_func=_format_func),
Item('Izz', style='readonly', format_func=_format_func)
),
), # end HSplit 2
Label('X, Y, Z axes drawn as red, green, blue arrows, respectively.'),
Expand Down Expand Up @@ -172,16 +176,17 @@ class YeadonGUI(HasTraits):
0.1205, 'Lb7w' : 0.047, 'Lj7p' : 0.252, 'Lb7L' : 0.1545, 'Ls3L' : 0.388,
'Lk7p' : 0.252 }

def __init__(self, meas_in=None):
def __init__(self, meas_in=None, config_in=None):

HasTraits.__init__(self, trait_value=True)
if meas_in:
measurement_file_name = meas_in
else:
measurement_file_name = 'Path to measurement input text file.'
self.H = Human(meas_in if meas_in else self.measPreload)

self.H = Human(meas_in=meas_in if meas_in else self.measPreload,
CFG=config_in)

self._init_draw_human()

def _init_draw_human(self):

self.H.draw(self.scene.mlab, True)

if self.show_mass_center:
Expand Down Expand Up @@ -236,7 +241,42 @@ def _update_measurement_file_name(self):
# Must convert to str (from unicode), because Human parses it
# differently depending on its type, and there's no consideration for
# it being unicode.
self.H = Human(str(self.measurement_file_name))

if str(self.measurement_file_name) == '':
meas_in = self.measPreload
else:
meas_in = str(self.measurement_file_name)

if str(self.configuration_file_name) == '':
cfg_in = None
else:
cfg_in = str(self.configuration_file_name)

self.H = Human(meas_in,
CFG=cfg_in)
self.scene.mlab.clf()
self._init_draw_human()

@on_trait_change('configuration_file_name')
def _update_configuration_file_name(self):
# Must convert to str (from unicode), because Human parses it
# differently depending on its type, and there's no consideration for
# it being unicode.

print('Meas file {}'.format(self.measurement_file_name))
print('Config file {}'.format(self.configuration_file_name))

if str(self.measurement_file_name) == '':
meas_in = self.measPreload
else:
meas_in = str(self.measurment_file_name)

if str(self.configuration_file_name) == '':
cfg_in = None
else:
cfg_in = str(self.configuration_file_name)

self.H = Human(meas_in, CFG=cfg_in)
self.scene.mlab.clf()
self._init_draw_human()

Expand Down
31 changes: 19 additions & 12 deletions yeadon/human.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,19 @@ def __init__(self, meas_in, CFG=None, symmetric=True,
if self.is_symmetric == True:
self._average_limbs()

# Start off a zero configuration.
self.CFG = dict()
for key in Human.CFGnames:
self.CFG[key] = 0.0
# If configuration input is a dictionary, assign via public method.
# Else, read in the file.
if CFG is None:
# Start off a zero configuration.
self.CFG = dict()
for key in Human.CFGnames:
self.CFG[key] = 0.0
elif isinstance(CFG, dict):
self.set_CFG_dict(CFG)
elif isinstance(CFG, str):
self._read_CFG(CFG)
else:
raise ValueError('Not a valid CFG value.')

# update will define all solids, validate CFG, define segments,
# and calculate segment and human mass properties.
Expand All @@ -211,12 +220,6 @@ def __init__(self, meas_in, CFG=None, symmetric=True,
if self.meas_mass > 0:
self.scale_human_by_mass(self.meas_mass)

# If configuration input is a dictionary, assign via public method.
# Else, read in the file.
if type(CFG) == dict:
self.set_CFG_dict(CFG)
elif type(CFG) == str:
self._read_CFG(CFG)

def update(self):
"""Redefines all solids and then calls yeadon.Human._update_segments.
Expand Down Expand Up @@ -357,6 +360,11 @@ def set_CFG_dict(self, CFG):
self.CFG = CFG
self._update_segments()

def set_CFG_from_file(self, filename):

self._read_CFG(filename)
self._update_segments()

def calc_properties(self):
"""Calculates the mass, center of mass, and inertia tensor of the
human. The quantities are calculated from the segment quantities.
Expand Down Expand Up @@ -1513,7 +1521,7 @@ def _read_CFG(self, CFGfname):
"""
self.CFG = dict()
with open(CFGfname, 'r') as fid:
mydict = yaml.load(fid.read())
mydict = yaml.load(fid)
for key, val in mydict.items():
if key in self._deprecated_CFGnames.keys():
msg = ("'{0}' should be called '{1}'."
Expand All @@ -1528,7 +1536,6 @@ def _read_CFG(self, CFGfname):
raise StandardError(
"Variable {0} has no value.".format(key))
self.CFG[key] = float(val)
fid.close()

if len(self.CFG) != len(self.CFGnames):
raise StandardError("Number of CFG variables, {0}, is "
Expand Down