diff options
Diffstat (limited to 'src/eulogium.c')
| -rw-r--r-- | src/eulogium.c | 142 |
1 files changed, 2 insertions, 140 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index e4b8338..3ffab75 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -31,14 +31,6 @@ #define COPYRIGHT "Copyright © 2015 Olliver Schinagl <o.schinagl@ultimaker.com> and various contributors (see AUTHORS)." -#define SECOND 1L -#define MINUTE (60L * SECOND) -#define HOUR (60L * MINUTE) -#define DAY (24L * HOUR) -#define WEEK (7L * DAY) -#define MONTH (4L * WEEK) -#define YEAR (52L * WEEK) - /* TODO Create def for a menu/screen to house all the buttons */ /* BTN is better then but-sex. */ @@ -2790,73 +2782,6 @@ struct _status_msg { char *s; }; -static Eina_Bool _timer_progress_data_update_cb(void *data) -{ - struct eulogium_data *eulogium = data; - struct print_data *progress = eulogium->procedures[PROC_PRINT].meta; - static enum printer_status status = -1; - static double value = 0; - static double time = -1; - - procedure_metadata_key_get(progress->proc_key); - -#if 0 - if (eulogium->printer.status != status) { - elm_object_text_set(eulogium->status, "TODO (step key)"); - if (eulogium->printer.status == COOLING) - elm_progressbar_inverted_set(eulogium->progress, EINA_TRUE); - status = eulogium->printer.status; - } - if (progress->value != value) { - elm_progressbar_value_set(eulogium->progress, progress->value); - value = progress->value; - } - if (progress->time != time) { - char buf[255], *str; - int_fast32_t time = 0; - - if (progress->time < 1) { - str = "Print time unknown"; - time = 0; - } - if (progress->time > 0) { - str = "Time left: %d second%s"; - time = progress->time; - } - if (progress->time > MINUTE) { - str = "Time left: %d minute%s"; - time = progress->time / MINUTE; - } - if (progress->time > HOUR) { - str = "Time left: %d hour%s"; - time = progress->time / HOUR; - } - if (progress->time > DAY) { - str = "Time left: %d day%s"; - time = progress->time / DAY; - } - if (progress->time > WEEK) { - str = "Time left: %d week%s"; - time = progress->time / WEEK; - } - if (progress->time > MONTH) { - str = "Time left: %d month%s"; - time = progress->time / MONTH; - } - if (progress->time > YEAR) { - str = "Time left: %d year%s"; - time = progress->time / YEAR; - } - - snprintf(buf, sizeof(buf), str, (int)progress->time, (time > 1) ? "s" : ""); /* TODO: This won't work with in10 */ - elm_object_text_set(eulogium->time, _(buf)); - progress->time = time; - } - -#endif - return ECORE_CALLBACK_RENEW; -} - /* FIXME: bug here. If the user hits 'abort print' button, an abort is sent to the backend. This timer however * still keeps going and requests the backend status afterwards. Because of this, the status change gets * triggered in the menu state machine and if we're not idle, we jump to a progress screen. @@ -2958,69 +2883,6 @@ Evas_Object *eulogium_pre_print(Evas_Object *parent, struct eulogium_data *eulog return eulogium_split_screen(eulogium->navi, _top, _bottom); } -Evas_Object *eulogium_print_progress(Evas_Object *parent, struct eulogium_data *eulogium, const struct print_data *progress) /* TODO pass timer var to store timer in */ -{ - Evas_Object *_top, *_bottom; - - /* TODO maybe this timer needs to be split into twofold update the widgets locally here, - * emit a signal/tell the metadata cb to start gathering meta data */ - /* this needs to be done, so that we can pass the proper parameters. For now, just hackishly split them. - */ - eulogium->progress_data_refresh = ecore_timer_add(0.5, _timer_progress_data_update_cb, eulogium); - if (!eulogium->progress_data_refresh) { /* TODO make define for the timeout */ - EINA_LOG_CRIT("Unable to create progress update timer"); - return NULL; - } - - return ui_widget_progress(parent, eulogium->procedures[PROC_PRINT].meta, &eulogium->procedures[PROC_PRINT].event); -#if 0 - _top = elm_box_add(parent); - evas_object_size_hint_weight_set(_top, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(_top, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_homogeneous_set(_top, EINA_FALSE); - evas_object_show(_top); - - eulogium->time = elm_label_add(_top); - elm_object_text_set(eulogium->time, _("Calculating time ...")); - elm_label_slide_mode_set(eulogium->time, ELM_LABEL_SLIDE_MODE_NONE); - evas_object_size_hint_align_set(eulogium->time, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(eulogium->time); - elm_box_pack_end(_top, eulogium->time); - - eulogium->status = elm_label_add(_top); - elm_object_text_set(eulogium->status, _("Unknown print status")); - elm_label_slide_mode_set(eulogium->status, ELM_LABEL_SLIDE_MODE_NONE); - evas_object_size_hint_align_set(eulogium->status, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(eulogium->status); - elm_box_pack_end(_top, eulogium->status); - - eulogium->name = elm_label_add(_top); - elm_object_text_set(eulogium->name, progress->jobname); - elm_label_slide_mode_set(eulogium->name, ELM_LABEL_SLIDE_MODE_AUTO); - //elm_label_slide_speed_set(object, 2); - elm_label_slide_go(eulogium->name); - elm_object_style_set(eulogium->name, "slide_bounce"); - evas_object_size_hint_align_set(eulogium->name, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(eulogium->name); - elm_box_pack_end(_top, eulogium->name); - - eulogium->progress = elm_progressbar_add(_top); /* TODO: depending on i18n sig, change inverted */ - elm_progressbar_horizontal_set(eulogium->progress, EINA_TRUE); - elm_progressbar_pulse_set(eulogium->progress, EINA_FALSE); /* TODO: pulse = time-unknown/pause */ - elm_progressbar_pulse(eulogium->progress, EINA_FALSE); - elm_progressbar_value_set(eulogium->progress, progress->value); - elm_progressbar_unit_format_set(eulogium->progress, "%1.1f %%"); - evas_object_size_hint_align_set(eulogium->progress, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(eulogium->progress); - elm_box_pack_end(_top, eulogium->progress); - - _bottom = eulogium_dual_button_add(parent, &but_print_tune, &but_print_abort_confirm); - evas_object_show(_bottom); - - return eulogium_split_screen(parent, _top, _bottom); -#endif -} - void eulogium_generic_error(struct eulogium_data *eulogium, uint_fast16_t error_code, const char *error_msg) { Evas_Object *content, *object; @@ -3610,7 +3472,7 @@ static void eulogium_printer_status_set(struct eulogium_data *eulogium, struct _ eulogium->print.block_active = EINA_TRUE; content = eulogium_print_ignore(eulogium); } else { - content = eulogium_print_progress(eulogium); + content = widget_progress_add(eulogium); } } } @@ -4266,7 +4128,7 @@ static void eulogium_setup(struct eulogium_data *eulogium) procedure_meta_set(&eulogium->procedures[PROC_CURRENT_XY], PROC_META_SLIDER, &dials[PROC_CURRENT_XY]); procedure_meta_set(&eulogium->procedures[PROC_CURRENT_Z], PROC_META_SLIDER, &dials[PROC_CURRENT_Z]); procedure_meta_set(&eulogium->procedures[PROC_CURRENT_E], PROC_META_SLIDER, &dials[PROC_CURRENT_E]); - procedure_meta_getall(); /* XXX do we really want to get all metadata at start? Not only of active and special procedures? */ + procedure_metadata_getall(); /* XXX do we really want to get all metadata at start? Not only of active and special procedures? */ } void _priviledges_drop(void) |