diff options
author | Gehad <gehadelrobey@gmail.com> | 2014-03-30 22:14:56 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-03-30 15:52:32 -0700 |
commit | 0cd9d09410e2631d3a47edcae7569e3b3f011cf1 (patch) | |
tree | 7251ebc0a25f063b00cfb10a34f641e0b314304c | |
parent | 7696fbf9cdb6292f487815bffdbc879a178cc73f (diff) | |
download | subsurface-0cd9d09410e2631d3a47edcae7569e3b3f011cf1.tar.gz |
Exporting a World-Map
This patch adds the world map exporter.
- add worldmap-save.c that writes the html to the file
- use Google maps v3 API to put the place marks on the map
- add worldmap-options.h to contain some settings for the JS which will
make it easier for those to be changed
- add save HTML action in the mainwindow user interface
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | qt-ui/mainwindow.cpp | 10 | ||||
-rw-r--r-- | qt-ui/mainwindow.h | 1 | ||||
-rw-r--r-- | qt-ui/mainwindow.ui | 6 | ||||
-rw-r--r-- | subsurface.pro | 3 | ||||
-rw-r--r-- | worldmap-options.h | 7 | ||||
-rw-r--r-- | worldmap-save.c | 110 | ||||
-rw-r--r-- | worldmap-save.h | 15 |
7 files changed, 152 insertions, 0 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 86d612457..53f7a15df 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -36,6 +36,7 @@ #include "simplewidgets.h" #include "diveplanner.h" #include "about.h" +#include "worldmap-save.h" #ifndef NO_PRINTING #include "printdialog.h" #endif @@ -277,6 +278,15 @@ void MainWindow::on_actionExportUDDF_triggered() export_dives_uddf(filename.toUtf8(), false); } +void MainWindow::on_actionExportHTMLworldmap_triggered() +{ + QFileInfo fi(system_default_filename()); + QString filename = QFileDialog::getSaveFileName(this, tr("Export World Map"), fi.absolutePath(), + tr("HTML files (*.html)")); + if (!filename.isNull() && !filename.isEmpty()) + export_worldmap_HTML(filename.toUtf8().data()); +} + void MainWindow::on_actionPrint_triggered() { #ifndef NO_PRINTING diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 51e03c3b8..a0c5be333 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -90,6 +90,7 @@ slots: void on_actionSaveAs_triggered(); void on_actionClose_triggered(); void on_actionExportUDDF_triggered(); + void on_actionExportHTMLworldmap_triggered(); void on_actionPrint_triggered(); void on_actionPreferences_triggered(); void on_actionQuit_triggered(); diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index a933a2de9..2bf249683 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -551,6 +551,7 @@ <addaction name="separator"/> <addaction name="actionClose"/> <addaction name="actionExportUDDF"/> + <addaction name="actionExportHTMLworldmap"/> <addaction name="actionPrint"/> <addaction name="actionPreferences"/> <addaction name="separator"/> @@ -681,6 +682,11 @@ <string>Ctrl+U</string> </property> </action> + <action name="actionExportHTMLworldmap"> + <property name="text"> + <string>Export HTML World Map</string> + </property> + </action> <action name="actionPrint"> <property name="text"> <string>&Print</string> diff --git a/subsurface.pro b/subsurface.pro index d10f73df4..3944da095 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -28,6 +28,8 @@ HEADERS = \ helpers.h \ libdivecomputer.h \ planner.h \ + worldmap-save.h \ + worldmap-options.h \ pref.h \ profile.h \ qt-gui.h \ @@ -97,6 +99,7 @@ SOURCES = \ parse-xml.c \ planner.c \ profile.c \ + worldmap-save.c \ qt-gui.cpp \ qthelper.cpp \ qt-ui/about.cpp \ diff --git a/worldmap-options.h b/worldmap-options.h new file mode 100644 index 000000000..6e7e8728b --- /dev/null +++ b/worldmap-options.h @@ -0,0 +1,7 @@ +#ifndef WORLDMAP_OPTIONS_H +#define WORLDMAP_OPTIONS_H + +const char* map_options = "center: new google.maps.LatLng(0,0),\n\tzoom: 3,\n\tminZoom: 2,\n\tmapTypeId: google.maps.MapTypeId.SATELLITE\n\t"; +const char* css = "\n\thtml { height: 100% }\n\tbody { height: 100%; margin: 0; padding: 0 }\n\t#map-canvas { height: 100% }\n"; + +#endif// WORLDMAP-OPTIONS_H diff --git a/worldmap-save.c b/worldmap-save.c new file mode 100644 index 000000000..f9a4bf3fe --- /dev/null +++ b/worldmap-save.c @@ -0,0 +1,110 @@ +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include "dive.h" +#include "membuffer.h" +#include "worldmap-save.h" +#include "worldmap-options.h" + +char* getGoogleApi() +{ + /* google maps api auth*/ + return "https://maps.googleapis.com/maps/api/js?key=AIzaSyDzo9PWsqYDDSddVswg_13rpD9oH_dLuoQ"; +} + +void put_HTML_date(struct membuffer *b,struct dive *dive) +{ + struct tm tm; + utc_mkdate(dive->when, &tm); + put_format(b, "<p>date=%04u-%02u-%02u</p>",tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); + put_format(b, "<p>time=%02u:%02u:%02u</p>",tm.tm_hour, tm.tm_min, tm.tm_sec); +} + +void put_HTML_temp(struct membuffer *b,struct dive *dive) +{ + put_temperature(b, dive->airtemp, "<p>Air Temp: ", " C\\'</p>"); + put_temperature(b, dive->watertemp, "<p>Water Temp: ", " C\\'</p>"); +} + +void put_HTML_notes(struct membuffer *b,struct dive *dive) +{ + if (dive->notes) { + put_format(b,"<p>Notes : %s </p>",dive->notes); + } +} + +void writeMarkers(struct membuffer *b) +{ + int i; + struct dive *dive; + + for_each_dive(i, dive) { + /*export selected dives only ?*/ + + if (dive->latitude.udeg==0 && dive->longitude.udeg==0) { + continue; + } + + put_format(b,"temp = new google.maps.Marker({position: new google.maps.LatLng(%f,%f)});\n", + dive->latitude.udeg/1000000.0,dive->longitude.udeg/1000000.0); + put_string(b,"markers.push(temp);\ntempinfowindow = new google.maps.InfoWindow({content: '<div id=\"content\">'+'<div id=\"siteNotice\">'+'</div>'+'<div id=\"bodyContent\">"); + put_HTML_date(b,dive); + put_duration(b, dive->duration, "<p>duration=", " min</p>"); + put_HTML_temp(b,dive); + put_HTML_notes(b,dive); + put_string(b,"</p>'+'</div>'+'</div>'});\ninfowindows.push(tempinfowindow);\n"); + put_format(b,"google.maps.event.addListener(markers[%d], 'mouseover', function() {\ninfowindows[%d].open(map,markers[%d]);}",i,i,i); + put_format(b,");google.maps.event.addListener(markers[%d], 'mouseout', function() {\ninfowindows[%d].close();});\n",i,i); + } +} + +void insert_html_header(struct membuffer *b) +{ + put_string(b,"<!DOCTYPE html>\n<html>\n<head>\n"); + put_string(b,"<meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n<title>World Map</title>\n"); +} + +void insert_css(struct membuffer *b) +{ + put_format(b,"<style type=\"text/css\">%s</style>\n",css); +} + +void insert_javascript(struct membuffer *b) +{ + put_string(b,"<script type=\"text/javascript\"src=\""); + put_string(b,getGoogleApi()); + put_string(b,"&sensor=false\">\n</script>\n<script type=\"text/javascript\">\nvar map;\n"); + put_format(b,"function initialize() {\nvar mapOptions = {\n\t%s,",map_options); + put_string(b,"rotateControl: false,\n\tstreetViewControl: false,\n\tmapTypeControl: false\n};\n"); + put_string(b,"map = new google.maps.Map(document.getElementById(\"map-canvas\"),mapOptions);\nvar markers = new Array();"); + put_string(b,"\nvar infowindows = new Array();\nvar temp;\nvar tempinfowindow;\n"); + writeMarkers(b); + put_string(b,"\nfor(var i=0;i<markers.length;i++)\n\tmarkers[i].setMap(map);\n}\n"); + put_string(b,"google.maps.event.addDomListener(window, 'load', initialize);</script>\n"); +} + +void export(struct membuffer *b) +{ + insert_html_header(b); + insert_css(b); + insert_javascript(b); + put_string(b,"\t</head>\n<body>\n<div id=\"map-canvas\"/>\n</body>\n</html>"); +} + +void export_worldmap_HTML(const char* file_name) +{ + FILE *f; + + struct membuffer buf = { 0 }; + export(&buf); + + f = fopen(file_name,"w+"); + if (!f) { + printf("error"); /*report error*/ + } + + flush_buffer(&buf,f); /*check for writing errors? */ + free_buffer(&buf); + fclose(f); +} diff --git a/worldmap-save.h b/worldmap-save.h new file mode 100644 index 000000000..72363e482 --- /dev/null +++ b/worldmap-save.h @@ -0,0 +1,15 @@ +#ifndef WORLDMAP_SAVE_H +#define WORLDMAP_SAVE_H + +#ifdef __cplusplus +extern "C" { +#endif + +extern void export_worldmap_HTML(const char* x); + + +#ifdef __cplusplus +} +#endif + +#endif |