Zusammenführung

This commit is contained in:
Tammo.Weber
2025-12-16 16:39:33 +01:00
parent f19373ed82
commit cfeb069e29

View File

@@ -460,7 +460,6 @@ def calc_and_plot(n1, n2,
fig = figure_constant_lines(fig, ell, "ell") fig = figure_constant_lines(fig, ell, "ell")
#fig = figure_constant_lines(fig, ell, "para") #fig = figure_constant_lines(fig, ell, "para")
fig = figure_points(fig, [("P1", p1, "black"), ("P2", p2_ana, "red")]) fig = figure_points(fig, [("P1", p1, "black"), ("P2", p2_ana, "red")])
fig = figure_lines(fig, [(p1, p2_ana, "red")])
#out1 = f"kartesisch: x₂={p2[0]:.5f} m, y₂={p2[1]:.5f} m, z₂={p2[2]:.5f} m; ellipsoidisch: {aus.gms("β₂", beta2, 5)}, {aus.gms("λ₂", lamb2, 5)}, {p2_num}" #out1 = f"kartesisch: x₂={p2[0]:.5f} m, y₂={p2[1]:.5f} m, z₂={p2[2]:.5f} m; ellipsoidisch: {aus.gms("β₂", beta2, 5)}, {aus.gms("λ₂", lamb2, 5)}, {p2_num}"
return out1, "", fig return out1, "", fig
@@ -505,7 +504,6 @@ def calc_and_plot(n1, n2,
fig = ellipsoid_figure(ell, title="Zweite Hauptaufgabe") fig = ellipsoid_figure(ell, title="Zweite Hauptaufgabe")
fig = figure_constant_lines(fig, ell, "ell") fig = figure_constant_lines(fig, ell, "ell")
fig = figure_points(fig, [("P1", p1, "black"), ("P2", p2, "red")]) fig = figure_points(fig, [("P1", p1, "black"), ("P2", p2, "red")])
fig = figure_lines(fig, [(p1, p2, "red")])
return "", out2, fig return "", out2, fig