Compare commits

..

2 Commits

Author SHA1 Message Date
Tammo.Weber
db05f7b6db Merge remote-tracking branch 'origin/main' 2026-02-10 12:36:04 +01:00
Tammo.Weber
73e3694a2a Ausgabe von alpha GHA1 2026-02-10 12:35:35 +01:00

View File

@@ -47,9 +47,6 @@ def inputfeld(left_text, input_id, right_text="", width=200, min=None, max=None)
id=input_id, id=input_id,
type="number", type="number",
placeholder=f"{left_text}...[{right_text}]", placeholder=f"{left_text}...[{right_text}]",
min=min,
max=max,
step="any",
style={"width": width, "display": "block"}, style={"width": width, "display": "block"},
persistence=True, persistence=True,
persistence_type="memory", persistence_type="memory",
@@ -125,7 +122,7 @@ def method_row(label, cb_id, input_id=None, value="", info="", input_id2=None, v
" | ".join(info_parts), " | ".join(info_parts),
style={ style={
"marginLeft": "6px", "marginLeft": "6px",
"fontSize": "12px", "fontSize": "11px",
"color": "#6c757d", "color": "#6c757d",
"lineHeight": "1.1", "lineHeight": "1.1",
"whiteSpace": "nowrap", "whiteSpace": "nowrap",
@@ -151,7 +148,7 @@ def method_failed(method_label: str, exc: Exception):
html.Summary("Details"), html.Summary("Details"),
html.Pre(traceback.format_exc(), style={ html.Pre(traceback.format_exc(), style={
"whiteSpace": "pre-wrap", "whiteSpace": "pre-wrap",
"fontSize": "12px", "fontSize": "11px",
"color": "#6c757d", "color": "#6c757d",
"marginTop": "6px" "marginTop": "6px"
}) })
@@ -922,7 +919,7 @@ def compute_gha1_ana(n1, cb_ana, max_M, maxPartCircum, beta0, lamb0, s, a0, ax,
P0 = ell.ell2cart(beta_rad, lamb_rad) P0 = ell.ell2cart(beta_rad, lamb_rad)
P1_ana, alpha2_para = gha1_ana(ell, P0, alpha_rad_para, s_val, max_M, maxPartCircum) P1_ana, alpha2_para = gha1_ana(ell, P0, alpha_rad_para, s_val, max_M, maxPartCircum)
u1, v1 = ell.cart2para(P1_ana) u1, v1 = ell.cart2para(P1_ana)
alpha2 = alpha_para2ell(ell, u1, v1, alpha2_para) alpha1 = alpha_para2ell(ell, u1, v1, alpha2_para)
beta2_ana, lamb2_ana = ell.cart2ell(P1_ana) beta2_ana, lamb2_ana = ell.cart2ell(P1_ana)
out = html.Div([ out = html.Div([
@@ -932,6 +929,7 @@ def compute_gha1_ana(n1, cb_ana, max_M, maxPartCircum, beta0, lamb0, s, a0, ax,
html.Br(), html.Br(),
html.Span(f"ellipsoidisch: {aus.gms('β₁', beta2_ana, 4)}, {aus.gms('λ₁', lamb2_ana, 4)}"), html.Span(f"ellipsoidisch: {aus.gms('β₁', beta2_ana, 4)}, {aus.gms('λ₁', lamb2_ana, 4)}"),
html.Br(), html.Br(),
html.Span(f"{aus.gms('α₁', alpha1[-1], 4)}"),
]) ])
store = { store = {
@@ -989,6 +987,7 @@ def compute_gha1_num(n1, cb_num, n_in, beta0, lamb0, s, a0, ax, ay, b):
html.Br(), html.Br(),
html.Span(f"ellipsoidisch: {aus.gms('β₁', beta2_num, 4)}, {aus.gms('λ₁', lamb2_num, 4)}"), html.Span(f"ellipsoidisch: {aus.gms('β₁', beta2_num, 4)}, {aus.gms('λ₁', lamb2_num, 4)}"),
html.Br(), html.Br(),
html.Span(f"{aus.gms('α₁', alpha1, 4)}"),
]) ])
polyline = [[x1, y1, z1] for x1, _, y1, _, z1, _ in werte] polyline = [[x1, y1, z1] for x1, _, y1, _, z1, _ in werte]
@@ -1045,6 +1044,8 @@ def compute_gha1_stoch(n1, cb_stoch, n_in, beta0, lamb0, s, a0, ax, ay, b):
html.Span(f"kartesisch: x₁={P1_stoch[0]:.4f} m, y₁={P1_stoch[1]:.4f} m, z₁={P1_stoch[2]:.4f} m"), html.Span(f"kartesisch: x₁={P1_stoch[0]:.4f} m, y₁={P1_stoch[1]:.4f} m, z₁={P1_stoch[2]:.4f} m"),
html.Br(), html.Br(),
html.Span(f"ellipsoidisch: {aus.gms('β₁', beta1_stoch, 4)}, {aus.gms('λ₁', lamb1_stoch, 4)}"), html.Span(f"ellipsoidisch: {aus.gms('β₁', beta1_stoch, 4)}, {aus.gms('λ₁', lamb1_stoch, 4)}"),
html.Br(),
html.Span(f"{aus.gms('α₁', alpha, 4)}"),
]) ])
store = { store = {
@@ -1099,6 +1100,8 @@ def compute_gha1_approx(n1, cb_approx, ds_in, beta0, lamb0, s, a0, ax, ay, b):
html.Span(f"kartesisch: x₁={P1_app[0]:.4f} m, y₁={P1_app[1]:.4f} m, z₁={P1_app[2]:.4f} m"), html.Span(f"kartesisch: x₁={P1_app[0]:.4f} m, y₁={P1_app[1]:.4f} m, z₁={P1_app[2]:.4f} m"),
html.Br(), html.Br(),
html.Span(f"ellipsoidisch: {aus.gms('β₁', beta1_app, 4)}, {aus.gms('λ₁', lamb1_app, 4)}"), html.Span(f"ellipsoidisch: {aus.gms('β₁', beta1_app, 4)}, {aus.gms('λ₁', lamb1_app, 4)}"),
html.Br(),
html.Span(f"{aus.gms('α₁', alpha1_app, 4)}"),
]) ])
store = { store = {