diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2016-03-06 17:06:37 -0800 |
|---|---|---|
| committer | Søren Sandmann Pedersen <soren.sandmann@gmail.com> | 2016-03-11 00:00:45 -0500 |
| commit | ff3f8238ace11b1ff804087ede4d109dc26d6081 (patch) | |
| tree | 73c122d440e13f60219e9324bc0dd2454a0e7283 | |
| parent | 4997a6a57f54b4c22e3752557edf738e00893bb0 (diff) | |
demos/scale: Added pulldown to choose PIXMAN_FILTER_* value
This is very useful for comparing the results of SEPARABLE_CONVOLUTION
with BILINEAR and NEAREST.
v14: Removed good/best items
Signed-off-by: Bill Spitzak <spitzak@gmail.com>
| -rw-r--r-- | demos/scale.c | 12 | ||||
| -rw-r--r-- | demos/scale.ui | 40 |
2 files changed, 41 insertions, 11 deletions
diff --git a/demos/scale.c b/demos/scale.c index 0995ad08..85c12e42 100644 --- a/demos/scale.c +++ b/demos/scale.c @@ -127,6 +127,13 @@ typedef struct int value; } named_int_t; +static const named_int_t filter_types[] = +{ + { "Separable", PIXMAN_FILTER_SEPARABLE_CONVOLUTION }, + { "Nearest", PIXMAN_FILTER_NEAREST }, + { "Bilinear", PIXMAN_FILTER_BILINEAR }, +}; + static const named_int_t filters[] = { { "Box", PIXMAN_KERNEL_BOX }, @@ -260,7 +267,9 @@ rescale (GtkWidget *may_be_null, app_t *app) gtk_adjustment_get_value (app->subsample_adjustment), gtk_adjustment_get_value (app->subsample_adjustment)); - pixman_image_set_filter (app->original, PIXMAN_FILTER_SEPARABLE_CONVOLUTION, params, n_params); + pixman_image_set_filter (app->original, + get_value (app, filter_types, "filter_combo_box"), + params, n_params); pixman_image_set_repeat ( app->original, get_value (app, repeats, "repeat_combo_box")); @@ -402,6 +411,7 @@ app_new (pixman_image_t *original) widget = get_widget (app, "drawing_area"); g_signal_connect (widget, "expose_event", G_CALLBACK (on_expose), app); + set_up_combo_box (app, "filter_combo_box", G_N_ELEMENTS (filter_types), filter_types); set_up_filter_box (app, "reconstruct_x_combo_box"); set_up_filter_box (app, "reconstruct_y_combo_box"); set_up_filter_box (app, "sample_x_combo_box"); diff --git a/demos/scale.ui b/demos/scale.ui index ee985dd1..b62cbfb4 100644 --- a/demos/scale.ui +++ b/demos/scale.ui @@ -191,12 +191,23 @@ <property name="column_spacing">8</property> <property name="row_spacing">6</property> <child> + <object class="GtkLabel" id="labelF"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes"><b>Filter:</b></property> + <property name="use_markup">True</property> + </object> + </child> + <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>Reconstruct X:</b></property> <property name="use_markup">True</property> </object> + <packing> + <property name="top_attach">1</property> + </packing> </child> <child> <object class="GtkLabel" id="label5"> @@ -206,7 +217,7 @@ <property name="use_markup">True</property> </object> <packing> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -217,7 +228,7 @@ <property name="use_markup">True</property> </object> <packing> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -228,7 +239,7 @@ <property name="use_markup">True</property> </object> <packing> - <property name="top_attach">3</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -239,7 +250,7 @@ <property name="use_markup">True</property> </object> <packing> - <property name="top_attach">4</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -250,7 +261,15 @@ <property name="use_markup">True</property> </object> <packing> - <property name="top_attach">5</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="filter_combo_box"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> </packing> </child> <child> @@ -259,6 +278,7 @@ </object> <packing> <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -267,7 +287,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -276,7 +296,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -285,7 +305,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -294,7 +314,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -304,7 +324,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="top_attach">6</property> </packing> </child> </object> |