parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scenarios

scenarios Test_scenarios
Theophile Terraz 2025-10-14 11:52:44 +02:00
parent a42c46f4d2 7ef3184699
commit 016f3fc73c
2 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/View/Results/Table.py
View File

@ -159,9 +159,9 @@ class TableModel(PamhyrTableModel):
if self._opt_data == "reach": if self._opt_data == "reach":
self._lst = _river.reachs self._lst = _river.reachs
elif self._opt_data == "profile" or self._opt_data == "raw_data": elif self._opt_data == "profile" or self._opt_data == "raw_data":
# self._lst = _river.reach(reach).profiles self._lst = _river.reach(reach).profiles
self._lst = list(compress(_river.reach(reach).profiles, # self._lst = list(compress(_river.reach(reach).profiles,
_river.reach(reach).profile_mask)) # _river.reach(reach).profile_mask))
elif self._opt_data == "solver": elif self._opt_data == "solver":
self._lst = self._parent._solvers self._lst = self._parent._solvers

93
src/View/Results/Window.py
View File

@ -19,7 +19,7 @@
import os import os
import csv import csv
import logging import logging
import rasterio # import rasterio
from numpy import sqrt from numpy import sqrt
@ -339,6 +339,8 @@ class ResultsWindow(PamhyrWindow):
# "action_export": self.export_current, # "action_export": self.export_current,
"action_Geo_tiff": self.import_geotiff "action_Geo_tiff": self.import_geotiff
} }
self.find(QAction, "action_Geo_tiff").setEnabled(False)
self.find(QAction, "action_Geo_tiff").setVisible(False)
if len(self._results) > 1: if len(self._results) > 1:
self.find(QAction, "action_reload").setEnabled(False) self.find(QAction, "action_reload").setEnabled(False)
@ -1167,47 +1169,48 @@ class ResultsWindow(PamhyrWindow):
self.update_table_selection_profile(profile_id) self.update_table_selection_profile(profile_id)
def import_geotiff(self): def import_geotiff(self):
options = QFileDialog.Options() # options = QFileDialog.Options()
settings = QSettings(QSettings.IniFormat, # settings = QSettings(QSettings.IniFormat,
QSettings.UserScope, 'MyOrg', ) # QSettings.UserScope, 'MyOrg', )
options |= QFileDialog.DontUseNativeDialog # options |= QFileDialog.DontUseNativeDialog
#
file_types = [ # file_types = [
self._trad["file_geotiff"], # self._trad["file_geotiff"],
self._trad["file_all"], # self._trad["file_all"],
] # ]
#
filename, _ = QFileDialog.getOpenFileName( # filename, _ = QFileDialog.getOpenFileName(
self, # self,
self._trad["open_file"], # self._trad["open_file"],
"", # "",
";; ".join(file_types), # ";; ".join(file_types),
options=options # options=options
) # )
#
if filename != "": # if filename != "":
with rasterio.open(filename) as data: # with rasterio.open(filename) as data:
img = data.read() # img = data.read()
b = data.bounds[:] # b = data.bounds[:]
# b[0] left # # b[0] left
# b[1] bottom # # b[1] bottom
# b[2] right # # b[2] right
# b[3] top # # b[3] top
xlim = self.canvas.axes.get_xlim() # xlim = self.canvas.axes.get_xlim()
ylim = self.canvas.axes.get_ylim() # ylim = self.canvas.axes.get_ylim()
if b[2] > b[0] and b[1] < b[3]: # if b[2] > b[0] and b[1] < b[3]:
self.canvas.axes.imshow(img.transpose((1, 2, 0)), # self.canvas.axes.imshow(img.transpose((1, 2, 0)),
extent=[b[0], b[2], b[1], b[3]]) # extent=[b[0], b[2], b[1], b[3]])
else: # else:
dlg = CoordinatesDialog( # dlg = CoordinatesDialog(
xlim, # xlim,
ylim, # ylim,
trad=self._trad, # trad=self._trad,
parent=self # parent=self
) # )
if dlg.exec(): # if dlg.exec():
self.canvas.axes.imshow(img.transpose((1, 2, 0)), # self.canvas.axes.imshow(img.transpose((1, 2, 0)),
extent=dlg.values) # extent=dlg.values)
self.plot_xy.idle() # self.plot_xy.idle()
self.canvas.axes.set_xlim(xlim) # self.canvas.axes.set_xlim(xlim)
self.canvas.axes.set_ylim(ylim) # self.canvas.axes.set_ylim(ylim)
return