Author: akv
Date: 2013-06-25 22:53:17 +0200 (Tue, 25 Jun 2013)
New Revision: 4418
Modified:
trunk/src/gtk-interface.c
trunk/src/rs-actions.c
trunk/src/rs-enfuse.c
trunk/src/rs-geo-db.c
Log:
Don't use function that will update the map, but instead reset coordinates
manually.
Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c 2013-06-25 20:26:20 UTC (rev 4417)
+++ trunk/src/gtk-interface.c 2013-06-25 20:53:17 UTC (rev 4418)
@@ -1586,7 +1586,7 @@
{
rs->toolbox = gtk_notebook_new();
gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), tools,
gtk_label_new(_("Tools")));
- //gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox),
geolocbox, gtk_label_new(_("Map")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), geolocbox,
gtk_label_new(_("Map")));
gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), batchbox,
gtk_label_new(_("Batch")));
gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), open_box,
gtk_label_new(_("Open")));
}
Modified: trunk/src/rs-actions.c
===================================================================
--- trunk/src/rs-actions.c 2013-06-25 20:26:20 UTC (rev 4417)
+++ trunk/src/rs-actions.c 2013-06-25 20:53:17 UTC (rev 4418)
@@ -719,7 +719,8 @@
RSGeoDb *geodb =
rs_geo_db_get_singleton();
rs_geo_db_set_offset(geodb, photo,
rs->time_offset_buffer);
/* reset lon and lat if offset is
pasted */
- rs_geo_db_set_coordinates_manual(geodb,
photo, 0.0, 0.0);
+ photo->lon = 0.0;
+ photo->lat = 0.0;
}
if (mask & MASK_COORDINATES)
{
Modified: trunk/src/rs-enfuse.c
===================================================================
--- trunk/src/rs-enfuse.c 2013-06-25 20:26:20 UTC (rev 4417)
+++ trunk/src/rs-enfuse.c 2013-06-25 20:53:17 UTC (rev 4418)
@@ -35,7 +35,7 @@
#include "rs-metadata.h"
#include "conf_interface.h"
-#define ENFUSE_OPTIONS "-d 16"
+#define ENFUSE_OPTIONS "-d 8"
#define ENFUSE_OPTIONS_QUICK "-d 8"
gboolean has_align_image_stack ();
Modified: trunk/src/rs-geo-db.c
===================================================================
--- trunk/src/rs-geo-db.c 2013-06-25 20:26:20 UTC (rev 4417)
+++ trunk/src/rs-geo-db.c 2013-06-25 20:53:17 UTC (rev 4418)
@@ -254,7 +254,6 @@
rc =
sqlite3_bind_double (stmt, 4, ele);
rc =
sqlite3_bind_int (stmt, 5, import_id);
rc =
sqlite3_step(stmt);
-
sqlite3_finalize(stmt);
}
gui_progress_advance_one(progress);
GUI_CATCHUP();
@@ -269,6 +268,7 @@
}
cur = cur->next;
}
+ sqlite3_finalize(stmt);
gui_progress_free(progress);
}
@@ -576,6 +576,7 @@
rs->photo->time_offset = time_offset;
rs_geo_db_find_coordinate(geodb, rs->photo->metadata->timestamp +
time_offset);
+ printf("coordinate: %f %f\n", geodb->lon, geodb->lat);
rs_geo_db_set_coordinates(geodb, rs->photo);
osm_gps_map_track_remove_all(geodb->map);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
