minor fixes

diff --git a/gui/main.c b/gui/main.c
index 8349476..759bb3d 100644 (file)
--- a/gui/main.c
+++ b/gui/main.c
@@ -113,8 +113,9 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer use
                }
                break;
        case GDK_Right:
+       case GDK_Up:
                frame = timeline_selected + 1;
-               if (event->state & GDK_SHIFT_MASK) {
+               if ((event->state & GDK_SHIFT_MASK) || event->keyval == GDK_Up) {
                        while(frame < timeline_frames && frame_list[frame].marked == 0 && frame_list[frame].keyframe == 0)
                                frame++;
                }
@@ -122,8 +123,9 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer use
                        timeline_select_and_save(timeline_selected, frame);
                return TRUE;
        case GDK_Left:
+       case GDK_Down:
                frame = timeline_selected - 1;
-               if (event->state & GDK_SHIFT_MASK) {
+               if ((event->state & GDK_SHIFT_MASK) || event->keyval == GDK_Down) {
                        while(frame >= 0 && frame_list[frame].marked == 0 && frame_list[frame].keyframe == 0)
                                frame--;
                }

diff --git a/lib/colorize.c b/lib/colorize.c
index ab2dab9..e46f2d9 100644 (file)
--- a/lib/colorize.c
+++ b/lib/colorize.c
@@ -306,14 +306,14 @@ int colorize_solve(struct colorize *col, int quick, char **feat_names)
        int z, d, c, ww, hh, kk;
        int rc = -1;
 
-       if (!quick)
-               printf("-> apply component to grid and solve");
        for (c = 1; c < col->comp; c++) {
                int pixles, j;
                double *value_ptr, *init_ptr, *mark_ptr;
 
-               if (!quick)
-                       printf(" #%d(%s)", c, feat_names[c-1]); fflush(stdout);
+               if (!quick) {
+                       printf("-> apply component #%d '%s' to grid and solve", c, feat_names[c-1]);
+                       fflush(stdout);
+               }
                /* apply component
                 * - copy component into value array (level 0), otherwise 0
                 * - use maked colors for init array, otherwise use 0
@@ -393,9 +393,9 @@ int colorize_solve(struct colorize *col, int quick, char **feat_names)
                        darrayCheckPr(col->values[0], darrayGetPr(col->values[0]) + z*col->w*col->h, col->w*col->h);
                        memcpy(darrayGetPr(col->image) + z*col->w*col->h*col->comp + c*col->w*col->h, darrayGetPr(col->values[0]) + z*col->w*col->h, col->w*col->h*sizeof(double));
                }
+               if (!quick)
+                       printf("\n");
        }
-       if (!quick)
-               printf("\n");
 
 #ifdef TEST_SHRINK_XY
        for (c = 0; c < col->comp; c++) {

diff --git a/lib/multigrid.c b/lib/multigrid.c
index a2409c8..0d130f6 100644 (file)
--- a/lib/multigrid.c
+++ b/lib/multigrid.c
@@ -1432,14 +1432,17 @@ int solve_mg(int nlevel, int iters, int ncycle, darray_t **values, darray_t **ma
                /* end if residual raises again */
 #ifdef RESIDUAL
 //printf("residual %.8f (change=%%%.4f)\n", curr_residual, (prev_residual-curr_residual)/prev_residual*100);
-               if (target_residual_change)
-                       printf(" %.1f%%", (prev_residual-curr_residual)/prev_residual*100); fflush(stdout);
-               if (curr_residual == 0.0) {
-                       printf(" 0"); fflush(stdout);
-                       break;
+               if (target_residual_change) {
+                       printf(" %.1f%%", (prev_residual-curr_residual)/prev_residual*100);
+                       fflush(stdout);
+                       if (curr_residual == 0.0) {
+                               printf(" 0");
+                               fflush(stdout);
+                               break;
+                       }
+                       if ((prev_residual-curr_residual)/prev_residual < target_residual_change)
+                               break;
                }
-               if (target_residual_change && (prev_residual-curr_residual)/prev_residual < target_residual_change)
-                       break;
                prev_residual = curr_residual;
 #endif
        }