diff --git a/eotimeseriesviewer/main.py b/eotimeseriesviewer/main.py index e09b377f6951237de8c8fa449c23e768d4b58191..a9ddc078189fe5196ffcdf14c1d1d1b93f467089 100644 --- a/eotimeseriesviewer/main.py +++ b/eotimeseriesviewer/main.py @@ -305,9 +305,6 @@ class TimeSeriesViewer(QgisInterface, QObject): application at run time. :type iface: QgsInterface """ - - # assert TimeSeriesViewer.instance() is None - QObject.__init__(self) QgisInterface.__init__(self) QApplication.processEvents() @@ -328,12 +325,9 @@ class TimeSeriesViewer(QgisInterface, QObject): self.mSpatialMapExtentInitialized = False self.mTimeSeries.sigTimeSeriesDatesAdded.connect(self.onTimeSeriesChanged) - - self.ui.dockTimeSeries.setTimeSeries(self.mTimeSeries) self.ui.dockSensors.setTimeSeries(self.mTimeSeries) - self.spectralTemporalVis = SpectralTemporalVisualization(self.mTimeSeries, self.ui.dockProfiles) self.spectralTemporalVis.pixelLoader.sigLoadingFinished.connect( lambda dt: self.ui.dockSystemInfo.addTimeDelta('Pixel Profile', dt)) @@ -341,10 +335,6 @@ class TimeSeriesViewer(QgisInterface, QObject): from eotimeseriesviewer.mapvisualization import SpatialTemporalVisualization self.spatialTemporalVis = SpatialTemporalVisualization(self) - # self.spatialTemporalVis.sigLoadingStarted.connect(self.ui.dockRendering.addStartedWork) - # self.spatialTemporalVis.sigLoadingFinished.connect(self.ui.dockRendering.addFinishedWork) - # self.spatialTemporalVis.sigShowProfiles.connect(self.spectralTemporalVis.loadCoordinate) - self.spatialTemporalVis.sigShowProfiles.connect(self.onShowProfile) self.ui.dockMapViews.sigCrsChanged.connect(self.spatialTemporalVis.setCrs) self.ui.dockMapViews.sigMapSizeChanged.connect(self.spatialTemporalVis.setMapSize) @@ -354,9 +344,6 @@ class TimeSeriesViewer(QgisInterface, QObject): self.spatialTemporalVis.sigVisibleDatesChanged.connect(self.timeSeries().setCurrentDates) self.spectralTemporalVis.sigMoveToTSD.connect(self.showTimeSeriesDatum) - - - tstv = self.ui.dockTimeSeries.timeSeriesTreeView assert isinstance(tstv, TimeSeriesTreeView) tstv.sigMoveToDateRequest.connect(self.showTimeSeriesDatum) @@ -372,8 +359,6 @@ class TimeSeriesViewer(QgisInterface, QObject): action.setProperty('eotsv/maptoolkey', key) self.ui.registerMapToolAction(action) - - initMapToolAction(self.ui.actionPan, MapTools.Pan) initMapToolAction(self.ui.actionZoomIn, MapTools.ZoomIn) initMapToolAction(self.ui.actionZoomOut, MapTools.ZoomOut) @@ -447,14 +432,12 @@ class TimeSeriesViewer(QgisInterface, QObject): SLW = self.ui.dockSpectralLibrary.spectralLibraryWidget() assert isinstance(SLW, SpectralLibraryWidget) - #SLW.sigLoadFromMapRequest.connect(self.ui.actionIdentifySpectralProfile.trigger) + SLW.setMapInteraction(True) SLW.setCurrentProfilesMode(SpectralLibraryWidget.CurrentProfilesMode.automatically) SLW.sigMapExtentRequested.connect(self.setSpatialExtent) SLW.sigMapCenterRequested.connect(self.setSpatialCenter) - # add the cadDock - # add time-specific fields sl = self.spectralLibrary() @@ -473,7 +456,6 @@ class TimeSeriesViewer(QgisInterface, QObject): self.mMapLayerStore.addMapLayer(temporalProfileLayer) self.spatialTemporalVis.sigMapViewAdded.connect(self.onMapViewAdded) - #QgsProject.instance().addMapLayer(temporalProfileLayer) eotimeseriesviewer.labeling.MAP_LAYER_STORES.append(self.mMapLayerStore) eotimeseriesviewer.labeling.registerLabelShortcutEditorWidget() diff --git a/eotimeseriesviewer/timeseries.py b/eotimeseriesviewer/timeseries.py index 7e3bd4e45dc61caa8180b5a71bad375b341e3fb6..19df05676344c89cf0eabfbf71ea51fdf543e605 100644 --- a/eotimeseriesviewer/timeseries.py +++ b/eotimeseriesviewer/timeseries.py @@ -833,8 +833,6 @@ class TimeSeriesTreeView(QTreeView): def __init__(self, parent=None): super(TimeSeriesTreeView, self).__init__(parent) - - def contextMenuEvent(self, event: QContextMenuEvent): """ Creates and shows the QMenu @@ -888,7 +886,7 @@ class TimeSeriesTreeView(QTreeView): info.append(delimiter.join([str(v) for v in values])) info = '\n'.join(info) QApplication.clipboard().setText(info) - s = "" + class TimeSeriesTableView(QTableView): diff --git a/eotimeseriesviewer/ui/profileviewdock.ui b/eotimeseriesviewer/ui/profileviewdock.ui index 26f212df0fbce8add8c70348008b1d2c68294ca3..31379d46779b7678ae88f165b044786fedcb86b9 100644 --- a/eotimeseriesviewer/ui/profileviewdock.ui +++ b/eotimeseriesviewer/ui/profileviewdock.ui @@ -6,10 +6,16 @@ <rect> <x>0</x> <y>0</y> - <width>885</width> - <height>442</height> + <width>773</width> + <height>235</height> </rect> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> <property name="features"> <set>QDockWidget::AllDockWidgetFeatures</set> </property> diff --git a/eotimeseriesviewer/ui/timeseriesdock.ui b/eotimeseriesviewer/ui/timeseriesdock.ui index b8c88058a8738db27b81d956793aeebd3b37d32f..e3ccc43981adc8e67b8fe3e54d32ba803904f4fd 100644 --- a/eotimeseriesviewer/ui/timeseriesdock.ui +++ b/eotimeseriesviewer/ui/timeseriesdock.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>640</width> - <height>224</height> + <height>198</height> </rect> </property> <property name="sizePolicy"> @@ -16,6 +16,12 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>152</width> + <height>139</height> + </size> + </property> <property name="windowTitle"> <string>Time Series</string> </property> @@ -247,7 +253,7 @@ <property name="maximumSize"> <size> <width>16777215</width> - <height>15</height> + <height>524287</height> </size> </property> <property name="frameShape"> diff --git a/eotimeseriesviewer/ui/timeseriesviewer.ui b/eotimeseriesviewer/ui/timeseriesviewer.ui index 6fa62ebbc8112379fa814f02142e0969afa4d7a9..cee5fad83f1e1d511d11367cad5142a492099753 100644 --- a/eotimeseriesviewer/ui/timeseriesviewer.ui +++ b/eotimeseriesviewer/ui/timeseriesviewer.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>887</width> - <height>157</height> + <height>475</height> </rect> </property> <property name="windowTitle"> @@ -34,14 +34,14 @@ </property> <widget class="QWidget" name="centralWidget"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>100</width> + <width>0</width> <height>0</height> </size> </property> @@ -76,12 +76,12 @@ <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>1</horstretch> - <verstretch>0</verstretch> + <verstretch>1</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>50</width> + <width>0</width> <height>0</height> </size> </property> @@ -103,7 +103,7 @@ <x>0</x> <y>0</y> <width>885</width> - <height>69</height> + <height>387</height> </rect> </property> <property name="sizePolicy">