diff --git a/ChangeLog b/ChangeLog index bd0a1dce7c..355e2d07dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-07-20 Shlomi Fish + + * plug-ins/gimpressionist/presets.c: fixed the incorrect strings + for input and output of the preset's fields. (a relic of an + irresponsible search-and-replace script). + * plug-ins/gimpressionist/: normalized the identifiers of + orientmap.c. + 2004-07-20 Helvetix Victorinox * app/composite/Makefile.am (regenerate): Updated make-installer.py diff --git a/plug-ins/gimpressionist/gimpressionist.h b/plug-ins/gimpressionist/gimpressionist.h index 164d22e50a..53f632c428 100644 --- a/plug-ins/gimpressionist/gimpressionist.h +++ b/plug-ins/gimpressionist/gimpressionist.h @@ -67,7 +67,7 @@ typedef struct double orientstrexp; int general_tileable; int paper_overlay; - int orientvoronoi; + int orient_voronoi; int colorbrushes; int general_drop_shadow; double generalshadowdarkness; @@ -153,7 +153,7 @@ void brush_reload (const gchar *fn, struct ppm *p); void create_orientmap_dialog (void); void update_orientmap_dialog (void); -double getdir (double x, double y, int from); +double get_direction (double x, double y, int from); void create_sizemap_dialog (void); double getsiz_proto (double x, double y, int n, smvector_t *vec, diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index 394247b871..c670bc312b 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -20,32 +20,32 @@ #define NUMVECTYPES 4 -static GtkWidget *omwindow; +static GtkWidget *orient_map_window; -static GtkWidget *vectorprev; -static GtkWidget *ompreviewprev; +static GtkWidget *vector_preview; +static GtkWidget *orient_map_preview_prev; static GtkWidget *prev_button; static GtkWidget *next_button; static GtkWidget *add_button; static GtkWidget *kill_button; -static GtkObject *vectprevbrightadjust = NULL; +static GtkObject *vector_preview_brightness_adjust = NULL; -static GtkObject *angadjust = NULL; -static GtkObject *stradjust = NULL; +static GtkObject *angle_adjust = NULL; +static GtkObject *strength_adjust = NULL; static GtkObject *orient_map_str_exp_adjust = NULL; -static GtkObject *angoffadjust = NULL; -static GtkWidget *vectypes[NUMVECTYPES]; -static GtkWidget *orientvoronoi = NULL; +static GtkObject *angle_offset_adjust = NULL; +static GtkWidget *vector_types[NUMVECTYPES]; +static GtkWidget *orient_voronoi = NULL; #define OMWIDTH 150 #define OMHEIGHT 150 static vector_t vector[MAXORIENTVECT]; -static gint numvect = 0; +static gint num_vectors = 0; static gint vector_type; -double getdir(double x, double y, int from) +double get_direction (double x, double y, int from) { int i; int n; @@ -56,17 +56,17 @@ double getdir(double x, double y, int from) int first = 0, last; if(from == 0) { - n = numvect; + n = num_vectors; vec = vector; - angoff = GTK_ADJUSTMENT(angoffadjust)->value; + angoff = GTK_ADJUSTMENT(angle_offset_adjust)->value; strexp = GTK_ADJUSTMENT(orient_map_str_exp_adjust)->value; - voronoi = GTK_TOGGLE_BUTTON(orientvoronoi)->active; + voronoi = GTK_TOGGLE_BUTTON(orient_voronoi)->active; } else { n = pcvals.numorientvector; vec = pcvals.orientvector; angoff = pcvals.orientangoff; strexp = pcvals.orientstrexp; - voronoi = pcvals.orientvoronoi; + voronoi = pcvals.orient_voronoi; } if(voronoi) { @@ -124,7 +124,7 @@ double getdir(double x, double y, int from) return 90-(gimp_rad_to_deg(atan2(dy,dx))+angoff); } -static void updateompreviewprev(void) +static void update_orient_map_preview_prev (void) { int x, y; static ppm_t nbuffer = {0,0,NULL}; @@ -132,36 +132,37 @@ static void updateompreviewprev(void) guchar gray[3] = {120,120,120}; guchar white[3] = {255,255,255}; - if(!nbuffer.col) { + if (!nbuffer.col) { ppm_new (&nbuffer,OMWIDTH,OMHEIGHT); } fill (&nbuffer, black); - for(y = 6; y < OMHEIGHT-4; y += 10) - for(x = 6; x < OMWIDTH-4; x += 10) { - double dir = gimp_deg_to_rad(getdir(x/(double)OMWIDTH,y/(double)OMHEIGHT,0)); - double xo = sin(dir)*4.0; - double yo = cos(dir)*4.0; - ppm_drawline (&nbuffer, x-xo, y-yo, x+xo, y+yo, gray); - ppm_put_rgb (&nbuffer, x-xo, y-yo, white); - } + for (y = 6; y < OMHEIGHT-4; y += 10) + for (x = 6; x < OMWIDTH-4; x += 10) + { + double dir = gimp_deg_to_rad(get_direction(x/(double)OMWIDTH,y/(double)OMHEIGHT,0)); + double xo = sin(dir)*4.0; + double yo = cos(dir)*4.0; + ppm_drawline (&nbuffer, x-xo, y-yo, x+xo, y+yo, gray); + ppm_put_rgb (&nbuffer, x-xo, y-yo, white); + } for (y = 0; y < OMHEIGHT; y++) - gtk_preview_draw_row (GTK_PREVIEW (ompreviewprev), + gtk_preview_draw_row (GTK_PREVIEW (orient_map_preview_prev), (guchar *) nbuffer.col + y * OMWIDTH * 3, 0, y, OMWIDTH); - gtk_widget_queue_draw (ompreviewprev); + gtk_widget_queue_draw (orient_map_preview_prev); - gtk_widget_set_sensitive (prev_button, (numvect > 1)); - gtk_widget_set_sensitive (next_button, (numvect > 1)); - gtk_widget_set_sensitive (add_button, (numvect < MAXORIENTVECT)); - gtk_widget_set_sensitive (kill_button, (numvect > 1)); + gtk_widget_set_sensitive (prev_button, (num_vectors > 1)); + gtk_widget_set_sensitive (next_button, (num_vectors > 1)); + gtk_widget_set_sensitive (add_button, (num_vectors < MAXORIENTVECT)); + gtk_widget_set_sensitive (kill_button, (num_vectors > 1)); } static int selectedvector = 0; -static void updatevectorprev(void) +static void update_vector_prev(void) { static ppm_t backup = {0,0,NULL}; static ppm_t buffer = {0,0,NULL}; @@ -169,17 +170,17 @@ static void updatevectorprev(void) int i, x, y; double dir, xo, yo; double val; - static double lastval = 0.0; + static double last_val = 0.0; guchar gray[3] = {120,120,120}; guchar red[3] = {255,0,0}; guchar white[3] = {255,255,255}; - if (vectprevbrightadjust) - val = 1.0 - GTK_ADJUSTMENT(vectprevbrightadjust)->value / 100.0; + if (vector_preview_brightness_adjust) + val = 1.0 - GTK_ADJUSTMENT(vector_preview_brightness_adjust)->value / 100.0; else val = 0.5; - if (!ok || (val != lastval)) { + if (!ok || (val != last_val)) { infile_copy_to_ppm (&backup); ppm_apply_brightness (&backup, val, 1,1,1); if ((backup.width != OMWIDTH) || (backup.height != OMHEIGHT)) @@ -188,164 +189,164 @@ static void updatevectorprev(void) } ppm_copy (&backup, &buffer); - for(i = 0; i < numvect; i++) { + for(i = 0; i < num_vectors; i++) { double s; x = vector[i].x * OMWIDTH; y = vector[i].y * OMHEIGHT; - dir = gimp_deg_to_rad(vector[i].dir); - s = gimp_deg_to_rad(vector[i].str); + dir = gimp_deg_to_rad (vector[i].dir); + s = gimp_deg_to_rad (vector[i].str); xo = sin(dir)*(6.0+100*s); yo = cos(dir)*(6.0+100*s); if(i == selectedvector) ppm_drawline (&buffer, x-xo, y-yo, x+xo, y+yo, red); else ppm_drawline (&buffer, x-xo, y-yo, x+xo, y+yo, gray); - ppm_put_rgb(&buffer, x-xo, y-yo, white); + ppm_put_rgb (&buffer, x-xo, y-yo, white); } for (y = 0; y < OMHEIGHT; y++) - gtk_preview_draw_row (GTK_PREVIEW (vectorprev), + gtk_preview_draw_row (GTK_PREVIEW (vector_preview), (guchar *) buffer.col + y * OMWIDTH * 3, 0, y, OMWIDTH); - gtk_widget_queue_draw (vectorprev); + gtk_widget_queue_draw (vector_preview); } static gboolean adjignore = FALSE; -static void updatesliders(void) +static void update_slides(void) { gint type; adjignore = TRUE; - gtk_adjustment_set_value(GTK_ADJUSTMENT(angadjust), - vector[selectedvector].dir); - gtk_adjustment_set_value(GTK_ADJUSTMENT(stradjust), - vector[selectedvector].str); + gtk_adjustment_set_value (GTK_ADJUSTMENT (angle_adjust), + vector[selectedvector].dir); + gtk_adjustment_set_value (GTK_ADJUSTMENT (strength_adjust), + vector[selectedvector].str); type = vector[selectedvector].type; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vectypes[type]), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (vector_types[type]), TRUE); adjignore = FALSE; } -static void prevclick(GtkWidget *w, gpointer data) +static void prev_click_callback(GtkWidget *w, gpointer data) { selectedvector--; - if(selectedvector < 0) selectedvector = numvect-1; - updatesliders(); - updatevectorprev(); + if(selectedvector < 0) selectedvector = num_vectors-1; + update_slides(); + update_vector_prev(); } -static void nextclick(GtkWidget *w, gpointer data) +static void next_click_callback(GtkWidget *w, gpointer data) { selectedvector++; - if(selectedvector == numvect) selectedvector = 0; - updatesliders(); - updatevectorprev(); + if(selectedvector == num_vectors) selectedvector = 0; + update_slides(); + update_vector_prev(); } static void add_new_vector (gdouble x, gdouble y) { - vector[numvect].x = x; - vector[numvect].y = y; - vector[numvect].dir = 0.0; - vector[numvect].dx = sin(gimp_deg_to_rad(0.0)); - vector[numvect].dy = cos(gimp_deg_to_rad(0.0)); - vector[numvect].str = 1.0; - vector[numvect].type = 0; - selectedvector = numvect; - numvect++; + vector[num_vectors].x = x; + vector[num_vectors].y = y; + vector[num_vectors].dir = 0.0; + vector[num_vectors].dx = sin (gimp_deg_to_rad (0.0)); + vector[num_vectors].dy = cos (gimp_deg_to_rad (0.0)); + vector[num_vectors].str = 1.0; + vector[num_vectors].type = 0; + selectedvector = num_vectors; + num_vectors++; } -static void addclick(GtkWidget *w, gpointer data) +static void add_click_callback(GtkWidget *w, gpointer data) { add_new_vector (0.5, 0.5); - updatesliders(); - updatevectorprev(); - updateompreviewprev(); + update_slides(); + update_vector_prev(); + update_orient_map_preview_prev(); } -static void deleteclick(GtkWidget *w, gpointer data) +static void delete_click_callback(GtkWidget *w, gpointer data) { int i; - for (i = selectedvector; i < numvect-1; i++) { + for (i = selectedvector; i < num_vectors-1; i++) { vector[i] = vector[i + 1]; } - numvect--; + num_vectors--; - if (selectedvector >= numvect) selectedvector = 0; - updatesliders(); - updatevectorprev(); - updateompreviewprev(); + if (selectedvector >= num_vectors) selectedvector = 0; + update_slides(); + update_vector_prev(); + update_orient_map_preview_prev(); } -static void mapclick(GtkWidget *w, GdkEventButton *event) +static void map_click_callback(GtkWidget *w, GdkEventButton *event) { if (event->button == 1) { vector[selectedvector].x = event->x / (double)OMWIDTH; vector[selectedvector].y = event->y / (double)OMHEIGHT; } else if (event->button == 2) { - if (numvect + 1 == MAXORIENTVECT) return; + if (num_vectors + 1 == MAXORIENTVECT) return; add_new_vector (event->x / (double)OMWIDTH, event->y / (double)OMHEIGHT); - updatesliders(); + update_slides (); } else if (event->button == 3) { double d; d = atan2(OMWIDTH * vector[selectedvector].x - event->x, OMHEIGHT * vector[selectedvector].y - event->y); - vector[selectedvector].dir = gimp_rad_to_deg(d); - vector[selectedvector].dx = sin(d); - vector[selectedvector].dy = cos(d); - updatesliders(); + vector[selectedvector].dir = gimp_rad_to_deg (d); + vector[selectedvector].dx = sin (d); + vector[selectedvector].dy = cos (d); + update_slides (); } - updatevectorprev(); - updateompreviewprev(); + update_vector_prev (); + update_orient_map_preview_prev (); } -static void angadjmove(GtkWidget *w, gpointer data) +static void angle_adjust_move_callback (GtkWidget *w, gpointer data) { if (adjignore) return; - vector[selectedvector].dir = GTK_ADJUSTMENT(angadjust)->value; - vector[selectedvector].dx = sin(gimp_deg_to_rad(vector[selectedvector].dir)); - vector[selectedvector].dy = cos(gimp_deg_to_rad(vector[selectedvector].dir)); - updatevectorprev(); - updateompreviewprev(); + vector[selectedvector].dir = GTK_ADJUSTMENT(angle_adjust)->value; + vector[selectedvector].dx = sin (gimp_deg_to_rad(vector[selectedvector].dir)); + vector[selectedvector].dy = cos (gimp_deg_to_rad(vector[selectedvector].dir)); + update_vector_prev (); + update_orient_map_preview_prev (); } -static void stradjmove(GtkWidget *w, gpointer data) +static void strength_adjust_move_callback (GtkWidget *w, gpointer data) { if (adjignore) return; - vector[selectedvector].str = GTK_ADJUSTMENT(stradjust)->value; - updatevectorprev(); - updateompreviewprev(); + vector[selectedvector].str = GTK_ADJUSTMENT(strength_adjust)->value; + update_vector_prev(); + update_orient_map_preview_prev(); } -static void strexpadjmove(GtkWidget *w, gpointer data) +static void strength_exponent_adjust_move_callback (GtkWidget *w, gpointer data) { if (adjignore) return; - updatevectorprev(); - updateompreviewprev(); + update_vector_prev (); + update_orient_map_preview_prev (); } -static void angoffadjmove(GtkWidget *w, gpointer data) +static void angle_offset_adjust_move_callback (GtkWidget *w, gpointer data) { if (adjignore) return; - updatevectorprev(); - updateompreviewprev(); + update_vector_prev (); + update_orient_map_preview_prev (); } -static void vectypeclick(GtkWidget *w, gpointer data) +static void vector_type_click_callback (GtkWidget *w, gpointer data) { if (adjignore) return; gimp_radio_button_update (w, data); vector[selectedvector].type = vector_type; - updatevectorprev(); - updateompreviewprev(); + update_vector_prev (); + update_orient_map_preview_prev (); } static void -omresponse (GtkWidget *widget, +orient_map_response (GtkWidget *widget, gint response_id, gpointer data) { @@ -356,13 +357,13 @@ omresponse (GtkWidget *widget, { gint i; - for(i = 0; i < numvect; i++) + for(i = 0; i < num_vectors; i++) pcvals.orientvector[i] = vector[i]; - pcvals.numorientvector = numvect; + pcvals.numorientvector = num_vectors; pcvals.orientstrexp = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value; - pcvals.orientangoff = GTK_ADJUSTMENT (angoffadjust)->value; - pcvals.orientvoronoi = GTK_TOGGLE_BUTTON (orientvoronoi)->active; + pcvals.orientangoff = GTK_ADJUSTMENT (angle_offset_adjust)->value; + pcvals.orient_voronoi = GTK_TOGGLE_BUTTON (orient_voronoi)->active; } }; @@ -370,35 +371,35 @@ omresponse (GtkWidget *widget, gtk_widget_hide (widget); } -static void initvectors(void) +static void init_vectors(void) { if (pcvals.numorientvector) { int i; - numvect = pcvals.numorientvector; - for(i = 0; i < numvect; i++) { + num_vectors = pcvals.numorientvector; + for(i = 0; i < num_vectors; i++) { vector[i] = pcvals.orientvector[i]; } } else {/* Shouldn't happen */ - numvect = 0; + num_vectors = 0; add_new_vector (0.5, 0.5); } - if (selectedvector >= numvect) - selectedvector = numvect-1; + if (selectedvector >= num_vectors) + selectedvector = num_vectors-1; } void update_orientmap_dialog(void) { - if(!omwindow) return; + if(!orient_map_window) return; - initvectors(); + init_vectors(); - gtk_adjustment_set_value(GTK_ADJUSTMENT(orient_map_str_exp_adjust), pcvals.orientstrexp); - gtk_adjustment_set_value(GTK_ADJUSTMENT(angoffadjust), pcvals.orientangoff); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(orientvoronoi), pcvals.orientvoronoi); + gtk_adjustment_set_value (GTK_ADJUSTMENT(orient_map_str_exp_adjust), pcvals.orientstrexp); + gtk_adjustment_set_value (GTK_ADJUSTMENT(angle_offset_adjust), pcvals.orientangoff); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(orient_voronoi), pcvals.orient_voronoi); - updatevectorprev(); - updateompreviewprev(); + update_vector_prev(); + update_orient_map_preview_prev(); } void create_orientmap_dialog(void) @@ -408,16 +409,16 @@ void create_orientmap_dialog(void) GtkWidget *frame; GtkWidget *ebox, *hbox, *vbox; - initvectors(); + init_vectors(); - if (omwindow) { - updatevectorprev(); - updateompreviewprev(); - gtk_widget_show(omwindow); + if (orient_map_window) { + update_vector_prev(); + update_orient_map_preview_prev(); + gtk_widget_show(orient_map_window); return; } - omwindow = + orient_map_window = gimp_dialog_new (_("Orientation Map Editor"), "gimpressionist", NULL, 0, gimp_standard_help_func, HELP_ID, @@ -428,16 +429,16 @@ void create_orientmap_dialog(void) NULL); - g_signal_connect (omwindow, "response", - G_CALLBACK (omresponse), - omwindow); - g_signal_connect (omwindow, "destroy", + g_signal_connect (orient_map_window, "response", + G_CALLBACK (orient_map_response), + orient_map_window); + g_signal_connect (orient_map_window, "destroy", G_CALLBACK (gtk_widget_destroyed), - &omwindow); + &orient_map_window); table1 = gtk_table_new(2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (omwindow)->vbox), table1); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (orient_map_window)->vbox), table1); gtk_widget_show(table1); frame = gtk_frame_new( _("Vectors")); @@ -458,22 +459,22 @@ void create_orientmap_dialog(void) "Middle-click to add a new vector."), NULL); gtk_box_pack_start(GTK_BOX(hbox), ebox, FALSE, FALSE, 0); - tmpw = vectorprev = gtk_preview_new (GTK_PREVIEW_COLOR); + tmpw = vector_preview = gtk_preview_new (GTK_PREVIEW_COLOR); gtk_preview_size (GTK_PREVIEW (tmpw), OMWIDTH, OMHEIGHT); gtk_container_add (GTK_CONTAINER (ebox), tmpw); gtk_widget_show (tmpw); gtk_widget_add_events (ebox, GDK_BUTTON_PRESS_MASK); g_signal_connect (ebox, "button_press_event", - G_CALLBACK (mapclick), NULL); + G_CALLBACK (map_click_callback), NULL); gtk_widget_show (ebox); - vectprevbrightadjust = gtk_adjustment_new(50.0, 0.0, 100.0, 1.0, 1.0, 1.0); - tmpw = gtk_vscale_new(GTK_ADJUSTMENT(vectprevbrightadjust)); + vector_preview_brightness_adjust = gtk_adjustment_new(50.0, 0.0, 100.0, 1.0, 1.0, 1.0); + tmpw = gtk_vscale_new(GTK_ADJUSTMENT(vector_preview_brightness_adjust)); gtk_scale_set_draw_value (GTK_SCALE (tmpw), FALSE); gtk_box_pack_start(GTK_BOX(hbox), tmpw,FALSE,FALSE,0); gtk_widget_show(tmpw); - g_signal_connect (vectprevbrightadjust, "value_changed", - G_CALLBACK (updatevectorprev), NULL); + g_signal_connect (vector_preview_brightness_adjust, "value_changed", + G_CALLBACK (update_vector_prev), NULL); gimp_help_set_help_data (tmpw, _("Adjust the preview's brightness"), NULL); tmpw2 = tmpw = gtk_frame_new( _("Preview")); @@ -481,7 +482,7 @@ void create_orientmap_dialog(void) gtk_table_attach(GTK_TABLE(table1), tmpw, 1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0); gtk_widget_show(tmpw); - tmpw = ompreviewprev = gtk_preview_new(GTK_PREVIEW_COLOR); + tmpw = orient_map_preview_prev = gtk_preview_new(GTK_PREVIEW_COLOR); gtk_preview_size(GTK_PREVIEW(tmpw), OMWIDTH, OMHEIGHT); gtk_container_add(GTK_CONTAINER(tmpw2), tmpw); gtk_widget_show(tmpw); @@ -494,25 +495,25 @@ void create_orientmap_dialog(void) prev_button = tmpw = gtk_button_new_with_mnemonic("_<<"); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); - g_signal_connect (tmpw, "clicked", G_CALLBACK(prevclick), NULL); + g_signal_connect (tmpw, "clicked", G_CALLBACK(prev_click_callback), NULL); gimp_help_set_help_data (tmpw, _("Select previous vector"), NULL); next_button = tmpw = gtk_button_new_with_mnemonic("_>>"); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); - g_signal_connect (tmpw, "clicked", G_CALLBACK(nextclick), NULL); + g_signal_connect (tmpw, "clicked", G_CALLBACK(next_click_callback), NULL); gimp_help_set_help_data (tmpw, _("Select next vector"), NULL); add_button = tmpw = gtk_button_new_with_mnemonic( _("A_dd")); gtk_box_pack_start(GTK_BOX(hbox), tmpw, FALSE, TRUE, 0); gtk_widget_show(tmpw); - g_signal_connect (tmpw, "clicked", G_CALLBACK(addclick), NULL); + g_signal_connect (tmpw, "clicked", G_CALLBACK(add_click_callback), NULL); gimp_help_set_help_data (tmpw, _("Add new vector"), NULL); kill_button = tmpw = gtk_button_new_with_mnemonic( _("_Kill")); gtk_box_pack_start(GTK_BOX(hbox), tmpw, FALSE, TRUE, 0); gtk_widget_show(tmpw); - g_signal_connect (tmpw, "clicked", G_CALLBACK(deleteclick), NULL); + g_signal_connect (tmpw, "clicked", G_CALLBACK(delete_click_callback), NULL); gimp_help_set_help_data (tmpw, _("Delete selected vector"), NULL); hbox = gtk_hbox_new (FALSE, 0); @@ -525,23 +526,23 @@ void create_orientmap_dialog(void) gtk_widget_show (vbox); frame = gimp_int_radio_group_new (TRUE, _("Type"), - G_CALLBACK (vectypeclick), + G_CALLBACK (vector_type_click_callback), &vector_type, 0, - _("_Normal"), 0, &vectypes[0], - _("Vorte_x"), 1, &vectypes[1], - _("Vortex_2"), 2, &vectypes[2], - _("Vortex_3"), 3, &vectypes[3], + _("_Normal"), 0, &vector_types[0], + _("Vorte_x"), 1, &vector_types[1], + _("Vortex_2"), 2, &vector_types[2], + _("Vortex_3"), 3, &vector_types[3], NULL); gtk_container_add(GTK_CONTAINER(vbox), frame); gtk_widget_show(frame); - orientvoronoi = tmpw = gtk_check_button_new_with_mnemonic( _("_Voronoi")); + orient_voronoi = tmpw = gtk_check_button_new_with_mnemonic( _("_Voronoi")); gtk_container_add(GTK_CONTAINER(vbox), tmpw); gtk_widget_show (tmpw); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmpw), pcvals.orientvoronoi); - g_signal_connect(tmpw, "clicked", G_CALLBACK(angoffadjmove), NULL); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmpw), pcvals.orient_voronoi); + g_signal_connect(tmpw, "clicked", G_CALLBACK(angle_offset_adjust_move_callback), NULL); gimp_help_set_help_data (tmpw, _("Voronoi-mode makes only the vector closest to the given point have any influence"), NULL); table2 = gtk_table_new(4, 3, FALSE); @@ -549,7 +550,7 @@ void create_orientmap_dialog(void) gtk_container_add(GTK_CONTAINER(hbox), table2); gtk_widget_show(table2); - angadjust = + angle_adjust = gimp_scale_entry_new (GTK_TABLE(table2), 0, 0, _("A_ngle:"), 150, 6, 0.0, @@ -557,9 +558,9 @@ void create_orientmap_dialog(void) TRUE, 0, 0, _("Change the angle of the selected vector"), NULL); - g_signal_connect (angadjust, "value_changed", G_CALLBACK (angadjmove), NULL); + g_signal_connect (angle_adjust, "value_changed", G_CALLBACK (angle_adjust_move_callback), NULL); - angoffadjust = + angle_offset_adjust = gimp_scale_entry_new (GTK_TABLE(table2), 0, 1, _("Ang_le offset:"), 150, 6, 0.0, @@ -567,10 +568,10 @@ void create_orientmap_dialog(void) TRUE, 0, 0, _("Offset all vectors with a given angle"), NULL); - g_signal_connect (angoffadjust, "value_changed", - G_CALLBACK (angoffadjmove), NULL); + g_signal_connect (angle_offset_adjust, "value_changed", + G_CALLBACK (angle_offset_adjust_move_callback), NULL); - stradjust = + strength_adjust = gimp_scale_entry_new (GTK_TABLE(table2), 0, 2, _("_Strength:"), 150, 6, 1.0, @@ -578,7 +579,7 @@ void create_orientmap_dialog(void) TRUE, 0, 0, _("Change the strength of the selected vector"), NULL); - g_signal_connect (stradjust, "value_changed", G_CALLBACK (stradjmove), NULL); + g_signal_connect (strength_adjust, "value_changed", G_CALLBACK (strength_adjust_move_callback), NULL); orient_map_str_exp_adjust = gimp_scale_entry_new (GTK_TABLE(table2), 0, 3, @@ -589,10 +590,10 @@ void create_orientmap_dialog(void) _("Change the exponent of the strength"), NULL); g_signal_connect (orient_map_str_exp_adjust, "value_changed", - G_CALLBACK (strexpadjmove), NULL); + G_CALLBACK (strength_exponent_adjust_move_callback), NULL); - gtk_widget_show(omwindow); + gtk_widget_show(orient_map_window); - updatevectorprev(); - updateompreviewprev(); + update_vector_prev(); + update_orient_map_preview_prev(); } diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index d3650e7ccf..e8e93568e8 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -327,17 +327,17 @@ static void set_values (const gchar *key, const gchar *val) pcvals.generalbgtype = atoi(val); else if(!strcmp(key, "generaldarkedge")) pcvals.generaldarkedge = g_ascii_strtod (val, NULL); - else if(!strcmp(key, "general_paint_edges")) + else if(!strcmp(key, "generalpaintedges")) pcvals.general_paint_edges = atoi(val); - else if(!strcmp(key, "general_tileable")) + else if(!strcmp(key, "generaltileable")) pcvals.general_tileable = atoi(val); - else if(!strcmp(key, "general_drop_shadow")) + else if(!strcmp(key, "generaldropshadow")) pcvals.general_drop_shadow = atoi(val); else if(!strcmp(key, "generalshadowdarkness")) pcvals.generalshadowdarkness = g_ascii_strtod (val, NULL); - else if(!strcmp(key, "general_shadow_depth")) + else if(!strcmp(key, "generalshadowdepth")) pcvals.general_shadow_depth = atoi(val); - else if(!strcmp(key, "general_shadow_blur")) + else if(!strcmp(key, "generalshadowblur")) pcvals.general_shadow_blur = atoi(val); else if(!strcmp(key, "devthresh")) pcvals.devthresh = g_ascii_strtod (val, NULL); @@ -346,9 +346,9 @@ static void set_values (const gchar *key, const gchar *val) pcvals.paperrelief = g_ascii_strtod (val, NULL); else if(!strcmp(key, "paperscale")) pcvals.paperscale = g_ascii_strtod (val, NULL); - else if(!strcmp(key, "paper_invert")) + else if(!strcmp(key, "paperinvert")) pcvals.paper_invert = atoi(val); - else if(!strcmp(key, "paper_overlay")) + else if(!strcmp(key, "paperoverlay")) pcvals.paper_overlay = atoi(val); else if(!strcmp(key, "placetype")) @@ -375,7 +375,7 @@ static void set_values (const gchar *key, const gchar *val) else if(!strcmp(key, "orientstrexp")) pcvals.orientstrexp = g_ascii_strtod (val, NULL); else if(!strcmp(key, "orientvoronoi")) - pcvals.orientvoronoi = atoi(val); + pcvals.orient_voronoi = atoi(val); else if(!strcmp(key, "numsizevector")) pcvals.numsizevector = atoi(val); @@ -711,13 +711,13 @@ static void save_preset(void) fprintf(f, "generalbgtype=%d\n", pcvals.generalbgtype); fprintf(f, "generaldarkedge=%s\n", g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.generaldarkedge)); - fprintf(f, "general_paint_edges=%d\n", pcvals.general_paint_edges); - fprintf(f, "general_tileable=%d\n", pcvals.general_tileable); - fprintf(f, "general_drop_shadow=%d\n", pcvals.general_drop_shadow); + fprintf(f, "generalpaintedges=%d\n", pcvals.general_paint_edges); + fprintf(f, "generaltileable=%d\n", pcvals.general_tileable); + fprintf(f, "generaldropshadow=%d\n", pcvals.general_drop_shadow); fprintf(f, "generalshadowdarkness=%s\n", g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.generalshadowdarkness)); - fprintf(f, "general_shadow_depth=%d\n", pcvals.general_shadow_depth); - fprintf(f, "general_shadow_blur=%d\n", pcvals.general_shadow_blur); + fprintf(f, "generalshadowdepth=%d\n", pcvals.general_shadow_depth); + fprintf(f, "generalshadowblur=%d\n", pcvals.general_shadow_blur); fprintf(f, "devthresh=%s\n", g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.devthresh)); @@ -725,8 +725,8 @@ static void save_preset(void) g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.paperrelief)); fprintf(f, "paperscale=%s\n", g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.paperscale)); - fprintf(f, "paper_invert=%d\n", pcvals.paper_invert); - fprintf(f, "paper_overlay=%d\n", pcvals.paper_overlay); + fprintf(f, "paperinvert=%d\n", pcvals.paper_invert); + fprintf(f, "paperoverlay=%d\n", pcvals.paper_overlay); fprintf(f, "selectedbrush=%s\n", pcvals.selectedbrush); fprintf(f, "selectedpaper=%s\n", pcvals.selectedpaper); @@ -756,7 +756,7 @@ static void save_preset(void) g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.orientangoff)); fprintf(f, "orientstrexp=%s\n", g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%f", pcvals.orientstrexp)); - fprintf(f, "orientvoronoi=%d\n", pcvals.orientvoronoi); + fprintf(f, "orientvoronoi=%d\n", pcvals.orient_voronoi); fprintf(f, "numsizevector=%d\n", pcvals.numsizevector); for (i = 0; i < pcvals.numsizevector; i++) diff --git a/plug-ins/gimpressionist/repaint.c b/plug-ins/gimpressionist/repaint.c index 433f1f3d4a..620a6f4248 100644 --- a/plug-ins/gimpressionist/repaint.c +++ b/plug-ins/gimpressionist/repaint.c @@ -519,7 +519,7 @@ void repaint(ppm_t *p, ppm_t *a) guchar *dstrow = &dirmap.col[y*dirmap.width*3]; double tmpy = y / (double)dirmap.height; for(x = 0; x < dirmap.width; x++) { - dstrow[x*3] = get_pixel_value(90-getdir(x / (double)dirmap.width, tmpy, 1)); + dstrow[x*3] = get_pixel_value(90-get_direction(x / (double)dirmap.width, tmpy, 1)); } } edgepad(&dirmap, maxbrushwidth, maxbrushwidth, maxbrushheight, maxbrushheight); diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 2b3ec97621..d3fef899ee 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -95,7 +95,7 @@ static void updatesmvectorprev(void) static int ok = 0; gint i, x, y; gdouble val; - static gdouble lastval = 0.0; + static gdouble last_val = 0.0; guchar gray[3] = {120,120,120}; guchar red[3] = {255,0,0}; guchar white[3] = {255,255,255}; @@ -105,7 +105,7 @@ static void updatesmvectorprev(void) else val = 0.5; - if(!ok || (val != lastval)) + if(!ok || (val != last_val)) { #if 0 if(!infile.col)