vtorri
/
ephoto
forked from enlightenment/ephoto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ephoto: Filter processing popup should use the win as parent and block clicking other filters while the current one is still processing.

This commit is contained in:
Stephen okra Houston 2016-08-30 09:31:40 -05:00
parent 9d95940614
commit 950f16af06
3 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/ephoto.h
View File

@ -146,18 +146,18 @@ void ephoto_red_eye_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
Evas_Object *image); Evas_Object *image);
void ephoto_scale_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, void ephoto_scale_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
Evas_Object *image, const char *file); Evas_Object *image, const char *file);
void ephoto_filter_blur(Evas_Object *main, Evas_Object *image); void ephoto_filter_blur(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_sharpen(Evas_Object *main, Evas_Object *image); void ephoto_filter_sharpen(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_dither(Evas_Object *main, Evas_Object *image); void ephoto_filter_dither(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_black_and_white(Evas_Object *main, Evas_Object *image); void ephoto_filter_black_and_white(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_old_photo(Evas_Object *main, Evas_Object *image); void ephoto_filter_old_photo(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_painting(Evas_Object *main, Evas_Object *image); void ephoto_filter_painting(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_posterize(Evas_Object *main, Evas_Object *image); void ephoto_filter_posterize(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_sketch(Evas_Object *main, Evas_Object *image); void ephoto_filter_sketch(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_invert(Evas_Object *main, Evas_Object *image); void ephoto_filter_invert(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_edge(Evas_Object *main, Evas_Object *image); void ephoto_filter_edge(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_emboss(Evas_Object *main, Evas_Object *image); void ephoto_filter_emboss(Ephoto *ephoto, Evas_Object *image);
void ephoto_filter_histogram_eq(Evas_Object *main, Evas_Object *image); void ephoto_filter_histogram_eq(Ephoto *ephoto, Evas_Object *image);
/*file functions*/ /*file functions*/
void ephoto_file_save_image(Ephoto *ephoto, Ephoto_Entry *entry, void ephoto_file_save_image(Ephoto *ephoto, Ephoto_Entry *entry,

87
src/bin/ephoto_filters.c
View File

@ -22,7 +22,7 @@ enum _Ephoto_Image_Filter
struct _Ephoto_Filter struct _Ephoto_Filter
{ {
Ephoto_Image_Filter filter; Ephoto_Image_Filter filter;
Evas_Object *main; Ephoto *ephoto;
Evas_Object *image; Evas_Object *image;
Evas_Object *popup; Evas_Object *popup;
Ecore_Thread *thread;; Ecore_Thread *thread;;
@ -56,7 +56,7 @@ static void _histogram_eq(void *data, Ecore_Thread *th EINA_UNUSED);
static Ephoto_Filter * static Ephoto_Filter *
_initialize_filter(Ephoto_Image_Filter filter, _initialize_filter(Ephoto_Image_Filter filter,
Evas_Object *main, Evas_Object *image) Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = calloc(1, sizeof(Ephoto_Filter)); Ephoto_Filter *ef = calloc(1, sizeof(Ephoto_Filter));
Evas_Coord w, h; Evas_Coord w, h;
@ -67,7 +67,7 @@ _initialize_filter(Ephoto_Image_Filter filter,
evas_object_image_size_get(image, &w, &h); evas_object_image_size_get(image, &w, &h);
ef->filter = filter; ef->filter = filter;
ef->main = main; ef->ephoto = ephoto;
ef->image = image; ef->image = image;
ef->im_data = malloc(sizeof(unsigned int) * w * h); ef->im_data = malloc(sizeof(unsigned int) * w * h);
ef->im_data = memcpy(ef->im_data, im_data, sizeof(unsigned int) * w * h); ef->im_data = memcpy(ef->im_data, im_data, sizeof(unsigned int) * w * h);
@ -159,6 +159,7 @@ _processing(Evas_Object *main)
elm_object_part_content_set(popup, "default", box); elm_object_part_content_set(popup, "default", box);
evas_object_show(popup); evas_object_show(popup);
return popup; return popup;
} }
@ -168,8 +169,8 @@ _thread_finished_cb(void *data, Ecore_Thread *th EINA_UNUSED)
Ephoto_Filter *ef = data; Ephoto_Filter *ef = data;
if (ef->qcount == 0) if (ef->qcount == 0)
{ {
ephoto_single_browser_image_data_done(ef->main, ef->im_data_new, ephoto_single_browser_image_data_done(ef->ephoto->single_browser,
ef->w, ef->h); ef->im_data_new, ef->w, ef->h);
if (ef->popup) if (ef->popup)
{ {
evas_object_del(ef->popup); evas_object_del(ef->popup);
@ -218,8 +219,8 @@ _thread_finished_cb(void *data, Ecore_Thread *th EINA_UNUSED)
} }
else else
{ {
ephoto_single_browser_image_data_done(ef->main, ef->im_data_new, ephoto_single_browser_image_data_done(ef->ephoto->single_browser,
ef->w, ef->h); ef->im_data_new, ef->w, ef->h);
if (ef->popup) if (ef->popup)
{ {
evas_object_del(ef->popup); evas_object_del(ef->popup);
@ -1068,22 +1069,22 @@ _histogram_eq(void *data, Ecore_Thread *th EINA_UNUSED)
} }
void void
ephoto_filter_blur(Evas_Object *main, Evas_Object *image) ephoto_filter_blur(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_BLUR, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_BLUR,
main, image); ephoto, image);
ef->rad = 9; ef->rad = 9;
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_blur, _thread_finished_cb, ef->thread = ecore_thread_run(_blur, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_sharpen(Evas_Object *main, Evas_Object *image) ephoto_filter_sharpen(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SHARPEN, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SHARPEN,
main, image); ephoto, image);
ef->im_data_orig = malloc(sizeof(unsigned int) * ef->w * ef->h); ef->im_data_orig = malloc(sizeof(unsigned int) * ef->w * ef->h);
ef->im_data_orig = memcpy(ef->im_data_orig, ef->im_data, ef->im_data_orig = memcpy(ef->im_data_orig, ef->im_data,
sizeof(unsigned int) * ef->w * ef->h); sizeof(unsigned int) * ef->w * ef->h);
@ -1092,88 +1093,88 @@ ephoto_filter_sharpen(Evas_Object *main, Evas_Object *image)
ef->qcount = 1; ef->qcount = 1;
ef->qpos = 0; ef->qpos = 0;
ef->queue = eina_list_append(ef->queue, _sharpen); ef->queue = eina_list_append(ef->queue, _sharpen);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_blur, _thread_finished_cb, ef->thread = ecore_thread_run(_blur, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_dither(Evas_Object *main, Evas_Object *image) ephoto_filter_dither(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_DITHER, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_DITHER,
main, image); ephoto, image);
ef->im_data_new = memcpy(ef->im_data_new, ef->im_data, ef->im_data_new = memcpy(ef->im_data_new, ef->im_data,
sizeof(unsigned int) * ef->w * ef->h); sizeof(unsigned int) * ef->w * ef->h);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_dither, _thread_finished_cb, ef->thread = ecore_thread_run(_dither, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_black_and_white(Evas_Object *main, Evas_Object *image) ephoto_filter_black_and_white(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_GRAYSCALE, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_GRAYSCALE,
main, image); ephoto, image);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_grayscale, _thread_finished_cb, ef->thread = ecore_thread_run(_grayscale, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_old_photo(Evas_Object *main, Evas_Object *image) ephoto_filter_old_photo(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SEPIA, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SEPIA,
main, image); ephoto, image);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_sepia, _thread_finished_cb, ef->thread = ecore_thread_run(_sepia, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_posterize(Evas_Object *main, Evas_Object *image) ephoto_filter_posterize(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_POSTERIZE, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_POSTERIZE,
main, image); ephoto, image);
ef->drad = 2.0; ef->drad = 2.0;
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_posterize, _thread_finished_cb, ef->thread = ecore_thread_run(_posterize, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_painting(Evas_Object *main, Evas_Object *image) ephoto_filter_painting(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_PAINTING, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_PAINTING,
main, image); ephoto, image);
ef->rad = 5; ef->rad = 5;
ef->drad = 5.0; ef->drad = 5.0;
ef->qpos = 0; ef->qpos = 0;
ef->qcount = 1; ef->qcount = 1;
ef->queue = eina_list_append(ef->queue, _posterize); ef->queue = eina_list_append(ef->queue, _posterize);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_blur, _thread_finished_cb, ef->thread = ecore_thread_run(_blur, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void ephoto_filter_invert(Evas_Object *main, Evas_Object *image) void ephoto_filter_invert(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_INVERT, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_INVERT,
main, image); ephoto, image);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_negative, _thread_finished_cb, ef->thread = ecore_thread_run(_negative, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void ephoto_filter_sketch(Evas_Object *main, Evas_Object *image) void ephoto_filter_sketch(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SKETCH, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SKETCH,
main, image); ephoto, image);
ef->rad = 4; ef->rad = 4;
ef->qpos = 0; ef->qpos = 0;
@ -1181,46 +1182,46 @@ void ephoto_filter_sketch(Evas_Object *main, Evas_Object *image)
ef->queue = eina_list_append(ef->queue, _negative); ef->queue = eina_list_append(ef->queue, _negative);
ef->queue = eina_list_append(ef->queue, _blur); ef->queue = eina_list_append(ef->queue, _blur);
ef->queue = eina_list_append(ef->queue, _dodge); ef->queue = eina_list_append(ef->queue, _dodge);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_grayscale, _thread_finished_cb, ef->thread = ecore_thread_run(_grayscale, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void ephoto_filter_edge(Evas_Object *main, Evas_Object *image) void ephoto_filter_edge(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SOBEL, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SOBEL,
main, image); ephoto, image);
ef->rad = 3; ef->rad = 3;
ef->qpos = 0; ef->qpos = 0;
ef->qcount = 2; ef->qcount = 2;
ef->queue = eina_list_append(ef->queue, _grayscale); ef->queue = eina_list_append(ef->queue, _grayscale);
ef->queue = eina_list_append(ef->queue, _sobel); ef->queue = eina_list_append(ef->queue, _sobel);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_blur, _thread_finished_cb, ef->thread = ecore_thread_run(_blur, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void ephoto_filter_emboss(Evas_Object *main, Evas_Object *image) void ephoto_filter_emboss(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_EMBOSS, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_EMBOSS,
main, image); ephoto, image);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_emboss, _thread_finished_cb, ef->thread = ecore_thread_run(_emboss, _thread_finished_cb,
NULL, ef); NULL, ef);
} }
void void
ephoto_filter_histogram_eq(Evas_Object *main, Evas_Object *image) ephoto_filter_histogram_eq(Ephoto *ephoto, Evas_Object *image)
{ {
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_EQUALIZE, Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_EQUALIZE,
main, image); ephoto, image);
ef->hist = malloc(sizeof(unsigned int) * 256); ef->hist = malloc(sizeof(unsigned int) * 256);
ef->cdf = malloc(sizeof(unsigned int) * 256); ef->cdf = malloc(sizeof(unsigned int) * 256);
_create_hist(ef); _create_hist(ef);
ef->popup = _processing(main); ef->popup = _processing(ephoto->win);
ef->thread = ecore_thread_run(_histogram_eq, _thread_finished_cb, ef->thread = ecore_thread_run(_histogram_eq, _thread_finished_cb,
NULL, ef); NULL, ef);
} }

24
src/bin/ephoto_single_browser.c
View File

@ -1233,7 +1233,7 @@ _go_auto_eq(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_histogram_eq(sb->main, v->image); ephoto_filter_histogram_eq(sb->ephoto, v->image);
} }
} }
@ -1248,7 +1248,7 @@ _go_blur(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_blur(sb->main, v->image); ephoto_filter_blur(sb->ephoto, v->image);
} }
} }
@ -1263,7 +1263,7 @@ _go_sharpen(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_sharpen(sb->main, v->image); ephoto_filter_sharpen(sb->ephoto, v->image);
} }
} }
@ -1278,7 +1278,7 @@ _go_dither(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_dither(sb->main, v->image); ephoto_filter_dither(sb->ephoto, v->image);
} }
} }
@ -1293,7 +1293,7 @@ _go_black_and_white(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_black_and_white(sb->main, v->image); ephoto_filter_black_and_white(sb->ephoto, v->image);
} }
} }
@ -1308,7 +1308,7 @@ _go_old_photo(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_old_photo(sb->main, v->image); ephoto_filter_old_photo(sb->ephoto, v->image);
} }
} }
@ -1323,7 +1323,7 @@ _go_posterize(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_posterize(sb->main, v->image); ephoto_filter_posterize(sb->ephoto, v->image);
} }
} }
@ -1338,7 +1338,7 @@ _go_painting(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_painting(sb->main, v->image); ephoto_filter_painting(sb->ephoto, v->image);
} }
} }
@ -1353,7 +1353,7 @@ _go_invert(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_invert(sb->main, v->image); ephoto_filter_invert(sb->ephoto, v->image);
} }
} }
@ -1368,7 +1368,7 @@ _go_sketch(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_sketch(sb->main, v->image); ephoto_filter_sketch(sb->ephoto, v->image);
} }
} }
@ -1383,7 +1383,7 @@ _go_edge(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_edge(sb->main, v->image); ephoto_filter_edge(sb->ephoto, v->image);
} }
} }
@ -1398,7 +1398,7 @@ _go_emboss(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE; sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
ephoto_filter_emboss(sb->main, v->image); ephoto_filter_emboss(sb->ephoto, v->image);
} }
} }