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

Hooking up av1.xslt for log import

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2016-12-31 09:56:08 +02:00 • committed by Subsurface
parent 02eb16aec5
commit e94d49668e
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/parse-xml.c
View file

@ -3738,6 +3738,7 @@ static struct xslt_files {
{ "SubsurfaceCSV", "subsurfacecsv.xslt", NULL }, { "SubsurfaceCSV", "subsurfacecsv.xslt", NULL },
{ "manualcsv", "manualcsv2xml.xslt", NULL }, { "manualcsv", "manualcsv2xml.xslt", NULL },
{ "logbook", "DiveLog.xslt", NULL }, { "logbook", "DiveLog.xslt", NULL },
{ "AV1", "av1.xslt", NULL },
{ NULL, } { NULL, }
}; };

5
desktop-widgets/divelogimportdialog.cpp
View file

@ -23,6 +23,7 @@ const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] =
{ "SensusCSV", 9, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "," }, { "SensusCSV", 9, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "," },
{ "Seabear CSV", 0, 1, 5, -1, -1, -1, -1, -1, 2, 3, 4, 6, -1, ";" }, { "Seabear CSV", 0, 1, 5, -1, -1, -1, -1, -1, 2, 3, 4, 6, -1, ";" },
{ "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" }, { "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" },
{ "AV1", 0, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, " " },
{ NULL, SILENCE_WARNING } { NULL, SILENCE_WARNING }
}; };
@ -34,7 +35,8 @@ enum Known {
XP5, XP5,
SENSUS, SENSUS,
SEABEAR, SEABEAR,
SUBSURFACE SUBSURFACE,
AV1
}; };
ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(parent) ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(parent)
@ -348,6 +350,7 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia
specialCSV << SENSUS; specialCSV << SENSUS;
specialCSV << SUBSURFACE; specialCSV << SUBSURFACE;
specialCSV << DL7; specialCSV << DL7;
specialCSV << AV1;
for (int i = 0; !CSVApps[i].name.isNull(); ++i) for (int i = 0; !CSVApps[i].name.isNull(); ++i)
ui->knownImports->addItem(CSVApps[i].name); ui->knownImports->addItem(CSVApps[i].name);

2
desktop-widgets/divelogimportdialog.h
View file

@ -118,7 +118,7 @@ private:
QString separator; QString separator;
}; };
#define CSVAPPS 9 #define CSVAPPS 10
static const CSVAppConfig CSVApps[CSVAPPS]; static const CSVAppConfig CSVApps[CSVAPPS];
}; };

1
subsurface.qrc
View file

@ -46,6 +46,7 @@
<file>xslt/manualcsv2xml.xslt</file> <file>xslt/manualcsv2xml.xslt</file>
<file>xslt/shearwater.xslt</file> <file>xslt/shearwater.xslt</file>
<file>xslt/DiveLog.xslt</file> <file>xslt/DiveLog.xslt</file>
<file>xslt/av1.xslt</file>
<file alias="icon_lung">icons/gas.png</file> <file alias="icon_lung">icons/gas.png</file>
<file alias="icon_mod">icons/mod.png</file> <file alias="icon_mod">icons/mod.png</file>
<file alias="icon_he">icons/he.png</file> <file alias="icon_he">icons/he.png</file>