From 3dceb68eabb171f630485c1c0dee6cfdac84e3a7 Mon Sep 17 00:00:00 2001 From: stockth Date: Wed, 24 Jul 2019 10:41:30 +0200 Subject: [PATCH] Bug Fix --- Formeln.py | 4 ++-- Klassen.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Formeln.py b/Formeln.py index 396fb64..89ce97e 100644 --- a/Formeln.py +++ b/Formeln.py @@ -8,7 +8,7 @@ Formeln = [k.Formel('Kraftformel', "F=m*a", i=k.Groesse('F', 'N', False), a=k.Gr k.Formel('Gleichm. beschl. Bew.',"s=0.5*a*t^2", i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5), b=k.Groesse('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, x=konstante_eins, y=k.Groesse(None, None, True, 2)), - k.Formel('Gewichtskraft',"Fg=9,81*h", i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=('h','m',False), + k.Formel('Gewichtskraft',"Fg=9,81*h", i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=k.Groesse('h','m',False), c=konstante_eins, z=konstante_eins,y=konstante_eins,x=konstante_eins), k.Formel('Spannenergie',"Espann=0,5*D*s^2", i=k.Groesse('Espann','J', False), a=k.Groesse(None, None, True, 0.5), b=k.Groesse('D', 'N/m', False), c=k.Groesse('s', 'm', False), x=konstante_eins, y=konstante_eins, @@ -17,7 +17,7 @@ Formeln = [k.Formel('Kraftformel', "F=m*a", i=k.Groesse('F', 'N', False), a=k.Gr b=k.Groesse(None, None, True, 9.81), c=k.Groesse('h','m',False), z=konstante_eins, y=konstante_eins,x=konstante_eins), k.Formel('Kinetische Energie',"Ekin=0,5*m*v^2",i=k.Groesse('Ekin','J', False), a=k.Groesse(None, None, True, 0.5), - b=('m', 'kg', False), c=('v', 'm/s', False), z=konstante_eins, x=konstante_eins, + b=k.Groesse('m', 'kg', False), c=k.Groesse('v', 'm/s', False), z=konstante_eins, x=konstante_eins, y=k.Groesse(None, None, True, 2)), k.Formel('Elektrische Leistung',"P=U*I", i=k.Groesse('P', 'W', False), a=k.Groesse('U', 'V', False), b=k.Groesse('I','A', False), c=konstante_eins, z=konstante_eins, x=konstante_eins, y=konstante_eins), diff --git a/Klassen.py b/Klassen.py index 4dda321..2ce2a6c 100644 --- a/Klassen.py +++ b/Klassen.py @@ -125,6 +125,16 @@ class Formel: ret = self.solver.solve_to_x() elif 'd' == ges.equals_var: ret = self.solver. solve_to_d() + elif 'e' == ges.equals_var: + ret = self.solver. solve_to_e() + elif 'f' == ges.equals_var: + ret = self.solver. solve_to_f() + elif 'g' == ges.equals_var: + ret = self.solver. solve_to_g() + elif 'y' == ges.equals_var: + ret = self.solver. solve_to_y() + elif 'z' == ges.equals_var: + ret = self.solver. solve_to_z() return ret