mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CSV import/export: Sort parameter list and add comment

Browse source 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2018-03-14 21:38:38 +01:00 • committed by Dirk Hohndel
parent 46f1fea1b6
commit 5c9345976c
1 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

56
tests/testparse.cpp
View file

@ -306,6 +306,7 @@ int TestParse::parseCSVmanual(int units, std::string file)
char *params[55]; char *params[55];
int pnr = 0; int pnr = 0;
// Numbers are column numbers
params[pnr++] = strdup("numberField"); params[pnr++] = strdup("numberField");
params[pnr++] = intdup(0); params[pnr++] = intdup(0);
params[pnr++] = strdup("dateField"); params[pnr++] = strdup("dateField");
@ -314,14 +315,28 @@ int TestParse::parseCSVmanual(int units, std::string file)
params[pnr++] = intdup(2); params[pnr++] = intdup(2);
params[pnr++] = strdup("durationField"); params[pnr++] = strdup("durationField");
params[pnr++] = intdup(3); params[pnr++] = intdup(3);
params[pnr++] = strdup("locationField");
params[pnr++] = intdup(13);
params[pnr++] = strdup("gpsField");
params[pnr++] = intdup(14);
params[pnr++] = strdup("maxDepthField"); params[pnr++] = strdup("maxDepthField");
params[pnr++] = intdup(4); params[pnr++] = intdup(4);
params[pnr++] = strdup("meanDepthField"); params[pnr++] = strdup("meanDepthField");
params[pnr++] = intdup(5); params[pnr++] = intdup(5);
params[pnr++] = strdup("airtempField");
params[pnr++] = intdup(6);
params[pnr++] = strdup("watertempField");
params[pnr++] = intdup(7);
params[pnr++] = strdup("cylindersizeField");
params[pnr++] = intdup(8);
params[pnr++] = strdup("startpressureField");
params[pnr++] = intdup(9);
params[pnr++] = strdup("endpressureField");
params[pnr++] = intdup(10);
params[pnr++] = strdup("o2Field");
params[pnr++] = intdup(11);
params[pnr++] = strdup("heField");
params[pnr++] = intdup(12);
params[pnr++] = strdup("locationField");
params[pnr++] = intdup(13);
params[pnr++] = strdup("gpsField");
params[pnr++] = intdup(14);
params[pnr++] = strdup("divemasterField"); params[pnr++] = strdup("divemasterField");
params[pnr++] = intdup(15); params[pnr++] = intdup(15);
params[pnr++] = strdup("buddyField"); params[pnr++] = strdup("buddyField");
@ -334,28 +349,15 @@ int TestParse::parseCSVmanual(int units, std::string file)
params[pnr++] = intdup(21); params[pnr++] = intdup(21);
params[pnr++] = strdup("tagsField"); params[pnr++] = strdup("tagsField");
params[pnr++] = intdup(22); params[pnr++] = intdup(22);
// Numbers are indexes of possible options
params[pnr++] = strdup("separatorIndex"); params[pnr++] = strdup("separatorIndex");
params[pnr++] = intdup(0); params[pnr++] = intdup(0);
params[pnr++] = strdup("units");
params[pnr++] = intdup(units);
params[pnr++] = strdup("datefmt"); params[pnr++] = strdup("datefmt");
params[pnr++] = intdup(2); params[pnr++] = intdup(2);
params[pnr++] = strdup("durationfmt"); params[pnr++] = strdup("durationfmt");
params[pnr++] = intdup(2); params[pnr++] = intdup(2);
params[pnr++] = strdup("cylindersizeField"); params[pnr++] = strdup("units");
params[pnr++] = intdup(8); params[pnr++] = intdup(units);
params[pnr++] = strdup("startpressureField");
params[pnr++] = intdup(9);
params[pnr++] = strdup("endpressureField");
params[pnr++] = intdup(10);
params[pnr++] = strdup("o2Field");
params[pnr++] = intdup(11);
params[pnr++] = strdup("heField");
params[pnr++] = intdup(12);
params[pnr++] = strdup("airtempField");
params[pnr++] = intdup(6);
params[pnr++] = strdup("watertempField");
params[pnr++] = intdup(7);
params[pnr++] = NULL; params[pnr++] = NULL;
return parse_manual_file(file.c_str(), params, pnr - 1); return parse_manual_file(file.c_str(), params, pnr - 1);
@ -385,14 +387,13 @@ int TestParse::parseCSVprofile(int units, std::string file)
char *params[55]; char *params[55];
int pnr = 0; int pnr = 0;
params[pnr++] = strdup("dateField"); // Numbers are column numbers
params[pnr++] = intdup(1);
params[pnr++] = strdup("datefmt");
params[pnr++] = intdup(2);
params[pnr++] = strdup("starttimeField");
params[pnr++] = intdup(2);
params[pnr++] = strdup("numberField"); params[pnr++] = strdup("numberField");
params[pnr++] = intdup(0); params[pnr++] = intdup(0);
params[pnr++] = strdup("dateField");
params[pnr++] = intdup(1);
params[pnr++] = strdup("starttimeField");
params[pnr++] = intdup(2);
params[pnr++] = strdup("timeField"); params[pnr++] = strdup("timeField");
params[pnr++] = intdup(3); params[pnr++] = intdup(3);
params[pnr++] = strdup("depthField"); params[pnr++] = strdup("depthField");
@ -401,6 +402,9 @@ int TestParse::parseCSVprofile(int units, std::string file)
params[pnr++] = intdup(5); params[pnr++] = intdup(5);
params[pnr++] = strdup("pressureField"); params[pnr++] = strdup("pressureField");
params[pnr++] = intdup(6); params[pnr++] = intdup(6);
// Numbers are indexes of possible options
params[pnr++] = strdup("datefmt");
params[pnr++] = intdup(2);
params[pnr++] = strdup("units"); params[pnr++] = strdup("units");
params[pnr++] = intdup(units); params[pnr++] = intdup(units);
params[pnr++] = NULL; params[pnr++] = NULL;