mirror of https://gitlab.com/pamhyr/pamhyr2
Compare commits
6 Commits
a97717a624
...
70eae5f7d2
| Author | SHA1 | Date |
|---|---|---|
|
|
70eae5f7d2 | |
|
|
e2a65e2cdd | |
|
|
f03b74614e | |
|
|
532b3fd7fd | |
|
|
64df4129d4 | |
|
|
f6e35e2045 |
|
|
@ -24,6 +24,13 @@ stages:
|
||||||
- antivirus
|
- antivirus
|
||||||
- release
|
- release
|
||||||
|
|
||||||
|
#########################
|
||||||
|
# PYINSTALLER VARIABLES #
|
||||||
|
#########################
|
||||||
|
|
||||||
|
variables:
|
||||||
|
HIDDEN_IMPORTS: "--hiddenimport rasterio --collect-submodules rasterio"
|
||||||
|
|
||||||
#############
|
#############
|
||||||
# DOWNLOADS #
|
# DOWNLOADS #
|
||||||
#############
|
#############
|
||||||
|
|
@ -292,7 +299,7 @@ build-linux:
|
||||||
- pip3 install -r ../requirements.txt
|
- pip3 install -r ../requirements.txt
|
||||||
- pip3 install -U -r ../requirements.txt
|
- pip3 install -U -r ../requirements.txt
|
||||||
# Run Pyinstaller
|
# Run Pyinstaller
|
||||||
- pyinstaller -y --hiddenimport rasterio --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py
|
- pyinstaller -y $HIDDEN_IMPORTS --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py
|
||||||
# Create directory
|
# Create directory
|
||||||
- mkdir -p pamhyr
|
- mkdir -p pamhyr
|
||||||
- mkdir -p pamhyr/_internal
|
- mkdir -p pamhyr/_internal
|
||||||
|
|
@ -395,7 +402,7 @@ build-windows:
|
||||||
- python -m pip install -U -r ..\requirements.txt
|
- python -m pip install -U -r ..\requirements.txt
|
||||||
# Run Pyinstaller
|
# Run Pyinstaller
|
||||||
# - pyinstaller --noconsole -y ..\src\pamhyr.py
|
# - pyinstaller --noconsole -y ..\src\pamhyr.py
|
||||||
- pyinstaller -i ../src/View/ui/ressources/icon.ico --hide-console hide-early -y ..\src\pamhyr.py
|
- pyinstaller -i ../src/View/ui/ressources/icon.ico $HIDDEN_IMPORTS --hide-console hide-early -y ..\src\pamhyr.py
|
||||||
# Create directory
|
# Create directory
|
||||||
- mkdir pamhyr
|
- mkdir pamhyr
|
||||||
- dir
|
- dir
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@ class TableModel(PamhyrTableModel):
|
||||||
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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,14 @@ import csv
|
||||||
import logging
|
import logging
|
||||||
try:
|
try:
|
||||||
import rasterio
|
import rasterio
|
||||||
|
import rasterio.control
|
||||||
|
import rasterio.crs
|
||||||
|
import rasterio.sample
|
||||||
|
import rasterio.vrt
|
||||||
|
import rasterio._features
|
||||||
_rasterio_loaded = True
|
_rasterio_loaded = True
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("Module 'rasterio' is not available")
|
print(f"Module 'rasterio' is not available: {e}")
|
||||||
_rasterio_loaded = False
|
_rasterio_loaded = False
|
||||||
|
|
||||||
from numpy import sqrt
|
from numpy import sqrt
|
||||||
|
|
@ -1176,48 +1181,47 @@ 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
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue