Skip to content

Commit

Permalink
DEV - import data uvp5
Browse files Browse the repository at this point in the history
  • Loading branch information
juliecoust committed Nov 20, 2024
1 parent 13cd435 commit 7efeef9
Show file tree
Hide file tree
Showing 3 changed files with 182 additions and 253 deletions.
8 changes: 4 additions & 4 deletions src/data/data-sources/sqlite/sqlite-sample-data-source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ export class SQLiteSampleDataSource implements SampleDataSource {
instrument_settings_acq_gain INTEGER NOT NULL,
instrument_settings_acq_description TEXT,
instrument_settings_acq_task_type TEXT,
instrument_settings_acq_choice TEXT,
instrument_settings_acq_disk_type TEXT,
instrument_settings_acq_task_type INTEGER,
instrument_settings_acq_choice INTEGER,
instrument_settings_acq_disk_type INTEGER,
instrument_settings_acq_appendices_ratio INTEGER NOT NULL,
instrument_settings_acq_xsize INTEGER,
instrument_settings_acq_ysize INTEGER,
Expand All @@ -131,7 +131,7 @@ export class SQLiteSampleDataSource implements SampleDataSource {
instrument_settings_exp INTEGER NOT NULL,
instrument_settings_image_volume_l INTEGER NOT NULL,
instrument_settings_pixel_size_mm INTEGER NOT NULL,
instrument_settings_depth_offset_m INTEGER NOT NULL,
instrument_settings_depth_offset_m INTEGER,
instrument_settings_particle_minimum_size_pixels INTEGER,
instrument_settings_vignettes_minimum_size_pixels INTEGER,
instrument_settings_particle_minimum_size_esd INTEGER,
Expand Down
28 changes: 14 additions & 14 deletions src/domain/entities/sample.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export interface SampleRequestCreationModel {

instrument_settings_acq_gain: number; // Acquisition gain
instrument_settings_acq_description: string | undefined; // Acquisition description
instrument_settings_acq_task_type: string | undefined; // Acquisition task type
instrument_settings_acq_choice: string | undefined; // Acquisition choice
instrument_settings_acq_disk_type: string | undefined; // Acquisition disk type
instrument_settings_acq_task_type: number | undefined; // Acquisition task type
instrument_settings_acq_choice: number | undefined; // Acquisition choice
instrument_settings_acq_disk_type: number | undefined; // Acquisition disk type
instrument_settings_acq_appendices_ratio: number; // Acquisition ratio
instrument_settings_acq_xsize: number | undefined; // Acquisition X size (in pixels or relevant unit)
instrument_settings_acq_ysize: number | undefined; // Acquisition Y size (in pixels or relevant unit)
Expand Down Expand Up @@ -86,9 +86,9 @@ export interface SampleRequestModel {

instrument_settings_acq_gain?: number; // Acquisition gain
instrument_settings_acq_description?: string | undefined; // Acquisition description
instrument_settings_acq_task_type?: string | undefined; // Acquisition task type
instrument_settings_acq_choice?: string | undefined; // Acquisition choice
instrument_settings_acq_disk_type?: string | undefined; // Acquisition disk type
instrument_settings_acq_task_type?: number | undefined; // Acquisition task type
instrument_settings_acq_choice?: number | undefined; // Acquisition choice
instrument_settings_acq_disk_type?: number | undefined; // Acquisition disk type
instrument_settings_acq_appendices_ratio?: number; // Acquisition ratio
instrument_settings_acq_xsize?: number | undefined; // Acquisition X size (in pixels or relevant unit)
instrument_settings_acq_ysize?: number | undefined; // Acquisition Y size (in pixels or relevant unit)
Expand Down Expand Up @@ -233,9 +233,9 @@ export interface MetadataIniSampleModel {

instrument_settings_acq_gain: number; // Acquisition gain
instrument_settings_acq_description: string | undefined; // Acquisition description
instrument_settings_acq_task_type: string | undefined; // Acquisition task type
instrument_settings_acq_choice: string | undefined; // Acquisition choice
instrument_settings_acq_disk_type: string | undefined; // Acquisition disk type
instrument_settings_acq_task_type: number | undefined; // Acquisition task type
instrument_settings_acq_choice: number | undefined; // Acquisition choice
instrument_settings_acq_disk_type: number | undefined; // Acquisition disk type
instrument_settings_acq_appendices_ratio: number; // Acquisition ratio
instrument_settings_acq_xsize: number | undefined; // Acquisition X size (in pixels or relevant unit)
instrument_settings_acq_ysize: number | undefined; // Acquisition Y size (in pixels or relevant unit)
Expand Down Expand Up @@ -294,17 +294,17 @@ export interface SampleFromWorkDatfileModel {
export interface SampleFromWorkHDRModel {
instrument_settings_acq_gain: number, // Gain
instrument_settings_acq_description: string, // 2e ligne du fichier (retirer le ;)
instrument_settings_acq_task_type: string // TaskType
instrument_settings_acq_choice: string, // Choice
instrument_settings_acq_disk_type: string, // DiskType
instrument_settings_acq_task_type: number // TaskType
instrument_settings_acq_choice: number, // Choice
instrument_settings_acq_disk_type: number, // DiskType
instrument_settings_acq_appendices_ratio: number, // Ratio
instrument_settings_acq_erase_border: number, // EraseBorderBlobs
instrument_settings_acq_threshold: number, // Thresh
instrument_settings_particle_minimum_size_pixels: number, // SMbase
instrument_settings_vignettes_minimum_size_pixels: number, // SMzoo

instrument_settings_acq_shutter_speed: number, // Exposure UVP5HD ????????? #TODO
instrument_settings_acq_exposure: number // ShutterSpeed UVP5SD ????????? #TODO
instrument_settings_acq_shutter_speed: number | undefined, // Exposure UVP5HD ????????? #TODO
instrument_settings_acq_exposure: number | undefined // ShutterSpeed UVP5SD ????????? #TODO

}
export interface SampleFromCruiseInfoModel {
Expand Down
Loading

0 comments on commit 7efeef9

Please sign in to comment.