Compare commits

..

No commits in common. "a4423e45f88e5e438983821f88015d8fd12f6326" and "016f3fc73cf2aabf44f7f304ac08f73dfc2797f9" have entirely different histories.

2 changed files with 5 additions and 12 deletions

View File

@ -19,5 +19,4 @@
"python-pyqt@5" "python-pyqt5-sip" "python-pyqt@5" "python-pyqt5-sip"
"python-pyqtgraph" "python-qscintilla" "python-pyqtgraph" "python-qscintilla"
"python-numpy@1" "python-shapely" "python-pyshp" "python-numpy@1" "python-shapely" "python-pyshp"
"python-matplotlib" "python-colorama" "python-matplotlib" "python-rasterio"))
"python-rasterio"))

View File

@ -19,11 +19,7 @@
import os import os
import csv import csv
import logging import logging
try: # import rasterio
import rasterio
_rasterio_loaded = True
except:
_rasterio_loaded = False
from numpy import sqrt from numpy import sqrt
@ -341,12 +337,10 @@ class ResultsWindow(PamhyrWindow):
"action_add": self._add_custom_plot, "action_add": self._add_custom_plot,
"action_export": self._export, "action_export": self._export,
# "action_export": self.export_current, # "action_export": self.export_current,
"action_Geo_tiff": self.import_geotiff
} }
if _rasterio_loaded: self.find(QAction, "action_Geo_tiff").setEnabled(False)
actions["action_Geo_tiff"] = self.import_geotiff self.find(QAction, "action_Geo_tiff").setVisible(False)
else:
self.find(QAction, "action_Geo_tiff")\
.setEnabled(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)