Liniendarstellung GHA1
This commit is contained in:
13
dashboard.py
13
dashboard.py
@@ -429,7 +429,8 @@ def calc_and_plot(n1, n2,
|
|||||||
|
|
||||||
if "numerisch" in method1:
|
if "numerisch" in method1:
|
||||||
# num
|
# num
|
||||||
p2_num = gha1_num(ell, p1, alpha_rad, s_val, 10000)
|
x1, y1, z1, werte = gha1_num(ell, p1, alpha_rad, s_val, 10000)
|
||||||
|
p2_num = x1, y1, z1
|
||||||
beta2_num, lamb2_num = ell.cart2ell(p2_num)
|
beta2_num, lamb2_num = ell.cart2ell(p2_num)
|
||||||
|
|
||||||
out1.append(
|
out1.append(
|
||||||
@@ -442,6 +443,11 @@ def calc_and_plot(n1, n2,
|
|||||||
])
|
])
|
||||||
)
|
)
|
||||||
|
|
||||||
|
geo_line_num1 = []
|
||||||
|
for x1, _, y1, _, z1, _ in werte:
|
||||||
|
geo_line_num1.append([x1, y1, z1])
|
||||||
|
|
||||||
|
|
||||||
if "stochastisch" in method1:
|
if "stochastisch" in method1:
|
||||||
# stoch
|
# stoch
|
||||||
p2_stoch = "noch nicht implementiert.."
|
p2_stoch = "noch nicht implementiert.."
|
||||||
@@ -460,7 +466,10 @@ def calc_and_plot(n1, n2,
|
|||||||
#fig = figure_constant_lines(fig, ell, "geod")
|
#fig = figure_constant_lines(fig, ell, "geod")
|
||||||
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")])
|
if "analytisch" in method1:
|
||||||
|
fig = figure_points(fig, [("P1", p1, "black"), ("P2", p2_ana, "red")])
|
||||||
|
if "numerisch" in method1:
|
||||||
|
fig = figure_lines(fig, geo_line_num1, "#ff8c00")
|
||||||
|
|
||||||
#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
|
||||||
|
|||||||
Reference in New Issue
Block a user