← Back to branch summary

~ubuntu-branches/ubuntu/saucy/darktable/saucy

« back to all changes in this revision

Viewing changes to src/iop/bloom.c

  • Committer: Package Import Robot
  • Author(s): David Bremner
  • Date: 2011-11-13 10:46:00 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20111113104600-56c59agrs615gjim
New upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/iop/bloom.c
30
30
#include "control/control.h"
31
31
#include "dtgtk/slider.h"
32
32
#include "dtgtk/resetlabel.h"
 
33
#include "gui/accelerators.h"
33
34
#include "gui/gtk.h"
34
35
#include <gtk/gtk.h>
35
36
#include <inttypes.h>
79
80
}
80
81
 
81
82
 
82
 
void init_key_accels()
83
 
{
84
 
  dtgtk_slider_init_accel(darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/bloom/size");
85
 
  dtgtk_slider_init_accel(darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/bloom/threshold");
86
 
  dtgtk_slider_init_accel(darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/bloom/strength");
87
 
}
 
83
void init_key_accels(dt_iop_module_so_t *self)
 
84
{
 
85
  dt_accel_register_slider_iop(self, FALSE, NC_("accel", "size"));
 
86
  dt_accel_register_slider_iop(self, FALSE, NC_("accel", "threshold"));
 
87
  dt_accel_register_slider_iop(self, FALSE, NC_("accel", "strength"));
 
88
}
 
89
 
 
90
void connect_key_accels(dt_iop_module_t *self)
 
91
{
 
92
  dt_iop_bloom_gui_data_t *g = (dt_iop_bloom_gui_data_t*)self->gui_data;
 
93
  dt_accel_connect_slider_iop(self, "size", GTK_WIDGET(g->scale1));
 
94
  dt_accel_connect_slider_iop(self, "threshold", GTK_WIDGET(g->scale2));
 
95
  dt_accel_connect_slider_iop(self, "strength", GTK_WIDGET(g->scale3));
 
96
}
 
97
 
88
98
#define GAUSS(a,b,c,x) (a*pow(2.718281828,(-pow((x-b),2)/(pow(c,2)))))
89
99
 
90
100
 
323
333
  g->vbox = GTK_VBOX(gtk_vbox_new(FALSE, DT_GUI_IOP_MODULE_CONTROL_SPACING));
324
334
  gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(g->vbox), TRUE, TRUE, 5);
325
335
 
326
 
  g->scale1 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 100.0, 0.1, p->size, 2));
327
 
  g->scale2 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 100.0, 0.1, p->threshold, 2));
328
 
  g->scale3 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 100.0, 0.1, p->strength, 2));
 
336
  g->scale1 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, 0.0, 100.0, 1.0, p->size, 0));
 
337
  g->scale2 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, 0.0, 100.0, 1.0, p->threshold, 0));
 
338
  g->scale3 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, 0.0, 100.0, 1.0, p->strength, 0));
329
339
  dtgtk_slider_set_format_type(g->scale1,DARKTABLE_SLIDER_FORMAT_PERCENT);
330
340
  dtgtk_slider_set_format_type(g->scale2,DARKTABLE_SLIDER_FORMAT_PERCENT);
331
341
  dtgtk_slider_set_format_type(g->scale3,DARKTABLE_SLIDER_FORMAT_PERCENT);
335
345
  dtgtk_slider_set_unit(g->scale2,"%");
336
346
  dtgtk_slider_set_label(g->scale3,_("strength"));
337
347
  dtgtk_slider_set_unit(g->scale3,"%");
338
 
  dtgtk_slider_set_accel(g->scale1,darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/bloom/size");
339
 
  dtgtk_slider_set_accel(g->scale2,darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/bloom/threshold");
340
 
  dtgtk_slider_set_accel(g->scale3,darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/bloom/strength");
341
348
 
342
349
  gtk_box_pack_start(GTK_BOX(g->vbox), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);
343
350
  gtk_box_pack_start(GTK_BOX(g->vbox), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);