mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
621761233b
This commit addresses two issues: We now can add / edit / delete equipment from the edit dive dialog We now can edit multiple dives at once The latter feature has some interesting design constraints: It picks the 'selected_dive' as the one to start the edit from - so if this dive already has some information filled in, that information needs to be overwritten before it is stored in all of the dives. Similarly, only changes to the cylinders or weightsystems are recorded. Also, the notes field is not editable in the multi dive edit mode (as that didn't seem useful). The workflow seems to work best if using the multi-edit right after importing new dives from a dive computer. The user then can select all the new dives and only needs to edit things like location, divemaster, buddy, weights, etc. once. This commit will create some obvious conflicts with the commit that adds exposure protection tracking. It was implemented on top of the tree_view changes as it reuses some of the infrastructure for tracking the selected dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
244 lines
4.9 KiB
C
244 lines
4.9 KiB
C
/* main.c */
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
|
|
#include "dive.h"
|
|
#include "divelist.h"
|
|
|
|
struct units output_units;
|
|
|
|
/* random helper functions, used here or elsewhere */
|
|
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;
|
|
}
|
|
|
|
const char *weekday(int wday)
|
|
{
|
|
static const char wday_array[7][4] = {
|
|
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
|
|
};
|
|
return wday_array[wday];
|
|
}
|
|
|
|
const char *monthname(int mon)
|
|
{
|
|
static const char month_array[12][4] = {
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
|
|
};
|
|
return month_array[mon];
|
|
}
|
|
|
|
/*
|
|
* When adding dives to the dive table, we try to renumber
|
|
* the new dives based on any old dives in the dive table.
|
|
*
|
|
* But we only do it if:
|
|
*
|
|
* - the last dive in the old dive table was numbered
|
|
*
|
|
* - all the new dives are strictly at the end (so the
|
|
* "last dive" is at the same location in the dive table
|
|
* after re-sorting the dives.
|
|
*
|
|
* - none of the new dives have any numbers
|
|
*
|
|
* This catches the common case of importing new dives from
|
|
* a dive computer, and gives them proper numbers based on
|
|
* your old dive list. But it tries to be very conservative
|
|
* and not give numbers if there is *any* question about
|
|
* what the numbers should be - in which case you need to do
|
|
* a manual re-numbering.
|
|
*/
|
|
static void try_to_renumber(struct dive *last, int preexisting)
|
|
{
|
|
int i, nr;
|
|
|
|
/*
|
|
* If the new dives aren't all strictly at the end,
|
|
* we're going to expect the user to do a manual
|
|
* renumbering.
|
|
*/
|
|
if (get_dive(preexisting-1) != last)
|
|
return;
|
|
|
|
/*
|
|
* If any of the new dives already had a number,
|
|
* we'll have to do a manual renumbering.
|
|
*/
|
|
for (i = preexisting; i < dive_table.nr; i++) {
|
|
struct dive *dive = get_dive(i);
|
|
if (dive->number)
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Ok, renumber..
|
|
*/
|
|
nr = last->number;
|
|
for (i = preexisting; i < dive_table.nr; i++) {
|
|
struct dive *dive = get_dive(i);
|
|
dive->number = ++nr;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* track whether we switched to importing dives
|
|
*/
|
|
static gboolean imported = FALSE;
|
|
|
|
/*
|
|
* This doesn't really report anything at all. We just sort the
|
|
* dives, the GUI does the reporting
|
|
*/
|
|
void report_dives(gboolean is_imported)
|
|
{
|
|
int i;
|
|
int preexisting = dive_table.preexisting;
|
|
struct dive *last;
|
|
|
|
/* This does the right thing for -1: NULL */
|
|
last = get_dive(preexisting-1);
|
|
|
|
qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
|
|
|
|
for (i = 1; i < dive_table.nr; i++) {
|
|
struct dive **pp = &dive_table.dives[i-1];
|
|
struct dive *prev = pp[0];
|
|
struct dive *dive = pp[1];
|
|
struct dive *merged;
|
|
|
|
if (prev->when + prev->duration.seconds < dive->when)
|
|
continue;
|
|
|
|
merged = try_to_merge(prev, dive);
|
|
if (!merged)
|
|
continue;
|
|
|
|
free(prev);
|
|
free(dive);
|
|
*pp = merged;
|
|
dive_table.nr--;
|
|
memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
|
|
|
|
/* Redo the new 'i'th dive */
|
|
i--;
|
|
}
|
|
|
|
if (is_imported) {
|
|
/* Was the previous dive table state numbered? */
|
|
if (last && last->number)
|
|
try_to_renumber(last, preexisting);
|
|
|
|
/* did we have dives in the table and added more? */
|
|
if (last && preexisting != dive_table.nr)
|
|
mark_divelist_changed(TRUE);
|
|
}
|
|
dive_table.preexisting = dive_table.nr;
|
|
dive_list_update_dives();
|
|
}
|
|
|
|
static void parse_argument(const char *arg)
|
|
{
|
|
const char *p = arg+1;
|
|
|
|
do {
|
|
switch (*p) {
|
|
case 'v':
|
|
verbose++;
|
|
continue;
|
|
case '-':
|
|
/* long options with -- */
|
|
if (strcmp(arg,"--import") == 0) {
|
|
/* mark the dives so far as the base,
|
|
* everything after is imported */
|
|
report_dives(FALSE);
|
|
imported = TRUE;
|
|
return;
|
|
}
|
|
/* fallthrough */
|
|
case 'p':
|
|
/* ignore process serial number argument when run as native macosx app */
|
|
if (strncmp(arg, "-psn_", 5) == 0) {
|
|
return;
|
|
}
|
|
/* fallthrough */
|
|
default:
|
|
fprintf(stderr, "Bad argument '%s'\n", arg);
|
|
exit(1);
|
|
}
|
|
} while (*++p);
|
|
}
|
|
|
|
void update_dive(struct dive *new_dive)
|
|
{
|
|
static struct dive *buffered_dive;
|
|
struct dive *old_dive = buffered_dive;
|
|
|
|
if (old_dive) {
|
|
flush_divelist(old_dive);
|
|
}
|
|
if (new_dive) {
|
|
show_dive_info(new_dive);
|
|
show_dive_equipment(new_dive, W_IDX_PRIMARY);
|
|
show_dive_stats(new_dive);
|
|
}
|
|
buffered_dive = new_dive;
|
|
}
|
|
|
|
void renumber_dives(int nr)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < dive_table.nr; i++) {
|
|
struct dive *dive = dive_table.dives[i];
|
|
dive->number = nr + i;
|
|
flush_divelist(dive);
|
|
}
|
|
mark_divelist_changed(TRUE);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int i;
|
|
|
|
output_units = SI_units;
|
|
|
|
parse_xml_init();
|
|
|
|
init_ui(&argc, &argv);
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
const char *a = argv[i];
|
|
|
|
if (a[0] == '-') {
|
|
parse_argument(a);
|
|
continue;
|
|
}
|
|
GError *error = NULL;
|
|
parse_file(a, &error);
|
|
|
|
if (error != NULL)
|
|
{
|
|
report_error(error);
|
|
g_error_free(error);
|
|
error = NULL;
|
|
}
|
|
}
|
|
|
|
report_dives(imported);
|
|
|
|
run_ui();
|
|
exit_ui();
|
|
return 0;
|
|
}
|