update for BTL processing

Makefile

@@ -6,6 +6,7 @@ TEST_PATH = tests
 OPTIONS_CTD = data/CTD/cnv/dfr2900?.cnv -i CTD -k PRES ETDD TEMP PSAL DOX2 DENS SVEL FLU2 FLU3 TUR3 NAVG
 OPTIONS_XBT = data/XBT/T7_0000*.EDF -i XBT -k DEPTH TEMP SVEL
 OPTIONS_LADCP = data/LADCP/*.lad -i LADCP -k DEPTH EWCT NSCT
+OPTIONS_BTL =  data/CTD/btl/fr290*.btl -i BTL -k PRES DEPTH ETDD TE01 TE02 PSA1 PSA2 DO11 DO12 DO21 DO22 FLU2
 
 .PHONY: clean-pyc clean-build lint test run build
 
@@ -26,16 +27,19 @@ lint:
 test: 
 	$(PYTHON) -m unittest  discover -v  $(TEST_PATH)
 
-# to run program in GUI mode : make ctd GUI=-g
+# to run program in GUI mode : make ctd OPT=-g
+# to run program in debug mode : make ctd OPT=-d
 ctd:
-	$(PYTHON) $(MAIN) $(OPTIONS_CTD) $(GUI)
+	$(PYTHON) $(MAIN) $(OPTIONS_CTD) $(OPT)
 
-# to run program in GUI mode : make xbt GUI=-g
 xbt:
-	$(PYTHON) $(MAIN) $(OPTIONS_XBT) $(GUI)
+	$(PYTHON) $(MAIN) $(OPTIONS_XBT) $(OPT)
 
 ladcp:
-	$(PYTHON) $(MAIN) $(OPTIONS_LADCP) $(GUI)
+	$(PYTHON) $(MAIN) $(OPTIONS_LADCP) $(OPT)
+
+btl:
+	$(PYTHON) $(MAIN) $(OPTIONS_BTL) $(OPT)
 
 build:
 	pyinstaller -wF --clean $(MAIN)

tests/test.toml

@@ -50,12 +50,25 @@ julianOrigin = 1
 [btl]
 typeInstrument           = "SBE32 standard 24 Niskin bottles"
 instrumentNumber         = "unknown"
-titleSummary   = "Water sample during PIRATA-FR29 cruise with 20 levels"
+titleSummary   = "Water sample during PIRATA-FR32 cruise with 22 levels"
 comment        = "CTD bottles water sampling with temperature, salinity and oxygen from primary and secondary sensors"
+dateTimeFormat = "%d/%b/%Y %H:%M:%S"
 julianOrigin = 1
+skipLineWith = "(sdev)"
 
-[xbt]
+	[btl.header]
+	endHeader = '^\s+Position\s+Time\s+$'
+	station = 'Station\s*:\s*\D*(\d*)'
+	DATETIME = 'System UpLoad Time\s*=\s*(\w+)\s+(\d+)\s+(\d+)\s+(\d+):(\d+):(\d+)'
+	LATITUDE = 'NMEA\s+Latitude\s*[:=]\s*(\d+)\s+(\d+\.\d+)\s+(\w)'
+	LONGITUDE = 'NMEA\s+Longitude\s*[:=]\s*(\d+)\s+(\d+.\d+)\s+(\w)'
+	DATE = 'Date\s*:\s*(\d+)/(\d+)/(\d+)'
+	TIME = '[Heure|Hour]\s*:\s*(\d+)[:hH](\d+):(\d+)'
+	BATH = 'Bottom Depth\s*:\s*(\d*\.?\d+?)\s*\S*'
+	operator = 'Operator\s*:\s*(.*)'
+	type = 'Type\s*:\s*(.*)'
 
+[xbt]
 cruisePrefix   = "fr29"
 stationPrefixLength  = 3
 typeInstrument   = "SIPPICAN+"
@@ -156,32 +169,29 @@ comment        = "Extract from .lad files"
 	SVEL = 21
 	NAVG = 23
 
-	[split.btl]
-	BOTL = 1
-	month = 2
-	day = 3
-	year = 4
-	PSA1 = 5
-	PSA2 = 6
-	DO11 = 7
-	DO12 = 8
-	DO21 = 9
-	DO22 = 10
-	Potemp090C = 11
-	Potemp190C = 12
-	ETDD = 13
-	PRES = 14
-	DEPH = 15
-	TE01 = 16
-	TE02 = 17
-	CND1 = 18
-	CND2 = 19
-	DOV1 = 20
-	DOV2 = 21
-	DVT1 = 22
-	DVT2 = 23
-	TUR3 = 24
-	FLU2 = 25
+		[split.btl]
+	BOTL = 0
+	PSA1 = 4
+	PSA2 = 5
+	DO11 = 6
+	DO12 = 7
+	DO21 = 8
+	DO22 = 9
+	Potemp090C = 10
+	Potemp190C = 11
+	ETDD = 12
+	PRES = 13
+	DEPTH = 14
+	TE01 = 15
+	TE02 = 16
+	CND1 = 17
+	CND2 = 18
+	DOV1 = 19
+	DOV2 = 20
+	DVT1 = 21
+	DVT2 = 22
+	TUR3 = 23
+	FLU2 = 24
 	
 [split.xbt]
 	DEPTH = 0