diff options
Diffstat (limited to 'backend-shared')
| -rw-r--r-- | backend-shared/exportfuncs.cpp | 22 | ||||
| -rw-r--r-- | backend-shared/exportfuncs.h | 8 |
2 files changed, 25 insertions, 5 deletions
diff --git a/backend-shared/exportfuncs.cpp b/backend-shared/exportfuncs.cpp index 24f133377..af6379001 100644 --- a/backend-shared/exportfuncs.cpp +++ b/backend-shared/exportfuncs.cpp @@ -15,8 +15,19 @@ #include "core/picture.h" #include "core/pref.h" #include "core/sample.h" +#include "core/selection.h" #include "exportfuncs.h" +// Default implementation of the export callback: do nothing / never cancel +void ExportCallback::setProgress(int) +{ +} + +bool ExportCallback::canceled() const +{ + return false; +} + #if !defined(SUBSURFACE_MOBILE) void exportProfile(QString filename, bool selected_only) { @@ -38,7 +49,7 @@ void exportProfile(QString filename, bool selected_only) } } -void export_TeX(const char *filename, bool selected_only, bool plain) +void export_TeX(const char *filename, bool selected_only, bool plain, ExportCallback &cb) { FILE *f; QDir texdir = QFileInfo(filename).dir(); @@ -91,10 +102,14 @@ void export_TeX(const char *filename, bool selected_only, bool plain) put_format(&buf, "\n%%%%%%%%%% Begin Dive Data: %%%%%%%%%%\n"); + int todo = selected_only ? amount_selected : dive_table.nr; + int done = 0; for_each_dive (i, dive) { + if (cb.canceled()) + return; if (selected_only && !dive->selected) continue; - + cb.setProgress(done++ * 1000 / todo); exportProfile(dive, texdir.filePath(QString("profile%1.png").arg(dive->number))); struct tm tm; utc_mkdate(dive->when, &tm); @@ -219,7 +234,6 @@ void export_TeX(const char *filename, bool selected_only, bool plain) dive->maxdepth.mm ? put_format(&buf, "\\def\\%sdepth{%.1f\\%sdepthunit}\n", ssrf, get_depth_units(dive->maxdepth.mm, NULL, &unit), ssrf) : put_format(&buf, "\\def\\%sdepth{}\n", ssrf); put_format(&buf, "\\%spage\n", ssrf); - } if (plain) @@ -235,7 +249,7 @@ void export_TeX(const char *filename, bool selected_only, bool plain) fclose(f); } free_buffer(&buf); - + cb.setProgress(1000); } void export_depths(const char *filename, bool selected_only) diff --git a/backend-shared/exportfuncs.h b/backend-shared/exportfuncs.h index 250e8e60f..3eb83c9b1 100644 --- a/backend-shared/exportfuncs.h +++ b/backend-shared/exportfuncs.h @@ -7,8 +7,14 @@ struct dive_site; +// A synchrounous callback interface to signal progress / check for user abort +struct ExportCallback { + virtual void setProgress(int progress); // 0-1000 + virtual bool canceled() const; +}; + void exportProfile(QString filename, bool selected_only); -void export_TeX(const char *filename, bool selected_only, bool plain); +void export_TeX(const char *filename, bool selected_only, bool plain, ExportCallback &cb); void export_depths(const char *filename, bool selected_only); std::vector<const dive_site *> getDiveSitesToExport(bool selectedOnly); QFuture<int> exportUsingStyleSheet(QString filename, bool doExport, int units, QString stylesheet, bool anonymize); |