Skip to content

Commit

Permalink
Merge pull request #199 from hytechimaging/fix_export_right_center_ob…
Browse files Browse the repository at this point in the history
…server

fix export info for right and center observer
  • Loading branch information
SebastienPeillet authored Mar 14, 2024
2 parents eeb2bab + d6f910f commit 44b51da
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 18 deletions.
37 changes: 22 additions & 15 deletions src/gui/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,23 +163,30 @@ def export(self) -> None:
layer.addJoin(self.obsSpeLayerJoinInfo(speciesJoinLayer))

elif layer.name() == self.session.environmentLayer.name():
obsJoinLayer = QgsVectorLayer(
obsJoinLayerLeft = QgsVectorLayer(
self.session.observersLayer.source(),
self.session.observersLayer.name(),
f"{self.session.observersLayer.name()}_left",
) # keepped alive until export is done
layer.addJoin(
self.environmentLayerJoinObserverInfo(obsJoinLayer, "left")
)
layer.addJoin(
self.environmentLayerJoinObserverInfo(
obsJoinLayer, "rigth"
)
)
layer.addJoin(
self.environmentLayerJoinObserverInfo(
obsJoinLayer, "center"
)
)
left_join = self.environmentLayerJoinObserverInfo(
obsJoinLayerLeft, "left"
) # keepped alive until export is done
layer.addJoin(left_join)
obsJoinLayerRight = QgsVectorLayer(
self.session.observersLayer.source(),
f"{self.session.observersLayer.name()}_right",
) # keepped alive until export is done
right_join = self.environmentLayerJoinObserverInfo(
obsJoinLayerRight, "right"
) # keepped alive until export is done
layer.addJoin(right_join)
obsJoinLayerCenter = QgsVectorLayer(
self.session.observersLayer.source(),
f"{self.session.observersLayer.name()}_center",
) # keepped alive until export is done
center_join = self.environmentLayerJoinObserverInfo(
obsJoinLayerCenter, "center"
) # keepped alive until export is done
layer.addJoin(center_join)
plateformJoinLayer = QgsVectorLayer(
self.session.plateformLayer.source(),
self.session.plateformLayer.name(),
Expand Down
6 changes: 3 additions & 3 deletions src/gui/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def __init__(
self.setupUi(self)

self.tables = {}
self.tables[
environmentLayer.name()
] = SammoAttributeTable.attributeTable(iface, environmentLayer)
self.tables[environmentLayer.name()] = (
SammoAttributeTable.attributeTable(iface, environmentLayer)
)
self.tables[environmentLayer.name()].setMinimumSize(QSize(10, 10))
self.tables[environmentLayer.name()].installEventFilter(self)
self.tables[sightingLayer.name()] = SammoAttributeTable.attributeTable(
Expand Down

0 comments on commit 44b51da

Please sign in to comment.