seabirdfilehandler 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

seabirdfilehandler/cnvfile.py

@@ -160,7 +160,7 @@ class CnvFile(DataFile):
     def array2cnv(self) -> list:
         result = []
         for row in self.parameters.full_data_array:
-            formatted_row = "".join(elem.rjust(11) for elem in row)
+            formatted_row = "".join(str(elem).rjust(11) for elem in row)
             result.append(formatted_row + "\n")
         return result
 
@@ -217,23 +217,21 @@ class CnvFile(DataFile):
         self.data = self.array2cnv()
         self.file_data = [*self.header, *self.data]
 
-    def add_processing_metadata(self, addition: str | list):
+    def add_processing_metadata(self, module: str, key: str, value: str):
         """
         Adds new processing lines to the list of processing module information
 
         Parameters
         ----------
-        addition: str:
-            the new information line
+        module: str :
+            the name of the processing module
+        key: str :
+            the description of the value
+        value: str :
+            the information
 
         """
-        if isinstance(addition, str):
-            addition = [addition]
-        self.processing_steps.append(
-            self.processing_steps.create_step_instance(
-                module=addition[0].split("_")[0], raw_info=addition
-            )
-        )
+        self.processing_steps.add_info(module, key, value)
         self._update_header()
 
     def add_station_and_event_column(self) -> bool:

seabirdfilehandler/parameter.py

@@ -78,7 +78,7 @@ class Parameters(UserDict):
                     for i in range(0, len(line) - n, n)
                 ]
             )
-        return np.array(row_list, dtype="<U20")
+        return np.array(row_list, dtype=float)
 
     def create_parameter_instances(
         self,
@@ -205,10 +205,11 @@ class Parameters(UserDict):
             parameter.name: parameter.metadata
             for parameter in self.data.values()
         }
-        # add to full numpy data array
-        self.full_data_array = np.insert(
-            self.full_data_array, position_index, parameter.data, axis=1
-        )
+        # add to the data array if data
+        if parameter.type == "data":
+            self.full_data_array = np.insert(
+                self.full_data_array, position_index, parameter.data, axis=1
+            )
 
     def create_parameter(
         self,
@@ -449,6 +450,7 @@ class Parameter:
         self.data = data
         self.metadata = metadata
         self.name = metadata["shortname"]
+        self.type = "data" if self.data.dtype in ["float", "int"] else "meta"
         self.parse_to_float()
         self.update_span()
 

seabirdfilehandler/processing_steps.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 from collections import UserList
+import copy
 
 
 class CnvProcessingSteps(UserList):
@@ -28,6 +29,7 @@ class CnvProcessingSteps(UserList):
     def _form_processing_info(self) -> list:
         out_list = []
         for module in self.data:
+            module = copy.deepcopy(module)
             if "vars" in module.metadata and module.name != "wildedit":
                 module.metadata["date"] = (
                     module.metadata["date"]
@@ -167,6 +169,39 @@ class CnvProcessingSteps(UserList):
                 return self.data[index]
         return None
 
+    def add_info(
+        self,
+        module: str,
+        key: str,
+        value: str,
+    ) -> ProcessingStep | None:
+        """
+        Adds new processing lines to the list of processing module information
+
+        Parameters
+        ----------
+        module: str :
+            the name of the processing module
+        key: str :
+            the description of the value
+        value: str :
+            the information
+
+        Returns
+        -------
+        the altered ProcessingStep
+
+        """
+        if module in self.modules:
+            step_info = self.get_step(module)
+            if step_info:
+                step_info.metadata[key] = value
+        else:
+            step_info = ProcessingStep(name=module, metadata={key: value})
+            self.data.append(step_info)
+            self.modules.append(module)
+        return step_info
+
 
 class ProcessingStep:
     """

{seabirdfilehandler-0.7.1.dist-info → seabirdfilehandler-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: seabirdfilehandler
-Version: 0.7.1
+Version: 0.7.3
 Summary: Library of parsers to interact with SeaBird CTD files.
 Keywords: CTD,parser,seabird,data
 Author: Emil Michels

{seabirdfilehandler-0.7.1.dist-info → seabirdfilehandler-0.7.3.dist-info}/RECORD

@@ -1,16 +1,16 @@
 seabirdfilehandler/__init__.py,sha256=PSokwgSgsmpFh-2Xv2T2d3yxmmahLnIq58WLZ51l86I,276
 seabirdfilehandler/bottlefile.py,sha256=qCh506J3MWZXM11243aw_oJRocVB0ZIipXQLEgkD5M0,6046
 seabirdfilehandler/bottlelogfile.py,sha256=MtMmEebdAktO3mk6KbmJC7dfx9sRLbV5qqDQt2qtpJE,4310
-seabirdfilehandler/cnvfile.py,sha256=e90-1NDc3na8d1UCRG0qo3N6hhxicPcHYaYbCvajWEg,10105
+seabirdfilehandler/cnvfile.py,sha256=DL5JimbFaznTcTzWiXcez6wviNIjq3kcGwvf3wO4zyY,10041
 seabirdfilehandler/datafiles.py,sha256=HQungz24lRw4OiTwWs_curAGhzkI1rPiCmMXXcdQFNE,9423
 seabirdfilehandler/file_collection.py,sha256=oLdjS-Q4_33T0qo_SYxkqg2bsaeg4gLVKBkOPxoTXx4,16111
 seabirdfilehandler/geomar_ctd_file_parser.py,sha256=4eCnkE0mvPKC8Dic8sXP4xpfwnk3K2MQcGFBf6loT8k,2655
 seabirdfilehandler/hexfile.py,sha256=TBplwbWHrTuJzv2qlx6xYNtoX43I2YUabDmaGZuBEDQ,2144
-seabirdfilehandler/parameter.py,sha256=h-iaDFUdKDVpm_N1TX3jv7VCot-lGO7j_0an901BIhI,15938
-seabirdfilehandler/processing_steps.py,sha256=TYqzzVjFxz3EbLZcNTlZIFpMguyJcT6S2bLCFG35NDY,6185
+seabirdfilehandler/parameter.py,sha256=r4cdqhhi8CJE3xyo_6BtKjQ5R7AZKyXHURDhFKL8mC4,16065
+seabirdfilehandler/processing_steps.py,sha256=5v6FV5zT7K6flbYLU31fyBRwPwQi4225se8i9WYUTQQ,7101
 seabirdfilehandler/utils.py,sha256=5KXdB8Hdv65dv5tPyXxNMct1mCEOyA3S8XP54AFAnx0,1745
 seabirdfilehandler/xmlfiles.py,sha256=XqqbVNjyINySoe2ZC_qJglkAqshavZxT2-jorDOSj7Y,5084
-seabirdfilehandler-0.7.1.dist-info/LICENSE,sha256=Ifd1VPmYv32oJd2QVh3wIQP9X05vYJlcY6kONz360ws,34603
-seabirdfilehandler-0.7.1.dist-info/METADATA,sha256=WXPaDmBRjaJPw29GB_z_-zglgbbP_EhEeQvMw0q_O6s,2307
-seabirdfilehandler-0.7.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-seabirdfilehandler-0.7.1.dist-info/RECORD,,
+seabirdfilehandler-0.7.3.dist-info/LICENSE,sha256=Ifd1VPmYv32oJd2QVh3wIQP9X05vYJlcY6kONz360ws,34603
+seabirdfilehandler-0.7.3.dist-info/METADATA,sha256=TqO2WAe-otgi5fErZ1hp-YT37T67PPeULtee8WfMG8Y,2307
+seabirdfilehandler-0.7.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+seabirdfilehandler-0.7.3.dist-info/RECORD,,