2011-09-20 19:40:34 +00:00
|
|
|
/* main.c */
|
2012-10-11 00:42:59 +00:00
|
|
|
#include <locale.h>
|
2011-08-31 01:40:25 +00:00
|
|
|
#include <stdio.h>
|
2011-09-02 23:40:28 +00:00
|
|
|
#include <string.h>
|
2011-08-31 01:40:25 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <time.h>
|
2012-10-11 00:42:59 +00:00
|
|
|
#include <libintl.h>
|
|
|
|
#include <glib/gi18n.h>
|
2011-08-31 01:40:25 +00:00
|
|
|
|
|
|
|
#include "dive.h"
|
2011-09-05 19:12:58 +00:00
|
|
|
#include "divelist.h"
|
2011-09-20 18:24:15 +00:00
|
|
|
|
Merge branch 'Qt'
After the 3.1 release it is time to shift the focus on the Qt effort - and
the best way to do this is to merge the changes in the Qt branch into
master.
Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version of
the Qt branch) and then used his merge to double check what I was doing.
I resolved a few things differently but overall what we did was very much
the same (and I say this with pride since Linus is a professional git
merger)
Here's his merge commit message:
This is a rough and tumble merge of the Qt branch into 'master',
trying to sort out the conflicts as best as I could.
There were two major kinds of conflicts:
- the Makefile changes, in particular the split of the single
Makefile into Rules.mk and Configure.mk, along with the obvious Qt
build changes themselves.
Those changes conflicted with some of the updates done in mainline
wrt "release" targets and some helper macros ($(NAME) etc).
Resolved by largely taking the Qt branch versions, and then editing
in the most obvious parts of the Makefile updates from mainline.
NOTE! The script/get_version shell script was made to just fail
silently on not finding a git repository, which avoided having to
take some particularly ugly Makefile changes.
- Various random updates in mainline to support things like dive tags.
The conflicts were mainly to the gtk GUI parts, which obviously
looked different afterwards. I fixed things up to look like the
newer code, but since the gtk files themselves are actually dead in
the Qt branch, this is largely irrelevant.
NOTE! This does *NOT* introduce the equivalent Qt functionality.
The fields are there in the code now, but there's no Qt UI for the
whole dive tag stuff etc.
This seems to compile for me (although I have to force
"QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
work, but it is otherwise largely untested.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 05:01:41 +00:00
|
|
|
#ifdef USE_GTK_UI
|
2013-03-01 00:19:12 +00:00
|
|
|
#include <osm-gps-map.h>
|
|
|
|
#endif
|
Merge branch 'Qt'
After the 3.1 release it is time to shift the focus on the Qt effort - and
the best way to do this is to merge the changes in the Qt branch into
master.
Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version of
the Qt branch) and then used his merge to double check what I was doing.
I resolved a few things differently but overall what we did was very much
the same (and I say this with pride since Linus is a professional git
merger)
Here's his merge commit message:
This is a rough and tumble merge of the Qt branch into 'master',
trying to sort out the conflicts as best as I could.
There were two major kinds of conflicts:
- the Makefile changes, in particular the split of the single
Makefile into Rules.mk and Configure.mk, along with the obvious Qt
build changes themselves.
Those changes conflicted with some of the updates done in mainline
wrt "release" targets and some helper macros ($(NAME) etc).
Resolved by largely taking the Qt branch versions, and then editing
in the most obvious parts of the Makefile updates from mainline.
NOTE! The script/get_version shell script was made to just fail
silently on not finding a git repository, which avoided having to
take some particularly ugly Makefile changes.
- Various random updates in mainline to support things like dive tags.
The conflicts were mainly to the gtk GUI parts, which obviously
looked different afterwards. I fixed things up to look like the
newer code, but since the gtk files themselves are actually dead in
the Qt branch, this is largely irrelevant.
NOTE! This does *NOT* introduce the equivalent Qt functionality.
The fields are there in the code now, but there's no Qt UI for the
whole dive tag stuff etc.
This seems to compile for me (although I have to force
"QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
work, but it is otherwise largely untested.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 05:01:41 +00:00
|
|
|
|
2012-09-26 15:30:37 +00:00
|
|
|
#ifdef DEBUGFILE
|
|
|
|
char *debugfilename;
|
|
|
|
FILE *debugfile;
|
|
|
|
#endif
|
|
|
|
|
2013-01-11 01:55:44 +00:00
|
|
|
struct preferences prefs;
|
|
|
|
struct preferences default_prefs = {
|
|
|
|
.units = SI_UNITS,
|
|
|
|
.visible_cols = { TRUE, FALSE, },
|
|
|
|
.pp_graphs = {
|
|
|
|
.po2 = FALSE,
|
|
|
|
.pn2 = FALSE,
|
|
|
|
.phe = FALSE,
|
|
|
|
.po2_threshold = 1.6,
|
|
|
|
.pn2_threshold = 4.0,
|
|
|
|
.phe_threshold = 13.0,
|
|
|
|
},
|
2013-01-14 00:24:58 +00:00
|
|
|
.mod = FALSE,
|
|
|
|
.mod_ppO2 = 1.6,
|
|
|
|
.ead = FALSE,
|
2013-01-11 01:55:44 +00:00
|
|
|
.profile_red_ceiling = FALSE,
|
|
|
|
.profile_calc_ceiling = FALSE,
|
|
|
|
.calc_ceiling_3m_incr = FALSE,
|
|
|
|
.gflow = 0.30,
|
|
|
|
.gfhigh = 0.75,
|
Merge branch 'Qt'
After the 3.1 release it is time to shift the focus on the Qt effort - and
the best way to do this is to merge the changes in the Qt branch into
master.
Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version of
the Qt branch) and then used his merge to double check what I was doing.
I resolved a few things differently but overall what we did was very much
the same (and I say this with pride since Linus is a professional git
merger)
Here's his merge commit message:
This is a rough and tumble merge of the Qt branch into 'master',
trying to sort out the conflicts as best as I could.
There were two major kinds of conflicts:
- the Makefile changes, in particular the split of the single
Makefile into Rules.mk and Configure.mk, along with the obvious Qt
build changes themselves.
Those changes conflicted with some of the updates done in mainline
wrt "release" targets and some helper macros ($(NAME) etc).
Resolved by largely taking the Qt branch versions, and then editing
in the most obvious parts of the Makefile updates from mainline.
NOTE! The script/get_version shell script was made to just fail
silently on not finding a git repository, which avoided having to
take some particularly ugly Makefile changes.
- Various random updates in mainline to support things like dive tags.
The conflicts were mainly to the gtk GUI parts, which obviously
looked different afterwards. I fixed things up to look like the
newer code, but since the gtk files themselves are actually dead in
the Qt branch, this is largely irrelevant.
NOTE! This does *NOT* introduce the equivalent Qt functionality.
The fields are there in the code now, but there's no Qt UI for the
whole dive tag stuff etc.
This seems to compile for me (although I have to force
"QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
work, but it is otherwise largely untested.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 05:01:41 +00:00
|
|
|
#ifdef USE_GTK_UI
|
2013-03-01 00:19:12 +00:00
|
|
|
.map_provider = OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,
|
|
|
|
#endif
|
2013-01-11 01:55:44 +00:00
|
|
|
};
|
2011-09-07 02:07:17 +00:00
|
|
|
|
2011-09-20 19:40:34 +00:00
|
|
|
/* random helper functions, used here or elsewhere */
|
2011-08-31 01:40:25 +00:00
|
|
|
static int sortfn(const void *_a, const void *_b)
|
|
|
|
{
|
|
|
|
const struct dive *a = *(void **)_a;
|
|
|
|
const struct dive *b = *(void **)_b;
|
|
|
|
|
|
|
|
if (a->when < b->when)
|
|
|
|
return -1;
|
|
|
|
if (a->when > b->when)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-31 03:09:16 +00:00
|
|
|
void sort_table(struct dive_table *table)
|
|
|
|
{
|
|
|
|
qsort(table->dives, table->nr, sizeof(struct dive *), sortfn);
|
|
|
|
}
|
|
|
|
|
2011-09-20 19:40:34 +00:00
|
|
|
const char *weekday(int wday)
|
|
|
|
{
|
2012-10-11 00:42:59 +00:00
|
|
|
static const char wday_array[7][7] = {
|
|
|
|
/*++GETTEXT: these are three letter days - we allow up to six code bytes */
|
|
|
|
N_("Sun"), N_("Mon"), N_("Tue"), N_("Wed"), N_("Thu"), N_("Fri"), N_("Sat")
|
2011-09-20 19:40:34 +00:00
|
|
|
};
|
2012-10-15 21:37:59 +00:00
|
|
|
return _(wday_array[wday]);
|
2011-09-20 19:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const char *monthname(int mon)
|
|
|
|
{
|
2012-10-11 00:42:59 +00:00
|
|
|
static const char month_array[12][7] = {
|
|
|
|
/*++GETTEXT: these are three letter months - we allow up to six code bytes*/
|
|
|
|
N_("Jan"), N_("Feb"), N_("Mar"), N_("Apr"), N_("May"), N_("Jun"),
|
|
|
|
N_("Jul"), N_("Aug"), N_("Sep"), N_("Oct"), N_("Nov"), N_("Dec"),
|
2011-09-20 19:40:34 +00:00
|
|
|
};
|
2012-10-15 21:37:59 +00:00
|
|
|
return _(month_array[mon]);
|
2011-09-20 19:40:34 +00:00
|
|
|
}
|
|
|
|
|
2011-10-05 21:09:49 +00:00
|
|
|
/*
|
|
|
|
* track whether we switched to importing dives
|
|
|
|
*/
|
|
|
|
static gboolean imported = FALSE;
|
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
static void parse_argument(const char *arg)
|
|
|
|
{
|
|
|
|
const char *p = arg+1;
|
|
|
|
|
|
|
|
do {
|
|
|
|
switch (*p) {
|
|
|
|
case 'v':
|
|
|
|
verbose++;
|
|
|
|
continue;
|
2011-10-05 18:36:15 +00:00
|
|
|
case '-':
|
|
|
|
/* long options with -- */
|
|
|
|
if (strcmp(arg,"--import") == 0) {
|
|
|
|
/* mark the dives so far as the base,
|
|
|
|
* everything after is imported */
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
Add special download modes to force updates from the divecomputer
This will hopefully not be something we need often, but if we improve
support for a divecomputer (either in libdivecomputer or in our native
Uemis code or even in the way we handle (and potentially discard) events),
then it is extremely useful to be able to say "re-download things
from the divecomputer and for things that were not edited in Subsurface,
don't try to merge the data (which gives BAD results if for example you
fixed a bug in the depth calculation in libdivecomputer) but instead
simply take the samples, the events and some of the other unedited data
straight from the download".
This commit implements just that - a "force download" checkbox in the
download dialog that makes us reimport all dives from the dive computer,
even the ones we already have, and an "always prefer downloaded dive"
checkbox that then tells Subsurface not to merge but simply to take the
data from the downloaded dive - without overwriting the things we have
already edited in Subsurface (like location, buddy, equipment, etc).
This, as a precaution, refuses to merge dives that don't have identical
start times. So if you have edited the date / time of a dive or if you
have previously merged your dive with a different dive computer (and
therefore modified samples and events) you are out of luck.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-11 13:29:26 +00:00
|
|
|
report_dives(FALSE, FALSE);
|
2013-05-03 18:04:51 +00:00
|
|
|
#else
|
|
|
|
process_dives(FALSE, FALSE);
|
|
|
|
#endif
|
2011-10-05 21:09:49 +00:00
|
|
|
imported = TRUE;
|
2011-10-05 18:36:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* fallthrough */
|
2011-10-30 19:56:28 +00:00
|
|
|
case 'p':
|
|
|
|
/* ignore process serial number argument when run as native macosx app */
|
|
|
|
if (strncmp(arg, "-psn_", 5) == 0) {
|
|
|
|
return;
|
|
|
|
}
|
2012-08-26 21:41:05 +00:00
|
|
|
/* fallthrough */
|
2011-08-31 01:40:25 +00:00
|
|
|
default:
|
|
|
|
fprintf(stderr, "Bad argument '%s'\n", arg);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
} while (*++p);
|
|
|
|
}
|
|
|
|
|
2011-09-10 00:10:17 +00:00
|
|
|
void update_dive(struct dive *new_dive)
|
|
|
|
{
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
2011-09-10 00:10:17 +00:00
|
|
|
static struct dive *buffered_dive;
|
|
|
|
struct dive *old_dive = buffered_dive;
|
|
|
|
|
|
|
|
if (old_dive) {
|
2011-09-20 17:06:24 +00:00
|
|
|
flush_divelist(old_dive);
|
2011-09-10 00:10:17 +00:00
|
|
|
}
|
2012-10-19 03:45:26 +00:00
|
|
|
show_dive_info(new_dive);
|
2013-02-19 00:56:28 +00:00
|
|
|
show_dive_equipment(new_dive, W_IDX_PRIMARY);
|
|
|
|
show_dive_stats(new_dive);
|
2011-09-11 20:43:37 +00:00
|
|
|
buffered_dive = new_dive;
|
2013-05-03 18:04:51 +00:00
|
|
|
#endif
|
2011-09-10 00:10:17 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 19:40:34 +00:00
|
|
|
void renumber_dives(int nr)
|
2011-09-11 22:39:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dive_table.nr; i++) {
|
|
|
|
struct dive *dive = dive_table.dives[i];
|
|
|
|
dive->number = nr + i;
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
2011-10-23 15:50:14 +00:00
|
|
|
flush_divelist(dive);
|
2013-05-03 18:04:51 +00:00
|
|
|
#endif
|
2011-09-11 22:39:46 +00:00
|
|
|
}
|
2011-10-05 16:24:52 +00:00
|
|
|
mark_divelist_changed(TRUE);
|
2011-09-11 22:39:46 +00:00
|
|
|
}
|
|
|
|
|
2013-01-11 01:55:44 +00:00
|
|
|
/*
|
|
|
|
* Under a POSIX setup, the locale string should have a format
|
|
|
|
* like [language[_territory][.codeset][@modifier]].
|
|
|
|
*
|
|
|
|
* So search for the underscore, and see if the "territory" is
|
|
|
|
* US, and turn on imperial units by default.
|
|
|
|
*
|
|
|
|
* I guess Burma and Liberia should trigger this too. I'm too
|
|
|
|
* lazy to look up the territory names, though.
|
|
|
|
*/
|
|
|
|
static void setup_system_prefs(void)
|
|
|
|
{
|
2013-01-12 01:07:22 +00:00
|
|
|
const char *env;
|
2013-01-11 01:55:44 +00:00
|
|
|
|
2013-01-12 01:07:22 +00:00
|
|
|
default_prefs.divelist_font = strdup(system_divelist_default_font);
|
2013-02-09 19:29:56 +00:00
|
|
|
default_prefs.default_filename = system_default_filename();
|
2013-01-12 01:07:22 +00:00
|
|
|
|
|
|
|
env = getenv("LC_MEASUREMENT");
|
2013-01-11 01:55:44 +00:00
|
|
|
if (!env)
|
|
|
|
env = getenv("LC_ALL");
|
|
|
|
if (!env)
|
|
|
|
env = getenv("LANG");
|
|
|
|
if (!env)
|
|
|
|
return;
|
|
|
|
env = strchr(env, '_');
|
|
|
|
if (!env)
|
|
|
|
return;
|
|
|
|
env++;
|
|
|
|
if (strncmp(env, "US", 2))
|
|
|
|
return;
|
|
|
|
|
|
|
|
default_prefs.units = IMPERIAL_units;
|
|
|
|
}
|
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int i;
|
2012-09-09 16:06:44 +00:00
|
|
|
gboolean no_filenames = TRUE;
|
2012-10-15 12:44:01 +00:00
|
|
|
const char *path;
|
2011-08-31 01:40:25 +00:00
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
/* set up l18n - the search directory needs to change
|
|
|
|
* so that it uses the correct system directory when
|
|
|
|
* subsurface isn't run from the local directory */
|
2012-10-18 21:30:45 +00:00
|
|
|
path = subsurface_gettext_domainpath(argv[0]);
|
2013-01-29 21:10:46 +00:00
|
|
|
setlocale(LC_ALL, "");
|
2012-10-15 12:44:01 +00:00
|
|
|
bindtextdomain("subsurface", path);
|
2012-10-11 00:42:59 +00:00
|
|
|
bind_textdomain_codeset("subsurface", "utf-8");
|
|
|
|
textdomain("subsurface");
|
2013-01-11 01:55:44 +00:00
|
|
|
|
|
|
|
setup_system_prefs();
|
|
|
|
prefs = default_prefs;
|
2011-09-27 17:16:40 +00:00
|
|
|
|
2012-10-26 03:12:44 +00:00
|
|
|
#if DEBUGFILE > 1
|
|
|
|
debugfile = stderr;
|
|
|
|
#elif defined(DEBUGFILE)
|
2013-01-12 01:07:22 +00:00
|
|
|
debugfilename = strdup(prefs.default_filename);
|
2012-09-26 15:30:37 +00:00
|
|
|
strncpy(debugfilename + strlen(debugfilename) - 3, "log", 3);
|
|
|
|
if (g_mkdir_with_parents(g_path_get_dirname(debugfilename), 0664) != 0 ||
|
|
|
|
(debugfile = g_fopen(debugfilename, "w")) == NULL)
|
|
|
|
printf("oh boy, can't create debugfile");
|
|
|
|
#endif
|
2012-12-22 05:00:06 +00:00
|
|
|
|
|
|
|
subsurface_command_line_init(&argc, &argv);
|
|
|
|
parse_xml_init();
|
|
|
|
|
2013-04-18 07:59:31 +00:00
|
|
|
init_ui(&argc, &argv); /* the gtk stuff is needed for parsing below */
|
2012-12-22 05:00:06 +00:00
|
|
|
|
2011-09-05 20:14:53 +00:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *a = argv[i];
|
|
|
|
|
|
|
|
if (a[0] == '-') {
|
|
|
|
parse_argument(a);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
GError *error = NULL;
|
2013-01-25 04:01:18 +00:00
|
|
|
/* if we have exactly one filename, parse_file will set
|
|
|
|
* that to be the default. Otherwise there will be no default filename */
|
|
|
|
set_filename(NULL, TRUE);
|
2013-04-02 15:46:41 +00:00
|
|
|
parse_file(a, &error);
|
|
|
|
if (no_filenames)
|
|
|
|
{
|
|
|
|
set_filename(a, TRUE);
|
|
|
|
no_filenames = FALSE;
|
|
|
|
}
|
2011-09-05 20:14:53 +00:00
|
|
|
if (error != NULL)
|
|
|
|
{
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
2011-09-05 20:14:53 +00:00
|
|
|
report_error(error);
|
2013-05-03 18:04:51 +00:00
|
|
|
#endif
|
2011-09-05 20:14:53 +00:00
|
|
|
g_error_free(error);
|
|
|
|
error = NULL;
|
|
|
|
}
|
|
|
|
}
|
2012-09-09 16:06:44 +00:00
|
|
|
if (no_filenames) {
|
|
|
|
GError *error = NULL;
|
2013-01-12 01:07:22 +00:00
|
|
|
const char *filename = prefs.default_filename;
|
2013-04-02 15:46:41 +00:00
|
|
|
parse_file(filename, &error);
|
2012-09-09 16:06:44 +00:00
|
|
|
/* don't report errors - this file may not exist, but make
|
|
|
|
sure we remember this as the filename in use */
|
2012-09-10 19:27:00 +00:00
|
|
|
set_filename(filename, FALSE);
|
2012-09-09 16:06:44 +00:00
|
|
|
}
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
Add special download modes to force updates from the divecomputer
This will hopefully not be something we need often, but if we improve
support for a divecomputer (either in libdivecomputer or in our native
Uemis code or even in the way we handle (and potentially discard) events),
then it is extremely useful to be able to say "re-download things
from the divecomputer and for things that were not edited in Subsurface,
don't try to merge the data (which gives BAD results if for example you
fixed a bug in the depth calculation in libdivecomputer) but instead
simply take the samples, the events and some of the other unedited data
straight from the download".
This commit implements just that - a "force download" checkbox in the
download dialog that makes us reimport all dives from the dive computer,
even the ones we already have, and an "always prefer downloaded dive"
checkbox that then tells Subsurface not to merge but simply to take the
data from the downloaded dive - without overwriting the things we have
already edited in Subsurface (like location, buddy, equipment, etc).
This, as a precaution, refuses to merge dives that don't have identical
start times. So if you have edited the date / time of a dive or if you
have previously merged your dive with a different dive computer (and
therefore modified samples and events) you are out of luck.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-11 13:29:26 +00:00
|
|
|
report_dives(imported, FALSE);
|
2012-09-16 10:04:37 +00:00
|
|
|
if (dive_table.nr == 0)
|
|
|
|
show_dive_info(NULL);
|
2013-05-03 18:04:51 +00:00
|
|
|
#else
|
|
|
|
process_dives(imported, FALSE);
|
|
|
|
#endif
|
2012-09-18 15:33:55 +00:00
|
|
|
|
|
|
|
parse_xml_exit();
|
2012-10-04 00:44:47 +00:00
|
|
|
subsurface_command_line_exit(&argc, &argv);
|
2012-09-18 15:33:55 +00:00
|
|
|
|
2013-04-18 07:59:31 +00:00
|
|
|
init_qt_ui(&argc, &argv); /* qt bit delayed until dives are parsed */
|
|
|
|
run_ui();
|
|
|
|
exit_ui();
|
2012-09-26 15:30:37 +00:00
|
|
|
#ifdef DEBUGFILE
|
|
|
|
if (debugfile)
|
|
|
|
fclose(debugfile);
|
|
|
|
#endif
|
2011-08-31 01:40:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|