diff --git a/DataForControls.py b/DataForControls.py index 6dcf3ae..a789aac 100644 --- a/DataForControls.py +++ b/DataForControls.py @@ -46,7 +46,13 @@ ] # these require additional user input - available in zunzunsite3 but not this project -excludedModuleNames = [ +excludedModuleNames_2D = [ + 'Polyfunctional', + 'Rational', + 'Spline', + 'UserDefinedFunction', +] +excludedModuleNames_3D = [ 'Polyfunctional', 'Spline', 'UserDefinedFunction', @@ -55,7 +61,7 @@ eq_od2D = collections.OrderedDict() for submodule in inspect.getmembers(pyeq3.Models_2D): if inspect.ismodule(submodule[1]): - if submodule[0] in excludedModuleNames: + if submodule[0] in excludedModuleNames_2D: continue eq_od2D[submodule[0]] = collections.OrderedDict() for equationClass in inspect.getmembers(submodule[1]): @@ -80,7 +86,7 @@ eq_od3D = collections.OrderedDict() for submodule in inspect.getmembers(pyeq3.Models_3D): if inspect.ismodule(submodule[1]): - if submodule[0] in excludedModuleNames: + if submodule[0] in excludedModuleNames_3D: continue eq_od3D[submodule[0]] = collections.OrderedDict() for equationClass in inspect.getmembers(submodule[1]): diff --git a/FittingInterface.py b/FittingInterface.py index b0e95f0..50f5ed2 100644 --- a/FittingInterface.py +++ b/FittingInterface.py @@ -77,7 +77,6 @@ def __init__(self, parent): f.grid(column=col, row=row) self.cb_Modules2D = tk.ttk.Combobox(f, state='readonly') moduleNameList = list(dfc.eq_od2D.keys()) - moduleNameList.remove('Rational') # has no 2D equations used here self.cb_Modules2D['values'] = moduleNameList self.cb_Modules2D.bind("<>", self.moduleSelectChanged_2D) self.cb_Modules2D.set('Polynomial')