Changeset 2374


Ignore:
Timestamp:
Sep 8, 2009, 8:04:07 PM (10 years ago)
Author:
bruno
Message:
  • Try to fix garbled screen progression in text mode based on 2.2.10 modifications which are working
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mondo/src/common/newt-specific.c

    r2290 r2374  
    10321032            sprintf(timeline_str,
    10331033                    "%2ld:%02ld taken            %2ld:%02ld remaining",
    1034                     time_taken / 60, time_taken % 60, time_remaining / 60,
    1035                     time_remaining % 60);
     1034                    (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60,
     1035                    (long) time_remaining % 60);
    10361036            if (percentage < 3) {
    10371037                mr_asprintf(&pcline_str, " Working");
     
    10571057                if (percentage >= 3) {
    10581058                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
    1059                             time_remaining / 60, time_remaining % 60);
     1059                            (long) time_remaining / 60, (long) time_remaining % 60);
    10601060                    printf("---evalcall---1--- %s\n",
    10611061                           g_isoform_header_str);
     
    11231123     update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
    11241124        /*@ long ***************************************************** */
    1125         long current_time = 0;
    1126         long time_taken = 0;
    1127         long time_remaining = 0;
    1128         long time_total_est = 0;
     1125        long current_time = 0L;
     1126        long time_taken = 0L;
     1127        long time_remaining = 0L;
     1128        long time_total_est = 0L;
    11291129
    11301130        /*@ int ******************************************************* */
     
    11791179            time_remaining = time_total_est - time_taken;
    11801180        } else {
    1181             time_remaining = 0;
     1181            time_remaining = 0L;
    11821182        }
    11831183        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
    11841184        sprintf(timeline_str,
    11851185                "%2ld:%02ld taken               %2ld:%02ld remaining  ",
    1186                 time_taken / 60, time_taken % 60, time_remaining / 60,
     1186                (long) time_taken / 60, time_taken % 60, time_remaining / 60,
    11871187                time_remaining % 60);
    11881188        sprintf(percentline_str, " %3d%% done                 %3d%% to go",
     
    12041204                log_msg(2, "percentage = %d", percentage);
    12051205            }
    1206             mr_strcat(taskprogress, "] %3d%c", percentage, '%');
     1206            mr_strcat(taskprogress, "] %3d%%", percentage);
    12071207            mr_strcat(taskprogress, " done; %2ld:%02ld to go",
    1208                     time_remaining / 60, time_remaining % 60);
     1208                    (long) time_remaining / 60, (long) time_remaining % 60);
    12091209            printf("---progress-form---4--- %s\n", taskprogress);
    12101210            paranoid_free(taskprogress);
Note: See TracChangeset for help on using the changeset viewer.