From b0619b334560a16578069d3b6b7615988618d87f Mon Sep 17 00:00:00 2001 From: Kevin F Date: Mon, 7 Oct 2024 13:40:36 +0200 Subject: [PATCH] Fix wrong csv row selector format #529 :bug: --- src/Client/Pages/DataAnnotator/DataAnnotator.fs | 2 +- src/Client/States/DataAnnotator.fs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Client/Pages/DataAnnotator/DataAnnotator.fs b/src/Client/Pages/DataAnnotator/DataAnnotator.fs index 358874b8..ee291e0c 100644 --- a/src/Client/Pages/DataAnnotator/DataAnnotator.fs +++ b/src/Client/Pages/DataAnnotator/DataAnnotator.fs @@ -317,7 +317,7 @@ type DataAnnotator = prop.onClick(fun e -> match model.DataAnnotatorModel.DataFile with | Some dtf -> - let selectors = [|for x in state do x.ToFragmentSelectorString()|] + let selectors = [|for x in state do x.ToFragmentSelectorString(model.DataAnnotatorModel.ParsedFile.Value.HeaderRow.IsSome)|] let name = dtf.DataFileName let dt = dtf.DataFileType SpreadsheetInterface.AddDataAnnotation {|fileName=name; fileType=dt; fragmentSelectors=selectors; targetColumn=targetCol|} diff --git a/src/Client/States/DataAnnotator.fs b/src/Client/States/DataAnnotator.fs index 50cfaeb2..604b9408 100644 --- a/src/Client/States/DataAnnotator.fs +++ b/src/Client/States/DataAnnotator.fs @@ -18,9 +18,10 @@ type DataTarget = | Row of int | Column of int - member this.ToFragmentSelectorString() = + member this.ToFragmentSelectorString(hasHeader: bool) = + let rowOffset = if hasHeader then 2 else 1 // header counts and is 1-based match this with - | Row ri -> sprintf "row=%i" ri + | Row ri -> sprintf "row=%i" (ri + rowOffset) | Column ci -> sprintf "col=%i" ci | Cell (ci, ri) -> sprintf "cell=%i,%i" ri ci