norohind/EDMC_SpanshRouter
1
0 Fork 0
mirror of https://github.com/norohind/EDMC_SpanshRouter.git synced 2026-10-22 18:02:08 +03:00
Code Issues Projects Releases Wiki Activity

Implemented first version of the function that displays distance to next jump, distance to previous jump, and total distance remaining.

Browse Source
This commit is contained in:
Cat Lady committed 2025-12-05 12:25:13 +01:00
1 parent 31d4fe9fa7
commit 42e15a3c88
1 file changed
+166 -1
Download Patch File Download Diff File Expand all files Collapse all files
SpanshRouter/SpanshRouter.py
+166 -1
View File
@@ -61,6 +61,11 @@ class SpanshRouter():
self.restocktritium_header = "Restock Tritium"
self.refuel_header = "Refuel"
self.pleaserefuel = False
# distance tracking
self.dist_next = ""
self.dist_prev = ""
self.dist_remaining = ""
self.last_dist_next = ""
# -- GUI part --
def init_gui(self, parent):
@@ -73,6 +78,9 @@ class SpanshRouter():
self.waypoint_btn = tk.Button(self.frame, text=self.next_wp_label + '\n' + self.next_stop, command=self.copy_waypoint)
self.waypoint_next_btn = tk.Button(self.frame, text="v", command=self.goto_next_waypoint)
self.jumpcounttxt_lbl = tk.Label(self.frame, text=self.jumpcountlbl_txt + str(self.jumps_left))
self.dist_prev_lbl = tk.Label(self.frame, text="")
self.dist_next_lbl = tk.Label(self.frame, text="")
self.dist_remaining_lbl = tk.Label(self.frame, text="")
self.bodies_lbl = tk.Label(self.frame, justify=LEFT, text=self.bodieslbl_txt + self.bodies)
self.fleetrestock_lbl = tk.Label(self.frame, justify=LEFT, text=self.fleetstocklbl_txt)
self.refuel_lbl = tk.Label(self.frame, justify=LEFT, text=self.refuellbl_txt)
@@ -99,6 +107,12 @@ class SpanshRouter():
row += 1
self.waypoint_next_btn.grid(row=row, columnspan=2)
row += 1
self.dist_prev_lbl.grid(row=row, columnspan=2)
row += 1
self.dist_next_lbl.grid(row=row, columnspan=2)
row += 1
self.dist_remaining_lbl.grid(row=row, columnspan=2)
row += 1
self.bodies_lbl.grid(row=row, columnspan=2, sticky=tk.W)
row += 1
self.fleetrestock_lbl.grid(row=row, columnspan=2, sticky=tk.W)
@@ -205,11 +219,20 @@ class SpanshRouter():
self.refuel_lbl.grid_remove()
self.export_route_btn.grid_remove()
self.clear_route_btn.grid_remove()
self.dist_prev_lbl.grid_remove()
self.dist_next_lbl.grid_remove()
self.dist_remaining_lbl.grid_remove()
else:
self.waypoint_btn["text"] = self.next_wp_label + '\n' + self.next_stop
if self.jumps_left > 0:
self.jumpcounttxt_lbl["text"] = self.jumpcountlbl_txt + str(self.jumps_left)
self.dist_prev_lbl["text"] = self.dist_prev
self.dist_next_lbl["text"] = self.dist_next
self.dist_remaining_lbl["text"] = self.dist_remaining
self.jumpcounttxt_lbl.grid()
self.dist_prev_lbl.grid()
self.dist_next_lbl.grid()
self.dist_remaining_lbl.grid()
else:
self.jumpcounttxt_lbl.grid_remove()
@@ -330,6 +353,7 @@ class SpanshRouter():
self.next_stop = self.route[self.offset][0]
self.update_bodies_text()
self.compute_distances()
self.copy_waypoint()
self.update_gui()
@@ -373,6 +397,114 @@ class SpanshRouter():
if self.offset > 0:
self.update_route(-1)
def compute_distances(self):
"""Compute LY from prev, to next, and total remaining.
Correct semantics:
- Distance To Arrival (if present) is stored on the target row:
route[i][2] == distance from route[i-1] -> route[i]
- Distance Remaining (if present) is stored on the current row as route[i][3].
This function handles rows that may or may not have the distance columns.
"""
# Reset
self.dist_prev = ""
self.dist_next = ""
self.dist_remaining = ""
if not (0 <= self.offset < len(self.route)):
return
def safe_flt(x):
try:
return float(x)
except Exception:
return None
cur = self.route[self.offset]
# --- LY from previous ---
# If current row has distance_to_arrival (index >=3? actually index 2 zero-based),
# that's the distance from previous -> current.
if len(cur) >= 3:
pv = safe_flt(cur[2])
if pv is not None:
self.dist_prev = f"LY from previous: {pv:.2f}"
else:
# fallback: try jumps value (index 1)
pv2 = safe_flt(cur[1])
if pv2 is not None:
self.dist_prev = f"LY from previous (approx): {pv2:.2f}"
else:
# no explicit distance columns — try best-effort from jumps on prev row
if self.offset > 0:
prev = self.route[self.offset - 1]
pj = safe_flt(prev[1])
if pj is not None:
self.dist_prev = f"LY from previous (approx): {pj:.2f}"
else:
self.dist_prev = "LY from previous: 0.00"
else:
self.dist_prev = "LY from previous: 0.00"
# --- LY to next ---
if self.offset < len(self.route) - 1:
nxt = self.route[self.offset + 1]
# prefer distance_to_arrival on the NEXT row (distance from current -> next)
if len(nxt) >= 3:
nv = safe_flt(nxt[2])
if nv is not None:
self.dist_next = f"LY to next: {nv:.2f}"
else:
nv2 = safe_flt(nxt[1])
if nv2 is not None:
self.dist_next = f"LY to next (approx): {nv2:.2f}"
else:
nv2 = safe_flt(nxt[1])
if nv2 is not None:
self.dist_next = f"LY to next (approx): {nv2:.2f}"
else:
self.dist_next = ""
# --- Total remaining ---
# Prefer exact Distance Remaining at current row (index 3)
total_rem = None
if len(cur) >= 4:
total_rem = safe_flt(cur[3])
if total_rem is None:
# Try summing distance_to_arrival of subsequent rows (index 2)
total = 0.0
ok = True
for r in self.route[self.offset + 1:]:
if len(r) >= 3:
v = safe_flt(r[2])
if v is None:
ok = False
break
total += v
else:
ok = False
break
if ok:
total_rem = total
if total_rem is not None:
self.dist_remaining = f"Total LY remaining: {total_rem:.2f}"
else:
# final fallback: sum numeric jumps (index 1) as approximate
s = 0.0
ok = True
for r in self.route[self.offset + 1:]:
v = safe_flt(r[1])
if v is None:
ok = False
break
s += v
if ok and s > 0:
self.dist_remaining = f"Total LY remaining (approx): {s:.2f}"
else:
self.dist_remaining = ""
def update_route(self, direction=1):
# Guard: no route -> nothing to do
if self.route.__len__() == 0:
@@ -424,6 +556,7 @@ class SpanshRouter():
else:
self.next_stop = self.route[self.offset][0]
self.update_bodies_text()
self.compute_distances()
if self.galaxy:
self.pleaserefuel = self.route[self.offset][1] == "Yes"
@@ -501,7 +634,30 @@ class SpanshRouter():
fleetcarrierimportheader = "System Name,Distance,Distance Remaining,Tritium in tank,Tritium in market,Fuel Used,Icy Ring,Pristine,Restock Tritium"
galaxyimportheader = "System Name,Distance,Distance Remaining,Fuel Left,Fuel Used,Refuel,Neutron Star"
if (headerline == internalbasicheader1) or (headerline == internalbasicheader2) or (headerline == neutronimportheader):
# Handle plain CSVs (two variants) and the neutron-import format separately.
if headerline == neutronimportheader:
# CSV has: System Name,Distance To Arrival,Distance Remaining,Neutron Star,Jumps
for row in route_reader:
if row not in (None, "", []):
# Keep index 1 as "jumps" for compatibility with existing code,
# but also store distance_to_arrival and distance_remaining at indexes 2 and 3.
jumps = row.get(self.jumps_header, "")
dist_to_arrival = row.get("Distance To Arrival", "")
dist_remaining = row.get("Distance Remaining", "")
self.route.append([
row[self.system_header],
jumps,
dist_to_arrival,
dist_remaining
])
if jumps:
try:
self.jumps_left += int(jumps)
except:
pass
elif (headerline == internalbasicheader1) or (headerline == internalbasicheader2):
# legacy/simple CSV: System Name [, Jumps]
for row in route_reader:
if row not in (None, "", []):
self.route.append([
@@ -593,6 +749,14 @@ class SpanshRouter():
row[self.refuel_header]
])
self.jumps_left += 1
# After loading route, initialize current waypoint
if len(self.route) > 0:
self.offset = 0
self.next_stop = self.route[0][0]
# Compute LY distances immediately (so GUI shows them before pressing arrows)
self.compute_distances()
self.update_gui()
else:
self.show_error("Could not detect file format")
@@ -651,6 +815,7 @@ class SpanshRouter():
self.show_plot_gui(False)
self.offset = 1 if self.route[0][0] == monitor.state['SystemName'] else 0
self.next_stop = self.route[self.offset][0]
self.compute_distances()
self.copy_waypoint()
self.update_gui()
self.save_all_route()