fix strate to strateType + load merged project

hytechimaging · Nov 27, 2023 · 0a8bd41 · 0a8bd41
1 parent 5ee4bee
commit 0a8bd41
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 9 deletions.
diff --git a/data/survey.csv b/data/survey.csv
@@ -1 +1,2 @@
-region,survey,computer,shipName,cycle,session
+region,survey,computer,shipName,cycle,session
+NEA,IBTS,computer_1,Europe,cycle_1,LEG1
diff --git a/data/transect.csv b/data/transect.csv
@@ -1 +1 @@
-transect;strate;subRegion;length;wkt
+transect;strateType;subRegion;length;wkt
diff --git a/doc/source/interface.rst b/doc/source/interface.rst
@@ -67,7 +67,7 @@ dialog as each can contains more than one entity.
 
 Especially for `Transect` table, it is possible to import a linear layer
 (EPSG:4326). The imported layer must have the same attribute names as the
-`Transect` table (transect,strate,subRegion,length). Transect entity reference
+`Transect` table (transect,strateType,subRegion,length). Transect entity reference
 will be available in the `Environment` table.
 
 3 - |save| Validation button

diff --git a/src/core/database.py b/src/core/database.py
@@ -346,7 +346,7 @@ def _fieldsSurvey(self) -> QgsFields:
     def _fieldsTransect(self) -> QgsFields:
         fields = QgsFields()
         fields.append(self._createFieldShortText("transect"))
-        fields.append(self._createFieldShortText("strate"))
+        fields.append(self._createFieldShortText("strateType"))
         fields.append(self._createFieldShortText("subRegion"))
         fields.append(QgsField("length", QVariant.Int))
 

diff --git a/src/core/layers/environment.py b/src/core/layers/environment.py
@@ -372,7 +372,7 @@ def _init_widgets(self, layer: QgsVectorLayer) -> None:
             "shipName",
             "computer",
             "transect",
-            "strate",
+            "strateType",
             "length",
             "plateformHeight",
             "_effortGroup",

diff --git a/src/core/layers/transect.py b/src/core/layers/transect.py
@@ -29,7 +29,7 @@ def _init_symbology(self, layer) -> None:
 
     def _init_widgets(self, layer: QgsVectorLayer) -> None:
         # strate
-        idx = layer.fields().indexFromName("strate")
+        idx = layer.fields().indexFromName("strateType")
         cfg = {}
         cfg["map"] = [
             {"Neritic": "Neritic"},

diff --git a/src/core/session.py b/src/core/session.py
@@ -612,7 +612,7 @@ def _addFeature(
                         "shipName",
                         "computer",
                         "transect",
-                        "strate",
+                        "strateType",
                         "length",
                         "comment",
                         "species",

diff --git a/src/gui/attribute_table.py b/src/gui/attribute_table.py
@@ -78,7 +78,7 @@ def attributeTable(
             "shipName",
             "computer",
             "transect",
-            "strate",
+            "strateType",
             "length",
             "plateformHeight",
             "observer",

diff --git a/src/gui/export.py b/src/gui/export.py
@@ -284,7 +284,7 @@ def environmentLayerJoinTransectInfo(self, layer: QgsVectorLayer) -> None:
         joinInfo.setJoinFieldName("fid")
         joinInfo.setTargetFieldName("transectId")
         joinInfo.setPrefix("")
-        joinInfo.setJoinFieldNamesSubset(["transect", "strate", "length"])
+        joinInfo.setJoinFieldNamesSubset(["transect", "strateType", "length"])
         return joinInfo
 
     def addEndEffortFeature(self, layer: QgsVectorLayer) -> QgsVectorLayer:

diff --git a/src/gui/merge.py b/src/gui/merge.py
@@ -123,6 +123,7 @@ def after_task(self):
         else:
             iface.messageBar().pushInfo("MergeTask", "Merge success")
             self.ok.setText("Success")
+        self.mergeEnded.emit(self.sessionMergedDir.text())
         self.show()
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		transect;strate;subRegion;length;wkt
		transect;strateType;subRegion;length;wkt