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

core: port save-html.c to C++

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-10 16:35:53 +01:00 • committed by bstoeger
parent 177b03958c
commit 82ba236859
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Subsurface-mobile.pro
View file

@ -73,7 +73,7 @@ SOURCES += subsurface-mobile-main.cpp \
core/import-cobalt.cpp \ core/import-cobalt.cpp \
core/import-divinglog.cpp \ core/import-divinglog.cpp \
core/import-csv.cpp \ core/import-csv.cpp \
core/save-html.c \ core/save-html.cpp \
core/statistics.c \ core/statistics.c \
core/worldmap-save.cpp \ core/worldmap-save.cpp \
core/libdivecomputer.cpp \ core/libdivecomputer.cpp \

2
core/CMakeLists.txt
View file

@ -156,7 +156,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
sample.cpp sample.cpp
sample.h sample.h
save-git.cpp save-git.cpp
save-html.c save-html.cpp
save-html.h save-html.h
save-profiledata.c save-profiledata.c
save-xml.cpp save-xml.cpp

24
core/save-html.c → core/save-html.cpp
View file

@ -36,7 +36,7 @@ static void save_photos(struct membuffer *b, const char *photos_dir, struct dive
if (dive->pictures.nr <= 0) if (dive->pictures.nr <= 0)
return; return;
char *separator = "\"photos\":["; const char *separator = "\"photos\":[";
FOR_EACH_PICTURE(dive) { FOR_EACH_PICTURE(dive) {
put_string(b, separator); put_string(b, separator);
separator = ", "; separator = ", ";
@ -54,7 +54,7 @@ static void write_divecomputers(struct membuffer *b, struct dive *dive)
{ {
put_string(b, "\"divecomputers\":["); put_string(b, "\"divecomputers\":[");
struct divecomputer *dc; struct divecomputer *dc;
char *separator = ""; const char *separator = "";
for_each_dc (dive, dc) { for_each_dc (dive, dc) {
put_string(b, separator); put_string(b, separator);
separator = ", "; separator = ", ";
@ -87,7 +87,7 @@ static void put_HTML_bookmarks(struct membuffer *b, struct dive *dive)
if (!ev) if (!ev)
return; return;
char *separator = "\"events\":["; const char *separator = "\"events\":[";
do { do {
put_string(b, separator); put_string(b, separator);
separator = ", "; separator = ", ";
@ -110,7 +110,7 @@ static void put_weightsystem_HTML(struct membuffer *b, struct dive *dive)
put_string(b, "\"Weights\":["); put_string(b, "\"Weights\":[");
char *separator = ""; const char *separator = "";
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
weightsystem_t ws = dive->weightsystems.weightsystems[i]; weightsystem_t ws = dive->weightsystems.weightsystems[i];
@ -130,7 +130,7 @@ static void put_weightsystem_HTML(struct membuffer *b, struct dive *dive)
static void put_cylinder_HTML(struct membuffer *b, struct dive *dive) static void put_cylinder_HTML(struct membuffer *b, struct dive *dive)
{ {
int i, nr; int i, nr;
char *separator = "\"Cylinders\":["; const char *separator = "\"Cylinders\":[";
nr = nr_cylinders(dive); nr = nr_cylinders(dive);
if (!nr) if (!nr)
@ -143,7 +143,7 @@ static void put_cylinder_HTML(struct membuffer *b, struct dive *dive)
write_attribute(b, "Type", cylinder->type.description, ", "); write_attribute(b, "Type", cylinder->type.description, ", ");
if (cylinder->type.size.mliter) { if (cylinder->type.size.mliter) {
int volume = cylinder->type.size.mliter; int volume = cylinder->type.size.mliter;
if (prefs.units.volume == CUFT && cylinder->type.workingpressure.mbar) if (prefs.units.volume == units::CUFT && cylinder->type.workingpressure.mbar)
volume = lrint(volume * bar_to_atm(cylinder->type.workingpressure.mbar / 1000.0)); volume = lrint(volume * bar_to_atm(cylinder->type.workingpressure.mbar / 1000.0));
put_HTML_volume_units(b, volume, "\"Size\":\"", " \", "); put_HTML_volume_units(b, volume, "\"Size\":\"", " \", ");
} else { } else {
@ -187,7 +187,7 @@ static void put_HTML_samples(struct membuffer *b, struct dive *dive)
if (!dive->dc.samples) if (!dive->dc.samples)
return; return;
char *separator = "\"samples\":["; const char *separator = "\"samples\":[";
for (i = 0; i < dive->dc.samples; i++) { for (i = 0; i < dive->dc.samples; i++) {
put_format(b, "%s[%d,%d,%d,%d]", separator, s->time.seconds, s->depth.mm, s->pressure[0].mbar, s->temperature.mkelvin); put_format(b, "%s[%d,%d,%d,%d]", separator, s->time.seconds, s->depth.mm, s->pressure[0].mbar, s->temperature.mkelvin);
separator = ", "; separator = ", ";
@ -292,11 +292,11 @@ void put_HTML_depth(struct membuffer *b, struct dive *dive, const char *pre, con
value = get_depth_units(dive->maxdepth.mm, NULL, &unit); value = get_depth_units(dive->maxdepth.mm, NULL, &unit);
switch (units_p->length) { switch (units_p->length) {
case METERS: case units::METERS:
default: default:
put_format(b, "%s%.1f %s%s", pre, value, unit, post); put_format(b, "%s%.1f %s%s", pre, value, unit, post);
break; break;
case FEET: case units::FEET:
put_format(b, "%s%.0f %s%s", pre, value, unit, post); put_format(b, "%s%.0f %s%s", pre, value, unit, post);
break; break;
} }
@ -336,7 +336,7 @@ static void put_HTML_tags(struct membuffer *b, struct dive *dive, const char *pr
if (!tag) if (!tag)
put_string(b, "[\"--\""); put_string(b, "[\"--\"");
char *separator = "["; const char *separator = "[";
while (tag) { while (tag) {
put_format(b, "%s\"", separator); put_format(b, "%s\"", separator);
separator = ", "; separator = ", ";
@ -393,7 +393,7 @@ static void write_no_trip(struct membuffer *b, int *dive_no, bool selected_only,
{ {
int i; int i;
struct dive *dive; struct dive *dive;
char *separator = ""; const char *separator = "";
bool found_sel_dive = 0; bool found_sel_dive = 0;
for_each_dive (i, dive) { for_each_dive (i, dive) {
@ -419,7 +419,7 @@ static void write_no_trip(struct membuffer *b, int *dive_no, bool selected_only,
static void write_trip(struct membuffer *b, dive_trip_t *trip, int *dive_no, bool selected_only, const char *photos_dir, const bool list_only, char *sep) static void write_trip(struct membuffer *b, dive_trip_t *trip, int *dive_no, bool selected_only, const char *photos_dir, const bool list_only, char *sep)
{ {
struct dive *dive; struct dive *dive;
char *separator = ""; const char *separator = "";
bool found_sel_dive = 0; bool found_sel_dive = 0;
for (int i = 0; i < trip->dives.nr; i++) { for (int i = 0; i < trip->dives.nr; i++) {