mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Translate: Rename KP to RK (River Kilometric).
This commit is contained in:
1 parent
b83494888b
commit
46dc527222
66 files changed
+668
-614
No files matched your search
+39
-39
@@ -54,9 +54,9 @@ from Meshing.Mage import (
|
||||
from View.Geometry.Table import GeometryReachTableModel
|
||||
from View.Geometry.PlotXY import PlotXY
|
||||
from View.Geometry.PlotAC import PlotAC
|
||||
from View.Geometry.PlotKPZ import PlotKPZ
|
||||
from View.Geometry.PlotRKZ import PlotRKZ
|
||||
from View.Geometry.MeshingDialog import MeshingDialog
|
||||
from View.Geometry.UpdateKPDialog import UpdateKPDialog
|
||||
from View.Geometry.UpdateRKDialog import UpdateRKDialog
|
||||
from View.Geometry.PurgeDialog import PurgeDialog
|
||||
from View.Geometry.Translate import GeometryTranslate
|
||||
from View.Geometry.Profile.Window import ProfileWindow
|
||||
@@ -105,7 +105,7 @@ class GeometryWindow(PamhyrWindow):
|
||||
self._table = GeometryReachTableModel(
|
||||
table_view=table,
|
||||
table_headers=table_headers,
|
||||
editable_headers=["name", "kp"],
|
||||
editable_headers=["name", "rk"],
|
||||
data=self._reach,
|
||||
undo=self._undo_stack
|
||||
)
|
||||
@@ -116,7 +116,7 @@ class GeometryWindow(PamhyrWindow):
|
||||
|
||||
def setup_plots(self):
|
||||
self.setup_plots_xy()
|
||||
self.setup_plots_kpc()
|
||||
self.setup_plots_rkc()
|
||||
self.setup_plots_ac()
|
||||
|
||||
def setup_plots_xy(self):
|
||||
@@ -131,17 +131,17 @@ class GeometryWindow(PamhyrWindow):
|
||||
self._plot_layout_xy.addWidget(self._canvas_xy)
|
||||
self.plot_xy()
|
||||
|
||||
def setup_plots_kpc(self):
|
||||
self._canvas_kpc = MplCanvas(width=6, height=4, dpi=100)
|
||||
self._canvas_kpc.setObjectName("canvas_kpc")
|
||||
self._toolbar_kpc = PamhyrPlotToolbar(
|
||||
self._canvas_kpc, self,
|
||||
def setup_plots_rkc(self):
|
||||
self._canvas_rkc = MplCanvas(width=6, height=4, dpi=100)
|
||||
self._canvas_rkc.setObjectName("canvas_rkc")
|
||||
self._toolbar_rkc = PamhyrPlotToolbar(
|
||||
self._canvas_rkc, self,
|
||||
items=["home", "zoom", "save", "iso", "back/forward", "move"]
|
||||
)
|
||||
self._plot_layout_kpc = self.find(QVBoxLayout, "verticalLayout_2")
|
||||
self._plot_layout_kpc.addWidget(self._toolbar_kpc)
|
||||
self._plot_layout_kpc.addWidget(self._canvas_kpc)
|
||||
self.plot_kpc()
|
||||
self._plot_layout_rkc = self.find(QVBoxLayout, "verticalLayout_2")
|
||||
self._plot_layout_rkc.addWidget(self._toolbar_rkc)
|
||||
self._plot_layout_rkc.addWidget(self._canvas_rkc)
|
||||
self.plot_rkc()
|
||||
|
||||
def setup_plots_ac(self):
|
||||
self._canvas_ac = MplCanvas(width=9, height=4, dpi=100)
|
||||
@@ -162,7 +162,7 @@ class GeometryWindow(PamhyrWindow):
|
||||
|
||||
profile = self._reach.profile(row)
|
||||
|
||||
name = profile.name + " " + str(profile.kp)
|
||||
name = profile.name + " " + str(profile.rk)
|
||||
|
||||
return (
|
||||
"<font color=\"Grey\">" +
|
||||
@@ -192,7 +192,7 @@ class GeometryWindow(PamhyrWindow):
|
||||
"action_delete": self.delete,
|
||||
"action_edit": self.edit_profile,
|
||||
"action_meshing": self.edit_meshing,
|
||||
"action_update_kp": self.update_kp,
|
||||
"action_update_rk": self.update_rk,
|
||||
"action_purge": self.purge,
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ class GeometryWindow(PamhyrWindow):
|
||||
def _update(self, redraw=False, propagate=True):
|
||||
if redraw:
|
||||
self._plot_xy.draw()
|
||||
self._plot_kpc.draw()
|
||||
self._plot_rkc.draw()
|
||||
self._plot_ac.draw()
|
||||
|
||||
self.select_current_profile()
|
||||
@@ -315,9 +315,9 @@ class GeometryWindow(PamhyrWindow):
|
||||
src_except=e
|
||||
)
|
||||
|
||||
def update_kp(self):
|
||||
def update_rk(self):
|
||||
try:
|
||||
dlg = UpdateKPDialog(
|
||||
dlg = UpdateRKDialog(
|
||||
reach=self._reach,
|
||||
trad=self._trad,
|
||||
parent=self
|
||||
@@ -329,15 +329,15 @@ class GeometryWindow(PamhyrWindow):
|
||||
"origin_value": dlg.origin_value,
|
||||
"orientation": dlg.orientation,
|
||||
}
|
||||
self._update_kp(data)
|
||||
self._update_rk(data)
|
||||
except Exception as e:
|
||||
logger_exception(e)
|
||||
return
|
||||
|
||||
def _update_kp(self, data):
|
||||
def _update_rk(self, data):
|
||||
try:
|
||||
mesher = MeshingWithMageMailleurTT()
|
||||
self._table.update_kp(mesher, data)
|
||||
self._table.update_rk(mesher, data)
|
||||
except Exception as e:
|
||||
logger_exception(e)
|
||||
raise ExternFileMissingError(
|
||||
@@ -367,25 +367,25 @@ class GeometryWindow(PamhyrWindow):
|
||||
self._plot_xy.update()
|
||||
self.tableView.model().blockSignals(False)
|
||||
|
||||
def plot_kpc(self):
|
||||
def plot_rkc(self):
|
||||
self.tableView.model().blockSignals(True)
|
||||
|
||||
self._plot_kpc = PlotKPZ(
|
||||
canvas=self._canvas_kpc,
|
||||
self._plot_rkc = PlotRKZ(
|
||||
canvas=self._canvas_rkc,
|
||||
study=self._study,
|
||||
data=self._reach,
|
||||
trad=self._trad,
|
||||
toolbar=self._toolbar_kpc,
|
||||
toolbar=self._toolbar_rkc,
|
||||
table=self.find(QTableView, "tableView"),
|
||||
parent=self
|
||||
)
|
||||
self._plot_kpc.draw()
|
||||
self._plot_rkc.draw()
|
||||
|
||||
self.tableView.model().blockSignals(False)
|
||||
|
||||
def update_plot_kpc(self):
|
||||
def update_plot_rkc(self):
|
||||
self.tableView.model().blockSignals(True)
|
||||
self._plot_kpc.update()
|
||||
self._plot_rkc.update()
|
||||
self.tableView.model().blockSignals(False)
|
||||
|
||||
def plot_ac(self):
|
||||
@@ -418,10 +418,10 @@ class GeometryWindow(PamhyrWindow):
|
||||
self._plot_xy.update()
|
||||
self.tableView.model().blockSignals(False)
|
||||
|
||||
def select_plot_kpc(self, ind: int):
|
||||
def select_plot_rkc(self, ind: int):
|
||||
self.tableView.model().blockSignals(True)
|
||||
self._plot_kpc.current = ind
|
||||
self._plot_kpc.update()
|
||||
self._plot_rkc.current = ind
|
||||
self._plot_rkc.update()
|
||||
self.tableView.model().blockSignals(False)
|
||||
|
||||
def select_plot_ac(self, ind: int):
|
||||
@@ -436,11 +436,11 @@ class GeometryWindow(PamhyrWindow):
|
||||
|
||||
if row is not None:
|
||||
self.select_plot_xy(row)
|
||||
self.select_plot_kpc(row)
|
||||
self.select_plot_rkc(row)
|
||||
self.select_plot_ac(row)
|
||||
else:
|
||||
self._plot_xy.draw()
|
||||
self._plot_kpc.draw()
|
||||
self._plot_rkc.draw()
|
||||
self._plot_ac.draw()
|
||||
|
||||
self.tableView.model().blockSignals(False)
|
||||
@@ -539,12 +539,12 @@ class GeometryWindow(PamhyrWindow):
|
||||
.selectedRows()
|
||||
|
||||
table = []
|
||||
# table.append(["name", "kp"])
|
||||
# table.append(["name", "rk"])
|
||||
|
||||
for row in rows:
|
||||
profile = self._reach.profile(row.row())
|
||||
table.append(
|
||||
[profile.name, profile.kp]
|
||||
[profile.name, profile.rk]
|
||||
)
|
||||
|
||||
self.copyTableIntoClipboard(table)
|
||||
@@ -588,14 +588,14 @@ class GeometryWindow(PamhyrWindow):
|
||||
self.select_current_profile()
|
||||
# self.update_plot_ac()
|
||||
# self.update_plot_xy()
|
||||
# self.update_plot_kpc()
|
||||
# self.update_plot_rkc()
|
||||
|
||||
def _redo(self):
|
||||
self._table.redo()
|
||||
self.select_current_profile()
|
||||
# self.update_plot_ac()
|
||||
# self.update_plot_xy()
|
||||
# self.update_plot_kpc()
|
||||
# self.update_plot_rkc()
|
||||
|
||||
def export_to_file(self):
|
||||
settings = QSettings(
|
||||
@@ -642,13 +642,13 @@ class GeometryWindow(PamhyrWindow):
|
||||
c1 = f"{profile.code1:>6}"
|
||||
c2 = f"{profile.code2:>6}"
|
||||
t = f"{len(profile.points):>6}"
|
||||
kp = f"{profile.kp:>12f}"[0:12]
|
||||
rk = f"{profile.rk:>12f}"[0:12]
|
||||
pname = profile.name
|
||||
if profile.name == "":
|
||||
pname = f"p{profile.id:>3}".replace(" ", "0")
|
||||
name = f"{pname:<19}"
|
||||
|
||||
wfile.write(f"{num}{c1}{c2}{t} {kp} {pname}\n")
|
||||
wfile.write(f"{num}{c1}{c2}{t} {rk} {pname}\n")
|
||||
|
||||
for point in profile.points:
|
||||
self._export_to_file_st_point(wfile, point)
|
||||
|
||||
Reference in new issue
Block a user