Skip to content

Install parameters on instance instead of class #510

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

Install parameters on instance instead of class #510

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
25 changes: 14 additions & 11 deletions concert/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,21 +336,21 @@ def __init__(self, fget=None, fset=None, fget_target=None, data=None, check=None
@memoize
def setter_name(self):
if self.fset:
return self.fset.__name__
return self.fset.__class__.__name__

return '_set_' + self.name

@memoize
def getter_name(self):
if self.fget:
return self.fget.__name__
return self.fget.__class__.__name__

return '_get_' + self.name

@memoize
def getter_name_target(self):
if self.fget_target:
return self.fget_target.__name__
return self.fget_target.__class__.__name__

return '_get_target_' + self.name

Expand Down Expand Up @@ -1247,8 +1247,8 @@ def install_parameters(self, params):
self._install_parameter(param)

# Obtain the object-dot notation.
merged_dict = dict(list(self.__class__.__dict__.items()) + list(params.items()))
self.__class__ = type(self.__class__.__name__, self.__class__.__bases__, merged_dict)
#merged_dict = dict(list(self.__class__.__dict__.items()) + list(params.items()))
#self.__class__ = type(self.__class__.__name__, self.__class__.__bases__, merged_dict)

def _install_parameter(self, param):
if isinstance(param, Quantity):
Expand All @@ -1265,18 +1265,21 @@ def _install_parameter(self, param):
getter_name = 'get_' + param.name
setter_name = 'set_' + param.name
target_getter_name = 'get_target_' + param.name
if getter_name not in self.__class__.__dict__:
if getter_name not in self.__dict__:
def get_parameter(instance, wait_on=None):
return instance[param.name].get(wait_on=wait_on)
setattr(self.__class__, getter_name, get_parameter)
if setter_name not in self.__class__.__dict__:
#setattr(self, getter_name, get_parameter)
self.__dict__[getter_name] = types.MethodType(get_parameter, self)
if setter_name not in self.__dict__:
def set_parameter(instance, parameter_value, wait_on=None):
return instance[param.name].set(parameter_value, wait_on=wait_on)
setattr(self.__class__, setter_name, set_parameter)
if target_getter_name not in self.__class__.__dict__:
#setattr(self, setter_name, set_parameter)
self.__dict__[setter_name] = types.MethodType(set_parameter, self)
if target_getter_name not in self.__dict__:
def get_target_parameter(instance, wait_on=None):
return instance[param.name].get_target(wait_on=wait_on)
setattr(self.__class__, target_getter_name, get_target_parameter)
#setattr(self, target_getter_name, get_target_parameter)
self.__dict__[target_getter_name] = types.MethodType(get_target_parameter, self)

if not hasattr(self, '_set_' + param.name):
setattr(self, '_set_' + param.name, _setter_not_implemented)
Expand Down