diff --git a/timeseriesviewer/timeseries.py b/timeseriesviewer/timeseries.py index cffe9f2110d112aa66d34c9aa7cbe034437c8f64..d2f5d795e7d8f992dccd80490f1e94b8ac813daf 100644 --- a/timeseriesviewer/timeseries.py +++ b/timeseriesviewer/timeseries.py @@ -232,7 +232,7 @@ def verifyInputImage(path, vrtInspection=''): print('{}GDAL unable to open: '.format(vrtInspection, path)) return False if ds.GetDriver().ShortName == 'VRT': - vrtInspection = 'Inspection {}\n'.format(path) + vrtInspection = 'VRT Inspection {}\n'.format(path) validSrc = [verifyInputImage(p, vrtInspection=vrtInspection) for p in set(ds.GetFileList()) - set([path])] return all(validSrc) else: @@ -263,25 +263,22 @@ class TimeSeriesDatum(QObject): - def __init__(self, timeSeries, pathImg, pathMsk=None): + def __init__(self, timeSeries, lyr, pathMsk=None): super(TimeSeriesDatum,self).__init__() - assert os.path.exists(pathImg) + assert isinstance(lyr, QgsRasterLayer) + assert lyr.isValid() + + self.lyrImg = lyr self.timeSeries = timeSeries - self.pathImg = pathImg - self.pathMsk = None - assert os.path.exists(pathImg) - self.lyrImg = QgsRasterLayer(pathImg, os.path.basename(pathImg), False) - assert self.lyrImg.isValid() - self.uriImg = self.lyrImg.dataProvider().dataSourceUri() + self.pathImg = self.lyrImg.dataProvider().dataSourceUri() self.crs = self.lyrImg.dataProvider().crs() self.sensor = SensorInstrument(self.lyrImg) - self.date = getImageDate(self.lyrImg) + self.date = getImageDate(self.lyr) self.doy = getDOYfromDate(self.date) assert self.date is not None, 'Unable to find acquisition date of {}'.format(pathImg) - self.ns = self.lyrImg.width() self.nl = self.lyrImg.height() self.nb = self.lyrImg.bandCount() @@ -289,9 +286,6 @@ class TimeSeriesDatum(QObject): self.mVisibility = True - if pathMsk: - self.setMask(pathMsk) - def rank(self): return self.timeSeries.index(self) @@ -568,25 +562,6 @@ def getImageDate(lyr): return date -def PFunc_TimeSeries_getSpatialChip(TSD, bbWkt, srsWkt , bands=[4,5,3]): - - chipdata = TSD.readSpatialChip(bbWkt, srs=srsWkt, bands=bands) - - return TSD, chipdata - -def px2Coordinate(gt, pxX, pxY, upper_left=True): - cx = gt[0] + pxX*gt[1] + pxY*gt[2] - cy = gt[3] + pxX*gt[4] + pxY*gt[5] - if not upper_left: - cx += gt[1]*0.5 - cy += gt[5]*0.5 - return cx, cy - -def coordinate2px(gt, cx, cy): - px = int((cx - gt[0]) / gt[1]) - py = int((cy - gt[3]) / gt[5]) - return px, py - regYYYYDOY = re.compile(r'(19|20)\d{5}') regYYYYMMDD = re.compile(r'(19|20)\d{2}-\d{2}-\d{2}') diff --git a/timeseriesviewer/ui/icons/system.png b/timeseriesviewer/ui/icons/system.png index a3d259ece803d499a53b5794d84753b53a767bb2..a9bac086db6b73c269eb5d3b0120806f0bba2e27 100644 Binary files a/timeseriesviewer/ui/icons/system.png and b/timeseriesviewer/ui/icons/system.png differ diff --git a/timeseriesviewer/ui/settingsdialog.ui b/timeseriesviewer/ui/settingsdialog.ui index f2ba2b0b938bb405bc67475bffefabee4d18a6ff..d9930d6beb2da8096fe1c1ebf525e7c9ace4c0e4 100644 --- a/timeseriesviewer/ui/settingsdialog.ui +++ b/timeseriesviewer/ui/settingsdialog.ui @@ -15,7 +15,13 @@ </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QDeclarativeView" name="declarativeView"/> + <widget class="ParameterTree" name="treeWidget"> + <column> + <property name="text"> + <string notr="true">1</string> + </property> + </column> + </widget> </item> <item> <widget class="QDialogButtonBox" name="buttonBox"> @@ -31,9 +37,9 @@ </widget> <customwidgets> <customwidget> - <class>QDeclarativeView</class> - <extends>QGraphicsView</extends> - <header>QtDeclarative/QDeclarativeView</header> + <class>ParameterTree</class> + <extends>QTreeWidget</extends> + <header>pyqtgraph.parametertree</header> </customwidget> </customwidgets> <resources/>