diff --git a/dashboard.py b/dashboard.py index b24d39c..0fde7fd 100644 --- a/dashboard.py +++ b/dashboard.py @@ -160,7 +160,7 @@ app.layout = html.Div( html.Label("Ellipsoid wählen:"), dcc.Dropdown( - id="my-dropdown", + id="dropdown-ellipsoid", options=[ {"label": "BursaFialova1993", "value": "BursaFialova1993"}, {"label": "BursaSima1980", "value": "BursaSima1980"}, @@ -178,21 +178,21 @@ app.layout = html.Div( html.Label("Halbachsen:"), dcc.Input( - id="input-1", + id="input-ax", type="number", min=0, placeholder="ax...[m]", style={"marginBottom": "10px", "display": "block", "width": "300px"}, ), dcc.Input( - id="input-2", + id="input-ay", type="number", min=0, placeholder="ay...[m]", style={"marginBottom": "10px", "display": "block", "width": "300px"}, ), dcc.Input( - id="input-3", + id="input-b", type="number", min=0, placeholder="b...[m]", @@ -245,10 +245,10 @@ app.layout = html.Div( @app.callback( - Output("input-1", "value"), - Output("input-2", "value"), - Output("input-3", "value"), - Input("my-dropdown", "value"), + Output("input-ax", "value"), + Output("input-ay", "value"), + Output("input-b", "value"), + Input("dropdown-ellipsoid", "value"), ) def fill_inputs_from_dropdown(selected_ell): if not selected_ell: @@ -265,9 +265,9 @@ def fill_inputs_from_dropdown(selected_ell): @app.callback( Output("output-area", "children"), Input("calc-ell", "n_clicks"), - State("input-1", "value"), - State("input-2", "value"), - State("input-3", "value"), + State("input-ax", "value"), + State("input-ay", "value"), + State("input-b", "value"), ) def update_output(n_clicks, ax, ay, b): if not n_clicks: @@ -377,9 +377,9 @@ def render_content(tab): State("input-GHA2-lamb1", "value"), State("input-GHA2-beta2", "value"), State("input-GHA2-lamb2", "value"), - State("input-1", "value"), - State("input-2", "value"), - State("input-3", "value"), + State("input-ax", "value"), + State("input-ay", "value"), + State("input-b", "value"), State("method-checklist-1", "value"), State("method-checklist-2", "value"), @@ -430,14 +430,16 @@ def calc_and_plot(n1, n2, if "numerisch" in method1: # num - #p2_num = gha1_num(ell, p1, alpha_rad, s_val, 1000) - p2_num = 5 + p2_num = gha1_num(ell, p1, alpha_rad, s_val, 10000) + beta2_num, lamb2_num = ell.cart2ell(p2_num) - #out1 += f" {p2_num}" out1.append( html.Div([ html.Strong("Numerisch: "), - html.Span(f"{p2_num}") + html.Br(), + html.Span(f"kartesisch: x₂={p2_num[0]:.4f} m, y₂={p2_num[1]:.4f} m, z₂={p2_num[2]:.4f} m"), + html.Br(), + html.Span(f"ellipsoidisch: {aus.gms('β₂', beta2_num, 4)}, {aus.gms('λ₂', lamb2_num, 4)}") ]) )