/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
*/
-void image_osd_histogram_chan_toggle(ImageWindow *imd)
+void image_osd_histogram_toggle_channel(ImageWindow *imd)
{
OverlayStateData *osd = image_get_osd_data(imd);
image_osd_update(imd);
}
-void image_osd_histogram_log_toggle(ImageWindow *imd)
+void image_osd_histogram_toggle_mode(ImageWindow *imd)
{
OverlayStateData *osd = image_get_osd_data(imd);
image_osd_update(imd);
}
+void image_osd_histogram_set_channel(ImageWindow *imd, gint chan)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return;
+
+ histogram_set_channel(osd->histogram, chan);
+ image_osd_update(imd);
+}
+
+void image_osd_histogram_set_mode(ImageWindow *imd, gint mode)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return;
+
+ histogram_set_mode(osd->histogram, mode);
+ image_osd_update(imd);
+}
+
+gint image_osd_histogram_get_channel(ImageWindow *imd)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return HCHAN_DEFAULT;
+
+ return histogram_get_channel(osd->histogram);
+}
+
+gint image_osd_histogram_get_mode(ImageWindow *imd)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return 0;
+
+ return histogram_get_mode(osd->histogram);
+}
+
void image_osd_toggle(ImageWindow *imd)
{
OsdShowFlags show;
else
{
data = g_strdup(g_hash_table_lookup(vars, name));
- if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
if (!data)
data = metadata_read_string(imd->image_fd, name, METADATA_FORMATTED);
}
PangoLayout *layout;
const gchar *name;
gchar *text;
- GdkPixbuf *imgpixbuf = NULL;
gboolean with_hist;
- const HistMap *histmap;
+ const HistMap *histmap = NULL;
ImageWindow *imd = osd->imd;
FileData *fd = image_get_fd(imd);
{
w = gdk_pixbuf_get_width(load_pixbuf);
h = gdk_pixbuf_get_height(load_pixbuf);
- imgpixbuf = load_pixbuf;
}
else
{
image_get_image_size(imd, &w, &h);
- imgpixbuf = (PIXBUF_RENDERER(imd->pr))->pixbuf;
}
if (with_hist)
{
histmap = histmap_get(imd->image_fd);
- if (!histmap)
+ if (!histmap)
{
histmap_start_idle(imd->image_fd);
with_hist = FALSE;
pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
}
-#if 0 /* unused for now */
-static gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
-{
- return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-#endif
-
static void image_overlay_remove(ImageWindow *imd, gint id)
{
pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
{
OverlayStateData *osd = data;
- osd->imd->overlay_show_zoom = FALSE;
-
if (osd->show & OSD_SHOW_INFO)
{
- /* redraw when the image was changed,
+ /* redraw when the image was changed,
with histogram we have to redraw also when loading is finished */
if (osd->changed_states & IMAGE_STATE_IMAGE ||
(osd->changed_states & IMAGE_STATE_LOADING && osd->show & OSD_SHOW_HISTOGRAM) ||
g_free(osd);
}
-static void image_osd_remove(ImageWindow *imd)
-{
- OverlayStateData *osd = image_get_osd_data(imd);
-
- if (osd) image_osd_free(osd);
-}
-
static void image_osd_destroy_cb(GtkWidget *widget, gpointer data)
{
OverlayStateData *osd = data;